[log] log to file for CLI and fix some issues

REUSE.toml

@@ -8,7 +8,6 @@ path = [
     "**/packages.lock.json",
     "scripts/ps5_names.txt",
     "src/SharpEmu.HLE/Aerolib/aerolib.bin",
-    "src/SharpEmu.GUI/Languages/**",
     "_logs/**",
     ".github/images/**",
     "assets/images/**"

scripts/generate_aerolib_binary.py

@@ -3,8 +3,8 @@
 
 #!/usr/bin/env python3
 
-import hashlib
 import struct
+import hashlib
 from base64 import b64encode as base64enc
 from binascii import unhexlify as uhx
 from pathlib import Path
@@ -21,7 +21,7 @@ def name2nid(name):
 def generate():
     names_path = Path(NAMES)
     output_path = Path(OUTPUT)
-
+    
     entries = []
     with open(names_path, 'r', encoding='utf-8') as f:
         for line in f:
@@ -29,12 +29,12 @@ def generate():
             if name:
                 nid = name2nid(name)
                 entries.append((nid, name))
-
+    
     print(f"Found {len(entries)} entries")
 
     data = bytearray()
     data.extend(struct.pack('<I', len(entries)))
-
+    
     for nid, name in entries:
         nid_bytes = nid.encode('utf-8')
         name_bytes = name.encode('utf-8')
@@ -42,11 +42,10 @@ def generate():
         data.extend(nid_bytes)
         data.extend(struct.pack('<H', len(name_bytes)))
         data.extend(name_bytes)
-
-    output_path.parent.mkdir(parents=True, exist_ok=True)
+    
     with open(output_path, 'wb') as f:
         f.write(data)
-
+    
     print(f"Generated: {output_path} ({len(data):,} bytes)")
     print(f"Total entries: {len(entries)}")
 

src/SharpEmu.CLI/Program.cs

@@ -95,7 +95,6 @@ internal static partial class Program
         SharpEmuLog.MinimumLevel = logLevel;
 
         Log.Info(BuildInfo.Banner);
-        Log.Info(HostSystemInfo.Summary);
 
         ebootPath = Path.GetFullPath(ebootPath);
         Console.Error.WriteLine($"[DEBUG] Full path: {ebootPath}");

src/SharpEmu.CLI/SharpEmu.CLI.csproj

@@ -24,9 +24,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <ImplicitUsings>enable</ImplicitUsings>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>0.0.1</Version>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TieredPGO>true</TieredPGO>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -51,11 +48,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
       <TargetPath>LICENSE.txt</TargetPath>
       <Visible>False</Visible>
     </Content>
-    <Content Include="..\SharpEmu.GUI\Languages\*.json" Condition="'$(Configuration)' != 'Release'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Languages\%(Filename)%(Extension)</TargetPath>
-      <Visible>False</Visible>
-    </Content>
   </ItemGroup>
 
   <!-- Keep glfw as a loose file next to the executable; every other native

src/SharpEmu.Core/Cpu/Native/DirectExecutionBackend.Imports.cs

@@ -161,7 +161,7 @@ public sealed partial class DirectExecutionBackend
 				*(ulong*)(xmmSlot + 8));
 		}
 		cpuContext[CpuRegister.Rsp] = (ulong)argPackPtr + 96uL;
-		if (importStubEntry.Kind == ImportStubKind.BootstrapBridge)
+		if (string.Equals(importStubEntry.Nid, RuntimeStubNids.BootstrapBridge, StringComparison.Ordinal))
 		{
 			NormalizeKernelDynlibDlsymArguments(cpuContext, out _, out _);
 			*(ulong*)argPackPtr = cpuContext[CpuRegister.Rdi];
@@ -245,13 +245,12 @@ public sealed partial class DirectExecutionBackend
 		bool flag4 = !string.IsNullOrWhiteSpace(_importFilter);
 		bool flag5 = false;
 		ExportedFunction? matchedExport = importStubEntry.Export;
-		var traceFlags = importStubEntry.TraceFlags;
 		bool periodicTrace = num <= 128 ||
 			(num >= 240 && num <= 400) ||
 			(num >= 900 && num <= 1300) ||
 			num % 100000 == 0L ||
-			((traceFlags & ImportStubTraceFlags.PeriodicEvery1000) != 0 && (num <= 256 || num % 1000 == 0L)) ||
-			((traceFlags & ImportStubTraceFlags.PeriodicEvery128) != 0 && (num <= 256 || num % 128 == 0)) ||
+			(importStubEntry.Nid == "tsvEmnenz48" && (num <= 256 || num % 1000 == 0L)) ||
+			(importStubEntry.Nid == "rTXw65xmLIA" && (num <= 256 || num % 128 == 0)) ||
 			flag ||
 			flag2 ||
 			flag3;
@@ -312,15 +311,15 @@ public sealed partial class DirectExecutionBackend
 				cpuContext[CpuRegister.Rsi],
 				cpuContext[CpuRegister.Rdx]);
 		}
-		if ((traceFlags & ImportStubTraceFlags.Memset) != 0 && num <= 256)
+		if (importStubEntry.Nid == "8zTFvBIAIN8" && num <= 256)
 		{
 			Console.Error.WriteLine($"[LOADER][TRACE] memset#{num}: dst=0x{cpuContext[CpuRegister.Rdi]:X16} val=0x{cpuContext[CpuRegister.Rsi] & 0xFF:X2} len=0x{cpuContext[CpuRegister.Rdx]:X16} ret=0x{num7:X16}");
 		}
-		if ((traceFlags & ImportStubTraceFlags.CxaAtexit) != 0 && num <= 64)
+		if (importStubEntry.Nid == "tsvEmnenz48" && num <= 64)
 		{
 			Console.Error.WriteLine($"[LOADER][TRACE] __cxa_atexit#{num}: func=0x{cpuContext[CpuRegister.Rdi]:X16} arg=0x{cpuContext[CpuRegister.Rsi]:X16} dso=0x{cpuContext[CpuRegister.Rdx]:X16} ret=0x{num7:X16}");
 		}
-		if ((traceFlags & ImportStubTraceFlags.RawArgs) != 0)
+		if (importStubEntry.Nid == "bzQExy189ZI" || importStubEntry.Nid == "8G2LB+A3rzg")
 		{
 			Console.Error.WriteLine($"[LOADER][TRACE] {importStubEntry.Nid}#{num}: rdi=0x{cpuContext[CpuRegister.Rdi]:X16} rsi=0x{cpuContext[CpuRegister.Rsi]:X16} rdx=0x{cpuContext[CpuRegister.Rdx]:X16} ret=0x{num7:X16}");
 		}
@@ -350,7 +349,7 @@ public sealed partial class DirectExecutionBackend
 				Console.Error.Flush();
 			}
 		}
-		if ((traceFlags & ImportStubTraceFlags.StackChkFail) != 0)
+		if (importStubEntry.Nid == "Ou3iL1abvng")
 		{
 			if (_logStackCheck)
 			{
@@ -382,7 +381,7 @@ public sealed partial class DirectExecutionBackend
 				ActiveGuestReturnSlotAddress);
 			try
 			{
-				if (importStubEntry.Kind == ImportStubKind.BootstrapBridge)
+				if (string.Equals(importStubEntry.Nid, RuntimeStubNids.BootstrapBridge, StringComparison.Ordinal))
 				{
 					if (_logBootstrap)
 					{
@@ -391,11 +390,12 @@ public sealed partial class DirectExecutionBackend
 
 					orbisGen2Result = DispatchBootstrapBridge();
 				}
-				else if (importStubEntry.Kind == ImportStubKind.KernelDynlibDlsym)
+				else if (string.Equals(importStubEntry.Nid, RuntimeStubNids.KernelDynlibDlsym, StringComparison.Ordinal) ||
+					string.Equals(importStubEntry.Nid, "LwG8g3niqwA", StringComparison.Ordinal))
 				{
 					orbisGen2Result = DispatchKernelDynlibDlsym();
 				}
-				else if (importStubEntry.Kind == ImportStubKind.Il2CppApiLookupSymbol)
+				else if (string.Equals(importStubEntry.Nid, "r8mvOaWdi28", StringComparison.Ordinal))
 				{
 					orbisGen2Result = DispatchIl2CppApiLookupSymbol();
 				}
@@ -736,9 +736,6 @@ public sealed partial class DirectExecutionBackend
 		var expectedEqueueTimeout =
 			string.Equals(nid, "fzyMKs9kim0", StringComparison.Ordinal) &&
 			result == OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT;
-		var expectedEventFlagTimeout =
-			string.Equals(nid, "JTvBflhYazQ", StringComparison.Ordinal) &&
-			result == OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT;
 		var expectedMutexTrylockBusy =
 			string.Equals(nid, "K-jXhbt2gn4", StringComparison.Ordinal) &&
 			result == OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY;
@@ -751,7 +748,6 @@ public sealed partial class DirectExecutionBackend
 		if (!expectedFileProbeMiss &&
 			!expectedTimedWaitTimeout &&
 			!expectedEqueueTimeout &&
-			!expectedEventFlagTimeout &&
 			!expectedMutexTrylockBusy &&
 			!expectedUserServiceNoEvent &&
 			!expectedPrivacyInvalidParameter)
@@ -814,15 +810,11 @@ public sealed partial class DirectExecutionBackend
 			return !_logUsleep;
 		}
 
-		// Only mutex/rwlock *lock* is excluded: it may block a contended acquire, which the
-		// leaf path can't. unlock never blocks and stays here — routing it off the fast path
-		// slows guest spinlocks enough to livelock (Demon's Souls).
 		return nid is
+			"9UK1vLZQft4" or // scePthreadMutexLock
 			"tn3VlD0hG60" or // scePthreadMutexUnlock
+			"7H0iTOciTLo" or // pthread_mutex_lock
 			"2Z+PpY6CaJg" or // pthread_mutex_unlock
-			"EgmLo6EWgso" or // pthread_rwlock_unlock
-			"+L98PIbGttk" or // scePthreadRwlockUnlock
-			"q1cHNfGycLI" or // scePadRead
 			"8aI7R7WaOlc" or // sceAmprCommandBufferConstructor
 			"zgXifHT9ErY" or // sceVideoOutIsFlipPending
 			"V++UgBtQhn0" or // sceAgcGetDataPacketPayloadAddress
@@ -881,7 +873,7 @@ public sealed partial class DirectExecutionBackend
 			"Q2V+iqvjgC0" or // vsnprintf
 			"j4ViWNHEgww" or // strlen
 			"5jNubw4vlAA" or // strnlen
-			"LHMrG7e8G78" or // wcsmisc
+			"LHMrG7e8G78" or // wcslen
 			"WkkeywLJcgU" or // wcslen
 			"Ovb2dSJOAuE" or // strcmp
 			"aesyjrHVWy4" or // strncmp
@@ -896,7 +888,12 @@ public sealed partial class DirectExecutionBackend
 			"6ULAa0fq4jA" or // scePthreadRwlockInit
 			"1471ajPzxh0" or // pthread_rwlock_destroy
 			"BB+kb08Tl9A" or // scePthreadRwlockDestroy
-			// rwlock rd/wr lock removed (can block); init/destroy/unlock stay.
+			"iGjsr1WAtI0" or // pthread_rwlock_rdlock
+			"Ox9i0c7L5w0" or // scePthreadRwlockRdlock
+			"sIlRvQqsN2Y" or // pthread_rwlock_wrlock
+			"mqdNorrB+gI" or // scePthreadRwlockWrlock
+			"EgmLo6EWgso" or // pthread_rwlock_unlock
+			"+L98PIbGttk" or // scePthreadRwlockUnlock
 			"aI+OeCz8xrQ" or // scePthreadSelf
 			"EotR8a3ASf4" or // pthread_self
 			"eoht7mQOCmo" or // scePthreadGetspecific
@@ -1081,15 +1078,7 @@ public sealed partial class DirectExecutionBackend
 	}
 
 	private static bool IsImportLoopGuardBoundary(string nid) =>
-    nid switch
-    {
-        "1jfXLRVzisc" => true, // sceKernelUsleep
-        "QcteRwbsnV0" => true, // usleep
-        "n88vx3C5nW8" => true, // gettimeofday
-        "Zxa0VhQVTsk" => true, // sceKernelWaitSema
-        "T72hz6ffq08" => true, // scePthreadYield
-        _ => false
-    };
+		string.Equals(nid, "1jfXLRVzisc", StringComparison.Ordinal);
 
 	private void ResetImportLoopPattern()
 	{

src/SharpEmu.Core/Cpu/Native/DirectExecutionBackend.cs

@@ -25,26 +25,6 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 
 	private const int DefaultImportLoopGuardSeconds = 5;
 
-	private enum ImportStubKind : byte
-	{
-		Normal = 0,
-		BootstrapBridge = 1,
-		KernelDynlibDlsym = 2,
-		Il2CppApiLookupSymbol = 3,
-	}
-
-	[Flags]
-	private enum ImportStubTraceFlags : byte
-	{
-		None = 0,
-		Memset = 1 << 0,
-		CxaAtexit = 1 << 1,
-		RawArgs = 1 << 2,
-		StackChkFail = 1 << 3,
-		PeriodicEvery1000 = 1 << 4,
-		PeriodicEvery128 = 1 << 5,
-	}
-
 	private readonly struct ImportStubEntry
 	{
 		public ulong Address { get; }
@@ -53,36 +33,12 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 
 		public ExportedFunction? Export { get; }
 
-		public ImportStubKind Kind { get; }
-
-		public ImportStubTraceFlags TraceFlags { get; }
-
 		public ImportStubEntry(ulong address, string nid, ExportedFunction? export)
 		{
 			Address = address;
 			Nid = nid;
 			Export = export;
-			Kind = ClassifyKind(nid);
-			TraceFlags = ClassifyTraceFlags(nid);
 		}
-
-		private static ImportStubKind ClassifyKind(string nid) => nid switch
-		{
-			RuntimeStubNids.BootstrapBridge => ImportStubKind.BootstrapBridge,
-			RuntimeStubNids.KernelDynlibDlsym or "LwG8g3niqwA" => ImportStubKind.KernelDynlibDlsym,
-			"r8mvOaWdi28" => ImportStubKind.Il2CppApiLookupSymbol,
-			_ => ImportStubKind.Normal,
-		};
-
-		private static ImportStubTraceFlags ClassifyTraceFlags(string nid) => nid switch
-		{
-			"8zTFvBIAIN8" => ImportStubTraceFlags.Memset,
-			"tsvEmnenz48" => ImportStubTraceFlags.CxaAtexit | ImportStubTraceFlags.PeriodicEvery1000,
-			"bzQExy189ZI" or "8G2LB+A3rzg" => ImportStubTraceFlags.RawArgs,
-			"Ou3iL1abvng" => ImportStubTraceFlags.StackChkFail,
-			"rTXw65xmLIA" => ImportStubTraceFlags.PeriodicEvery128,
-			_ => ImportStubTraceFlags.None,
-		};
 	}
 
 	private readonly record struct RecentImportTraceEntry(
@@ -169,8 +125,6 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 
 	private const ulong GuestThreadRegionStride = 0x0100_0000UL;
 
-	private const int GuestThreadRegionSlotCount = 256;
-
 	private const uint PAGE_EXECUTE_READWRITE = 64u;
 
 	private const uint PAGE_READWRITE = 4u;
@@ -2038,16 +1992,9 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 
 		byte* code = (byte*)ptr;
 		int offset = 0;
-		// TlsGetValue returns its TLS pointer in RAX. Preserve the guest return value
-		// above the 32-byte Windows shadow space while keeping the call site aligned.
-		EmitByte(code, ref offset, 0x48); // sub rsp, 0x30
+		EmitByte(code, ref offset, 0x48); // sub rsp, 0x20
 		EmitByte(code, ref offset, 0x83);
 		EmitByte(code, ref offset, 0xEC);
-		EmitByte(code, ref offset, 0x30);
-		EmitByte(code, ref offset, 0x48); // mov [rsp+0x20], rax
-		EmitByte(code, ref offset, 0x89);
-		EmitByte(code, ref offset, 0x44);
-		EmitByte(code, ref offset, 0x24);
 		EmitByte(code, ref offset, 0x20);
 		EmitByte(code, ref offset, 0xB9); // mov ecx, tlsIndex
 		EmitUInt32(code, ref offset, _hostRspSlotTlsIndex);
@@ -2057,21 +2004,13 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		offset += sizeof(ulong);
 		EmitByte(code, ref offset, 0xFF); // call rax
 		EmitByte(code, ref offset, 0xD0);
-		EmitByte(code, ref offset, 0x49); // mov r11, rax
-		EmitByte(code, ref offset, 0x89);
-		EmitByte(code, ref offset, 0xC3);
-		EmitByte(code, ref offset, 0x48); // mov rax, [rsp+0x20]
-		EmitByte(code, ref offset, 0x8B);
-		EmitByte(code, ref offset, 0x44);
-		EmitByte(code, ref offset, 0x24);
-		EmitByte(code, ref offset, 0x20);
-		EmitByte(code, ref offset, 0x48); // add rsp, 0x30
+		EmitByte(code, ref offset, 0x48); // add rsp, 0x20
 		EmitByte(code, ref offset, 0x83);
 		EmitByte(code, ref offset, 0xC4);
-		EmitByte(code, ref offset, 0x30);
-		EmitByte(code, ref offset, 0x49); // mov rsp, [r11]
+		EmitByte(code, ref offset, 0x20);
+		EmitByte(code, ref offset, 0x48); // mov rsp, [rax]
 		EmitByte(code, ref offset, 0x8B);
-		EmitByte(code, ref offset, 0x23);
+		EmitByte(code, ref offset, 0x20);
 		EmitHostNonvolatileXmmRestore(code, ref offset);
 		EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x5F);
 		EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x5E);
@@ -2803,21 +2742,7 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 			if (hostThread is not null &&
 				!ReferenceEquals(hostThread, Thread.CurrentThread))
 			{
-				// The handle is published before the host thread starts.
-				if ((hostThread.ThreadState & System.Threading.ThreadState.Unstarted) != 0)
-				{
-					Thread.Sleep(1);
-					continue;
-				}
-
-				try
-				{
-					hostThread.Join(1);
-				}
-				catch (ThreadStateException)
-				{
-					Thread.Sleep(1);
-				}
+				hostThread.Join(1);
 			}
 			else
 			{
@@ -2842,10 +2767,11 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		{
 			return;
 		}
-		if (Interlocked.CompareExchange(ref _guestThreadPumpDepth, 1, 0) != 0)
+		if (_guestThreadPumpDepth != 0)
 		{
 			return;
 		}
+		_guestThreadPumpDepth++;
 		try
 		{
 			for (int i = 0; i < 8; i++)
@@ -2891,7 +2817,7 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		}
 		finally
 		{
-			Volatile.Write(ref _guestThreadPumpDepth, 0);
+			_guestThreadPumpDepth--;
 		}
 	}
 
@@ -2934,18 +2860,9 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 			}
 		}
 
-		if (wakeCount != 0)
+		if (wakeCount != 0 && _logGuestThreads)
 		{
-			if (_logGuestThreads)
-			{
-				Console.Error.WriteLine($"[LOADER][INFO] guest_threads.wake key={wakeKey} count={wakeCount}");
-			}
-
-			// Pump or the readied thread waits for an import dispatch that never comes.
-			if (_cpuContext is { } wakeContext)
-			{
-				Pump(wakeContext, "wake");
-			}
+			Console.Error.WriteLine($"[LOADER][INFO] guest_threads.wake key={wakeKey} count={wakeCount}");
 		}
 
 		return wakeCount;
@@ -3506,7 +3423,7 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		out ulong mappedBase,
 		out string? error)
 	{
-		for (int i = 0; i < GuestThreadRegionSlotCount; i++)
+		for (int i = 0; i < 64; i++)
 		{
 			var candidateBase = baseAddress - ((ulong)i * GuestThreadRegionStride);
 			if (!IsGuestThreadRegionFree(virtualMemory, candidateBase, size))
@@ -3540,7 +3457,7 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		out ulong tlsBase,
 		out string? error)
 	{
-		for (int i = 0; i < GuestThreadRegionSlotCount; i++)
+		for (int i = 0; i < 64; i++)
 		{
 			var candidateBase = GuestThreadTlsBaseAddress - ((ulong)i * GuestThreadRegionStride);
 			var mappedBase = candidateBase - GuestThreadTlsPrefixSize;
@@ -4490,26 +4407,6 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 			return;
 		}
 		_stallWatchdogStop = false;
-
-		// Drives woken threads when every guest thread is parked (nothing dispatches then).
-		var dispatcherThread = new Thread(new ThreadStart(delegate
-		{
-			while (!_stallWatchdogStop)
-			{
-				Thread.Sleep(1);
-				WakeExpiredBlockedGuestThreads();
-				if (Volatile.Read(ref _readyGuestThreadCount) > 0 && _cpuContext is { } dispatchContext)
-				{
-					Pump(dispatchContext, "dispatcher");
-				}
-			}
-		}))
-		{
-			IsBackground = true,
-			Name = "SharpEmu-GuestThreadDispatcher"
-		};
-		dispatcherThread.Start();
-
 		long num = (long)((double)stallWatchdogSeconds * Stopwatch.Frequency);
 		_stallWatchdogThread = new Thread(new ThreadStart(delegate
 		{
@@ -4538,15 +4435,6 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 					MarkExecutionProgress();
 					continue;
 				}
-				if (IsExpectedBlockingImportStall(out var blockingNid, out var blockingName))
-				{
-					Console.Error.WriteLine(
-						$"[LOADER][WARN] No import progress for {stallWatchdogSeconds}s while waiting in {blockingName} ({blockingNid}); continuing.");
-					LogStallWatchdogSnapshot();
-					Console.Error.Flush();
-					MarkExecutionProgress();
-					continue;
-				}
 				if (Interlocked.Exchange(ref _stallWatchdogTriggered, 1) != 0)
 				{
 					continue;
@@ -4582,38 +4470,6 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
 		return false;
 	}
 
-	// A thread parked in a blocking wait is idle by design, not stalled.
-	private bool IsExpectedBlockingImportStall(out string nid, out string name)
-	{
-		nid = string.Empty;
-		name = string.Empty;
-		var cpuContext = _cpuContext;
-		if (cpuContext is null)
-		{
-			return false;
-		}
-
-		var importAddress = cpuContext.Rip & 0xFFFFFFFFFFFFFFF0uL;
-		foreach (var entry in _importEntries)
-		{
-			if (entry.Address != importAddress)
-			{
-				continue;
-			}
-
-			nid = entry.Nid;
-			name = _moduleManager.TryGetExport(nid, out var export)
-				? $"{export.LibraryName}:{export.Name}"
-				: nid;
-			return nid is
-				"Op8TBGY5KHg" or // pthread_cond_wait
-				"27bAgiJmOh0" or // pthread_cond_timedwait
-				"fzyMKs9kim0";   // sceKernelWaitEqueue
-		}
-
-		return false;
-	}
-
 	private void StopStallWatchdog()
 	{
 		_stallWatchdogStop = true;

src/SharpEmu.Core/Loader/ParamLoader.cs

@@ -45,13 +45,7 @@ public static class Ps5ParamJsonReader
 
         try
         {
-            ReadOnlyMemory<byte> json = data;
-            if (json.Span.StartsWith("\uFEFF"u8))
-            {
-                json = json[3..];
-            }
-
-            using var doc = JsonDocument.Parse(json);
+            using var doc = JsonDocument.Parse(data);
             return TryReadPs5Param(doc.RootElement);
         }
         catch (JsonException)
@@ -62,15 +56,12 @@ public static class Ps5ParamJsonReader
 
     private static (string? Title, string? TitleId, string? Version) TryReadPs5Param(JsonElement root)
     {
-        if (root.ValueKind != JsonValueKind.Object)
-            return (null, null, null);
-
-        var titleId = GetString(root, "titleId");
+        string? titleId = root.TryGetProperty("titleId", out var eTid) ? eTid.GetString() : null;
 
         string? ver =
-            GetString(root, "contentVersion")
-            ?? GetString(root, "masterVersion")
-            ?? GetString(root, "targetContentVersion");
+            (root.TryGetProperty("contentVersion", out var cv) ? cv.GetString() : null)
+            ?? (root.TryGetProperty("masterVersion", out var mv) ? mv.GetString() : null)
+            ?? (root.TryGetProperty("targetContentVersion", out var tv) ? tv.GetString() : null);
 
         string? title = ExtractTitleName(root);
 
@@ -79,49 +70,34 @@ public static class Ps5ParamJsonReader
 
     private static string? ExtractTitleName(JsonElement root)
     {
-        if ((!root.TryGetProperty("localizedParameters", out var lp) || lp.ValueKind != JsonValueKind.Object) &&
-            root.TryGetProperty("disc", out var disc) && disc.ValueKind == JsonValueKind.Object)
+        if (!root.TryGetProperty("localizedParameters", out var lp))
         {
-            disc.TryGetProperty("localizedParameters", out lp);
+            if (root.TryGetProperty("disc", out var disc) && disc.ValueKind == JsonValueKind.Object)
+            {
+                disc.TryGetProperty("localizedParameters", out lp);
+            }
         }
 
         if (lp.ValueKind != JsonValueKind.Object)
             return null;
 
-        var defLang = GetString(lp, "defaultLanguage");
+        string? defLang = lp.TryGetProperty("defaultLanguage", out var dl) ? dl.GetString() : null;
 
         if (!string.IsNullOrEmpty(defLang))
         {
             if (lp.TryGetProperty(defLang, out var langObj) && langObj.ValueKind == JsonValueKind.Object)
             {
-                var title = GetString(langObj, "titleName");
-                if (!string.IsNullOrWhiteSpace(title))
-                    return title;
+                if (langObj.TryGetProperty("titleName", out var tn))
+                    return tn.GetString();
             }
         }
 
         if (lp.TryGetProperty("en-US", out var en) && en.ValueKind == JsonValueKind.Object)
         {
-            var title = GetString(en, "titleName");
-            if (!string.IsNullOrWhiteSpace(title))
-                return title;
-        }
-
-        foreach (var property in lp.EnumerateObject())
-        {
-            if (property.Value.ValueKind == JsonValueKind.Object)
-            {
-                var title = GetString(property.Value, "titleName");
-                if (!string.IsNullOrWhiteSpace(title))
-                    return title;
-            }
+            if (en.TryGetProperty("titleName", out var tn2))
+                return tn2.GetString();
         }
 
         return null;
     }
-
-    private static string? GetString(JsonElement parent, string propertyName) =>
-        parent.TryGetProperty(propertyName, out var value) && value.ValueKind == JsonValueKind.String
-            ? value.GetString()
-            : null;
 }

src/SharpEmu.Core/Runtime/SharpEmuRuntime.cs

@@ -83,6 +83,7 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             ImportTraceLimit = Math.Max(0, options.ImportTraceLimit),
         };
         var moduleManager = new ModuleManager();
+        moduleManager.RegisterFromAssembly(typeof(VideoOutExports).Assembly, Generation.Gen4 | Generation.Gen5, Aerolib.Instance);
         moduleManager.RegisterFromAssembly(typeof(KernelExports).Assembly, Generation.Gen4 | Generation.Gen5, Aerolib.Instance);
         moduleManager.Freeze();
 

src/SharpEmu.GUI/App.axaml

@@ -127,34 +127,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
       <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
     </Style>
 
-    <!-- Top-level page switcher (Library / Options): plain transparent
-         buttons, not TabItem, so there is no Fluent selected-tab underline.
-         The active page is conveyed by brightness alone; LB/RB gamepad
-         hints flank the pair. -->
-    <Style Selector="Button.segment">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderThickness" Value="0" />
-      <Setter Property="Foreground" Value="{StaticResource MutedBrush}" />
-      <Setter Property="FontSize" Value="22" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="Padding" Value="6,4" />
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-    <Style Selector="Button.segment:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
-    <Style Selector="Button.segment.active">
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
-
-    <!-- Gamepad shoulder-button hint chip (LB/RB, L1/R1). -->
-    <Style Selector="Border.padHint">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="CornerRadius" Value="6" />
-      <Setter Property="Padding" Value="8,3" />
-    </Style>
-
     <Style Selector="ContextMenu">
       <Setter Property="Background" Value="{StaticResource CardBrush}" />
       <Setter Property="BorderBrush" Value="{StaticResource CardBorderBrush}" />

src/SharpEmu.GUI/ConsoleWindow.cs

@@ -27,10 +27,8 @@ public sealed class ConsoleWindow : Window
         Action clear,
         bool autoScroll)
     {
-        var loc = Localization.Instance;
-
         _sourceLines = lines;
-        Title = loc.Get("Console.WindowTitle");
+        Title = "SharpEmu Console";
         Width = 980;
         Height = 620;
         MinWidth = 520;
@@ -38,15 +36,10 @@ public sealed class ConsoleWindow : Window
         Background = new SolidColorBrush(Color.Parse("#0D1017"));
         Icon = new WindowIcon(AssetLoader.Open(new Uri("avares://SharpEmu.GUI/Assets/SharpEmu.ico")));
 
-        _searchBox = new TextBox
-        {
-            Watermark = loc.Get("Console.SearchWatermark"),
-            Width = 320,
-            Margin = new Thickness(0, 0, 12, 0),
-        };
+        _searchBox = new TextBox { Watermark = "Search...", Width = 320, Margin = new Thickness(0, 0, 12, 0) };
         _autoScrollCheck = new CheckBox
         {
-            Content = loc.Get("Console.AutoScroll"),
+            Content = "Auto-scroll",
             IsChecked = autoScroll,
             FontSize = 12,
             Margin = new Thickness(0, 0, 12, 0),
@@ -55,16 +48,11 @@ public sealed class ConsoleWindow : Window
         var copyButton = new Button
         {
             Classes = { "ghost" },
-            Content = loc.Get("Console.Copy"),
+            Content = "Copy",
             Padding = new Thickness(10, 4),
             Margin = new Thickness(0, 0, 8, 0),
         };
-        var clearButton = new Button
-        {
-            Classes = { "ghost" },
-            Content = loc.Get("Console.Clear"),
-            Padding = new Thickness(10, 4),
-        };
+        var clearButton = new Button { Classes = { "ghost" }, Content = "Clear", Padding = new Thickness(10, 4) };
         copyButton.Click += async (_, _) => await CopyAsync();
         clearButton.Click += (_, _) => clear();
         _searchBox.TextChanged += (_, _) => RefreshVisibleLines();
@@ -99,7 +87,7 @@ public sealed class ConsoleWindow : Window
                         new TextBlock
                         {
                             Classes = { "sectionTitle" },
-                            Text = loc.Get("Console.Title"),
+                            Text = "CONSOLE",
                             VerticalAlignment = VerticalAlignment.Center,
                         },
                         _searchBox.WithGridColumn(1),

src/SharpEmu.GUI/GameEntry.cs

@@ -29,12 +29,10 @@ public sealed class GameEntry : INotifyPropertyChanged
     private long _sizeBytes;
 
     public GameEntry(
-        string name, string? titleId, string? version, string path, long sizeBytes,
-        string? coverPath, string? backgroundPath)
+        string name, string? titleId, string path, long sizeBytes, string? coverPath, string? backgroundPath)
     {
         Name = name;
         TitleId = titleId;
-        Version = version;
         Path = path;
         _sizeBytes = sizeBytes;
         CoverPath = coverPath;
@@ -48,9 +46,6 @@ public sealed class GameEntry : INotifyPropertyChanged
 
     public string? TitleId { get; }
 
-    /// <summary>Content version from sce_sys/param.json, e.g. "01.000.000".</summary>
-    public string? Version { get; }
-
     public string Path { get; }
 
     /// <summary>
@@ -70,7 +65,7 @@ public sealed class GameEntry : INotifyPropertyChanged
 
             _sizeBytes = value;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SizeBytes)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SizeText)));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Detail)));
         }
     }
 
@@ -111,15 +106,9 @@ public sealed class GameEntry : INotifyPropertyChanged
 
     public bool HasCover => _cover is not null;
 
-    public bool HasTitleId => TitleId is not null;
-
-    /// <summary>Badge text shown in the launch bar, e.g. "v01.000.000".</summary>
-    public string? VersionText => Version is null ? null : $"v{Version}";
-
-    public bool HasVersion => Version is not null;
-
-    /// <summary>Formatted install size badge shown in the launch bar.</summary>
-    public string SizeText => FormatSize(SizeBytes);
+    public string Detail => TitleId is not null
+        ? $"{TitleId}  •  {FormatSize(SizeBytes)}"
+        : FormatSize(SizeBytes);
 
     private static string ComputeInitials(string name)
     {

src/SharpEmu.GUI/GuiSettings.cs

@@ -42,9 +42,6 @@ public sealed class GuiSettings
 
     public string? EmulatorPath { get; set; }
 
-    /// <summary>UI language, matching a file code under Languages/ (e.g. "en", "tr").</summary>
-    public string Language { get; set; } = "en";
-
     /// <summary>Publish launcher/game status to Discord Rich Presence.</summary>
     public bool DiscordRichPresence { get; set; } = true;
 

src/SharpEmu.GUI/Languages/ar.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "العربية",
-
-  "Page.Library": "المكتبة",
-  "Page.Options": "الخيارات",
-  "Page.GameCount.One": "لعبة واحدة",
-  "Page.GameCount.Other": "{0} لعبة",
-
-  "Library.SearchWatermark": "ابحث في المكتبة...",
-  "Library.AddFolder": "＋ إضافة مجلد",
-  "Library.Rescan": "⟳ إعادة الفحص",
-  "Library.OpenFile": "فتح ملف...",
-
-  "Library.Context.Launch": "تشغيل",
-  "Library.Context.OpenFolder": "فتح مجلد اللعبة",
-  "Library.Context.CopyPath": "نسخ المسار",
-  "Library.Context.CopyTitleId": "نسخ معرف العنوان",
-  "Library.Context.Remove": "إزالة من المكتبة",
-
-  "Library.Empty.Title": "مكتبتك فارغة",
-  "Library.Empty.Hint": "أضف مجلداً يحتوي على ألعابك للبدء.",
-  "Library.Empty.SearchTitle": "لا توجد ألعاب تطابق بحثك",
-  "Library.Empty.SearchHint": "لا شيء في المكتبة يطابق “{0}”.",
-  "Library.Empty.AddFolder": "＋ إضافة مجلد ألعاب",
-
-  "Library.Loading": "جارٍ تحميل المكتبة...",
-
-  "Options.General": "عام",
-  "Options.Section.Emulation": "المحاكاة",
-  "Options.Section.Logging": "التسجيل",
-  "Options.Section.Launcher": "المُشغِّل",
-
-  "Options.CpuEngine.Label": "محرك المعالج",
-  "Options.CpuEngine.Desc": "محرك التنفيذ المستخدم لتشغيل كود اللعبة.", 
-  "Options.CpuEngine.Native": "أصلي",
-
-  "Options.Strict.Label": "ربط صارم للمكتبات الديناميكية (dynlib)",
-  "Options.Strict.Desc": "إفشال التشغيل عندما يتعذر التعرف على رمز مستورد.",
-
-  "Options.LogLevel.Label": "مستوى التسجيل",
-  "Options.LogLevel.Desc": "مدى تفصيل مخرجات نافذة سجلات المحاكي.",
-  "Options.LogLevel.Trace": "تتبع",
-  "Options.LogLevel.Debug": "تصحيح الأخطاء",
-  "Options.LogLevel.Info": "معلومات",
-  "Options.LogLevel.Warning": "تحذير",
-  "Options.LogLevel.Error": "خطأ",
-  "Options.LogLevel.Critical": "حرج",
-
-  "Options.TraceImports.Label": "حد تتبع الاستيراد",
-  "Options.TraceImports.Desc": "تتبع أول N استيراد لكل وحدة (0 = إيقاف).",
-
-  "Options.LogToFile.Label": "التسجيل في ملف",
-  "Options.LogToFile.Desc": "نسخ مخرجات المحاكي إلى ملف سجل.",
-
-  "Options.LogFilePath.Label": "مسار ملف السجل",
-  "Options.LogFilePath.Default": "لا يوجد مسار مخصص — تُحفظ السجلات في user/logs بجوار المحاكي.",
-  "Options.LogFilePath.Select": "تحديد...",
-
-  "Options.OverrideLogFile.Label": "الكتابة فوق ملف السجل",
-  "Options.OverrideLogFile.Desc": "استخدام مسار الملف الدقيق بدلاً من إلحاق معرف العنوان والطابع الزمني.",
-
-  "Options.TitleMusic.Label": "موسيقى اللعبة",
-  "Options.TitleMusic.Desc": "تكرار موسيقى المعاينة للعبة المحددة في المكتبة.",
-
-  "Options.Discord.Label": "حالة دسكورد",
-  "Options.Discord.Desc": "إظهار اللعبة قيد التشغيل في ملفك الشخصي على دسكورد.",
-
-  "Options.Language.Label": "لغة المحاكي",
-  "Options.Language.Desc": "اللغة المستخدمة في جميع أنحاء المشغل. تُطبق فوراً.",
-
-  "Common.On": "تشغيل",
-  "Common.Off": "إيقاف",
-
-  "Console.Title": "نافذة السجلات",
-  "Console.SearchWatermark": "بحث...",
-  "Console.AutoScroll": "تمرير تلقائي",
-  "Console.Split": "تقسيم",
-  "Console.Copy": "نسخ",
-  "Console.Clear": "مسح",
-  "Console.WindowTitle": "نافذة سجلات SharpEmu",
-
-  "Launch.NoGameSelected": "لم تُحدد أي لعبة",
-  "Launch.NoGameHint": "اختر لعبة من المكتبة، أو افتح ملف eboot.bin مباشرة.",
-  "Launch.Idle": "خامل",
-  "Launch.Console": "≡ نافذة السجلات",
-  "Launch.Launch": "▶  تشغيل",
-  "Launch.Stop": "■  إيقاف",
-  "Launch.Running": "قيد التشغيل — {0}",
-  "Launch.Stopping": "جارٍ الإيقاف...",
-  "Launch.Exited": "انتهى برمز {0} ({1})",
-  "Launch.ExeNotFound": "لم يُعثر على الملف التنفيذي SharpEmu. ابنِ مشروع SharpEmu.CLI أولاً (dotnet build).",
-  "Launch.LogFile": "ملف السجل: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "فشل بدء تشغيل المحاكي: {0}",
-  "Launch.ProcessExited": "انتهت العملية برمز {0} ({1}).",
-
-  "Exit.Ok": "موافق",
-  "Exit.InvalidArguments": "معطيات غير صالحة",
-  "Exit.EbootNotFound": "لم يُعثر على eboot",
-  "Exit.RuntimeException": "استثناء وقت التشغيل",
-  "Exit.EmulationError": "خطأ في المحاكاة",
-  "Exit.Unknown": "غير معروف",
-
-  "Status.EmulatorLocating": "المحاكي: جارٍ تحديد الموقع...",
-  "Status.EmulatorPath": "المحاكي: {0}",
-  "Status.EmulatorNotFound": "المحاكي: لم يُعثر على الملف التنفيذي SharpEmu — ابنِ SharpEmu.CLI أولاً.",
-  "Status.ScanningLibrary": "جارٍ فحص المكتبة...",
-  "Status.AddFolderPrompt": "أضف مجلد ألعاب لملء المكتبة.",
-  "Status.LibraryScanned": "فُحصت المكتبة: {0} لعبة في {1} مجلد.",
-  "Status.CouldNotOpenFolder": "تعذر فتح المجلد: {0}",
-  "Status.CopiedToClipboard": "نُسخ {0} إلى الحافظة.",
-  "Status.RemovedFromLibrary": "أُزيل “{0}” من المكتبة. أعد إضافة مجلده لاستعادته.",
-  "Status.Running": "جارٍ تشغيل {0}",
-  "Status.Stopping": "جارٍ الإيقاف...",
-  "Status.Idle": "خامل",
-
-  "Clipboard.Path": "المسار",
-  "Clipboard.TitleId": "معرف العنوان",
-
-  "Discord.Playing": "يلعب {0}",
-  "Discord.Browsing": "يتصفح المكتبة",
-
-  "Dialog.ChooseGameFolder": "اختر مجلداً يحتوي على ألعاب",
-  "Dialog.OpenExecutable": "افتح ملفاً تنفيذياً لتشغيله",
-  "Dialog.PsExecutables": "ملفات PS التنفيذية",
-  "Dialog.SaveLogFile": "حدد مكان حفظ ملف السجل",
-  "Dialog.PlainTextFiles": "ملفات نصية عادية",
-  "Dialog.LogFiles": "ملفات السجل"
-}

src/SharpEmu.GUI/Languages/de.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Deutsch",
-
-  "Page.Library": "Bibliothek",
-  "Page.Options": "Optionen",
-  "Page.GameCount.One": "1 Spiel",
-  "Page.GameCount.Other": "{0} Spiele",
-
-  "Library.SearchWatermark": "Bibliothek durchsuchen…",
-  "Library.AddFolder": "＋ Spielordner hinzufügen",
-  "Library.Rescan": "⟳ Neu scannen",
-  "Library.OpenFile": "Datei öffnen…",
-
-  "Library.Context.Launch": "Starten",
-  "Library.Context.OpenFolder": "Spielordner öffnen",
-  "Library.Context.CopyPath": "Pfad kopieren",
-  "Library.Context.CopyTitleId": "Title ID kopieren",
-  "Library.Context.Remove": "Aus Bibliothek entfernen",
-
-  "Library.Empty.Title": "Deine Bibliothek ist leer",
-  "Library.Empty.Hint": "Füge einen Ordner mit deinen Spielen hinzu, um zu beginnen.",
-  "Library.Empty.SearchTitle": "Keine Spiele gefunden",
-  "Library.Empty.SearchHint": "Nichts in der Bibliothek entspricht "{0}".",
-  "Library.Empty.AddFolder": "＋ Spielordner hinzufügen",
-
-  "Library.Loading": "Bibliothek wird geladen…",
-
-  "Options.General": "Allgemein",
-  "Options.Section.Emulation": "EMULATION",
-  "Options.Section.Logging": "PROTOKOLLIERUNG",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "CPU-Engine",
-  "Options.CpuEngine.Desc": "Ausführungs-Engine, die zum Ausführen des Spiel-Codes verwendet wird.",
-  "Options.CpuEngine.Native": "Nativ",
-
-  "Options.Strict.Label": "Strikte dynlib-Auflösung",
-  "Options.Strict.Desc": "Starten abbrechen, wenn ein importiertes Symbol nicht aufgelöst werden kann.",
-
-  "Options.LogLevel.Label": "Protokollstufe",
-  "Options.LogLevel.Desc": "Ausführlichkeit der Emulator-Konsolenausgabe.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Warnung",
-  "Options.LogLevel.Error": "Fehler",
-  "Options.LogLevel.Critical": "Kritisch",
-
-  "Options.TraceImports.Label": "Import-Trace-Limit",
-  "Options.TraceImports.Desc": "Die ersten N Imports pro Modul verfolgen (0 = aus).",
-
-  "Options.LogToFile.Label": "In Datei protokollieren",
-  "Options.LogToFile.Desc": "Emulator-Ausgabe zusätzlich in eine Log-Datei schreiben.",
-
-  "Options.LogFilePath.Label": "Protokolldatei-Pfad",
-  "Options.LogFilePath.Default": "Kein benutzerdefinierter Pfad – Logs werden im Ordner user/logs neben dem Emulator gespeichert.",
-  "Options.LogFilePath.Select": "Auswählen…",
-
-  "Options.OverrideLogFile.Label": "Protokolldatei überschreiben",
-  "Options.OverrideLogFile.Desc": "Genauen Dateipfad verwenden, statt Title-ID und Zeitstempel anzuhängen.",
-
-  "Options.TitleMusic.Label": "Titel-Musik",
-  "Options.TitleMusic.Desc": "Die Vorschau-Musik des ausgewählten Spiels in der Bibliothek loopend abspielen.",
-
-  "Options.Discord.Label": "Discord-Präsenz",
-  "Options.Discord.Desc": "Zeigt das aktuell gespielte Spiel in deinem Discord-Profil an.",
-
-  "Options.Language.Label": "Emulator-Sprache",
-  "Options.Language.Desc": "Sprache der Benutzeroberfläche. Wird sofort angewendet.",
-
-  "Common.On": "An",
-  "Common.Off": "Aus",
-
-  "Console.Title": "KONSOLE",
-  "Console.SearchWatermark": "Suchen...",
-  "Console.AutoScroll": "Auto-Scroll",
-  "Console.Split": "Teilen",
-  "Console.Copy": "Kopieren",
-  "Console.Clear": "Leeren",
-  "Console.WindowTitle": "SharpEmu Konsole",
-
-  "Launch.NoGameSelected": "Kein Spiel ausgewählt",
-  "Launch.NoGameHint": "Wähle ein Spiel aus der Bibliothek aus oder öffne eine eboot.bin direkt.",
-  "Launch.Idle": "Bereit",
-  "Launch.Console": "≡ Konsole",
-  "Launch.Launch": "▶ Starten",
-  "Launch.Stop": "■ Stoppen",
-  "Launch.Running": "Läuft -- {0}",
-  "Launch.Stopping": "Wird beendet…",
-  "Launch.Exited": "Beendet mit Code {0} ({1})",
-  "Launch.ExeNotFound": "SharpEmu-Executable wurde nicht gefunden. Baue zuerst das SharpEmu.CLI-Projekt (dotnet build).",
-  "Launch.LogFile": "Log-Datei: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Emulator konnte nicht gestartet werden: {0}",
-  "Launch.ProcessExited": "Prozess wurde mit Code {0} ({1}) beendet.",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "Ungültige Argumente",
-  "Exit.EbootNotFound": "eboot nicht gefunden",
-  "Exit.RuntimeException": "Laufzeitfehler",
-  "Exit.EmulationError": "Emulationsfehler",
-  "Exit.Unknown": "unbekannt",
-
-  "Status.EmulatorLocating": "Emulator: wird gesucht…",
-  "Status.EmulatorPath": "Emulator: {0}",
-  "Status.EmulatorNotFound": "Emulator: SharpEmu-Executable nicht gefunden -- baue zuerst SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Bibliothek wird gescannt…",
-  "Status.AddFolderPrompt": "Füge einen Spielordner hinzu, um die Bibliothek zu füllen.",
-  "Status.LibraryScanned": "Bibliothek gescannt: {0} Spiel(e) in {1} Ordner(n).",
-  "Status.CouldNotOpenFolder": "Ordner konnte nicht geöffnet werden: {0}",
-  "Status.CopiedToClipboard": "{0} in die Zwischenablage kopiert.",
-  "Status.RemovedFromLibrary": ""{0}" wurde aus der Bibliothek entfernt. Füge den Ordner erneut hinzu, um es wiederherzustellen.",
-  "Status.Running": "Läuft {0}",
-  "Status.Stopping": "Wird gestoppt…",
-  "Status.Idle": "Bereit",
-
-  "Clipboard.Path": "Pfad",
-  "Clipboard.TitleId": "Title ID",
-
-  "Discord.Playing": "Spielt {0}",
-  "Discord.Browsing": "Durchsucht die Bibliothek",
-
-  "Dialog.ChooseGameFolder": "Spielordner auswählen",
-  "Dialog.OpenExecutable": "Ausführbare Datei zum Starten öffnen",
-  "Dialog.PsExecutables": "PS-Ausführbare Dateien",
-  "Dialog.SaveLogFile": "Protokolldatei speichern unter",
-  "Dialog.PlainTextFiles": "Textdateien",
-  "Dialog.LogFiles": "Protokolldateien"
-}

src/SharpEmu.GUI/Languages/dk.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Dansk",
-
-  "Page.Library": "Bibliotek",
-  "Page.Options": "Indstillinger",
-  "Page.GameCount.One": "1 spil",
-  "Page.GameCount.Other": "{0} spil",
-
-  "Library.SearchWatermark": "Søg i biblioteket…",
-  "Library.AddFolder": "＋ Tilføj mappe",
-  "Library.Rescan": "⟳ Genindlæs",
-  "Library.OpenFile": "Åbn fil…",
-
-  "Library.Context.Launch": "Start",
-  "Library.Context.OpenFolder": "Åbn spilmappe",
-  "Library.Context.CopyPath": "Kopiér sti",
-  "Library.Context.CopyTitleId": "Kopiér titel-ID",
-  "Library.Context.Remove": "Fjern fra bibliotek",
-
-  "Library.Empty.Title": "Dit bibliotek er tomt",
-  "Library.Empty.Hint": "Tilføj en mappe med dine spil for at komme i gang.",
-  "Library.Empty.SearchTitle": "Ingen spil matcher din søgning",
-  "Library.Empty.SearchHint": "Intet i biblioteket matcher “{0}”.",
-  "Library.Empty.AddFolder": "＋ Tilføj spilmappe",
-
-  "Library.Loading": "Indlæser bibliotek…",
-
-  "Options.General": "Generelt",
-  "Options.Section.Emulation": "EMULERING",
-  "Options.Section.Logging": "LOGGING",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "CPU-engine",
-  "Options.CpuEngine.Desc": "Den eksekveringsengine der bruges til at køre spilkode.",
-  "Options.CpuEngine.Native": "Native",
-
-  "Options.Strict.Label": "Streng dynlib-opløsning",
-  "Options.Strict.Desc": "Afbryd opstarten, når et importeret symbol ikke kan findes.",
-
-  "Options.LogLevel.Label": "Logniveau",
-  "Options.LogLevel.Desc": "Detaljeringsgrad for emulatorens konsoloutput.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Advarsel",
-  "Options.LogLevel.Error": "Fejl",
-  "Options.LogLevel.Critical": "Kritisk",
-
-  "Options.TraceImports.Label": "Grænse for import-trace",
-  "Options.TraceImports.Desc": "Spor de første N imports pr. modul (0 = fra).",
-
-  "Options.LogToFile.Label": "Log til fil",
-  "Options.LogToFile.Desc": "Spejl emulatorens output til en logfil.",
-
-  "Options.LogFilePath.Label": "Sti til logfil",
-  "Options.LogFilePath.Default": "Ingen brugerdefineret sti — logs gemmes i user/logs ved siden af emulatoren.",
-  "Options.LogFilePath.Select": "Vælg…",
-
-  "Options.OverrideLogFile.Label": "Tilsidesæt logfil",
-  "Options.OverrideLogFile.Desc": "Brug den præcise filsti i stedet for at tilføje titel-ID og tidsstempel.",
-
-  "Options.TitleMusic.Label": "Titelmusik",
-  "Options.TitleMusic.Desc": "Gentag det valgte spils forhåndsvisningsmusik i biblioteket.",
-
-  "Options.Discord.Label": "Discord-tilstedeværelse",
-  "Options.Discord.Desc": "Vis det kørende spil på din Discord-profil.",
-
-  "Options.Language.Label": "Emulatorsprog",
-  "Options.Language.Desc": "Sprog der bruges i hele launcheren. Anvendes med det samme.",
-
-  "Common.On": "Til",
-  "Common.Off": "Fra",
-
-  "Console.Title": "KONSOL",
-  "Console.SearchWatermark": "Søg...",
-  "Console.AutoScroll": "Auto-scroll",
-  "Console.Split": "Opdel",
-  "Console.Copy": "Kopiér",
-  "Console.Clear": "Ryd",
-  "Console.WindowTitle": "SharpEmu-konsol",
-
-  "Launch.NoGameSelected": "Intet spil valgt",
-  "Launch.NoGameHint": "Vælg et spil fra biblioteket, eller åbn en eboot.bin direkte.",
-  "Launch.Idle": "Inaktiv",
-  "Launch.Console": "≡ Konsol",
-  "Launch.Launch": "▶  Start",
-  "Launch.Stop": "■  Stop",
-  "Launch.Running": "Kører — {0}",
-  "Launch.Stopping": "Stopper…",
-  "Launch.Exited": "Afsluttet med kode {0} ({1})",
-  "Launch.ExeNotFound": "SharpEmu-programmet blev ikke fundet. Byg SharpEmu.CLI-projektet først (dotnet build).",
-  "Launch.LogFile": "Logfil: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Kunne ikke starte emulatoren: {0}",
-  "Launch.ProcessExited": "Processen afsluttede med kode {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "ugyldige argumenter",
-  "Exit.EbootNotFound": "eboot ikke fundet",
-  "Exit.RuntimeException": "runtime-fejl",
-  "Exit.EmulationError": "emuleringsfejl",
-  "Exit.Unknown": "ukendt",
-
-  "Status.EmulatorLocating": "Emulator: lokaliserer…",
-  "Status.EmulatorPath": "Emulator: {0}",
-  "Status.EmulatorNotFound": "Emulator: SharpEmu-programmet blev ikke fundet — byg SharpEmu.CLI først.",
-  "Status.ScanningLibrary": "Skanner bibliotek…",
-  "Status.AddFolderPrompt": "Tilføj en spilmappe for at udfylde biblioteket.",
-  "Status.LibraryScanned": "Bibliotek skannet: {0} spil i {1} mappe(r).",
-  "Status.CouldNotOpenFolder": "Kunne ikke åbne mappe: {0}",
-  "Status.CopiedToClipboard": "{0} kopieret til udklipsholderen.",
-  "Status.RemovedFromLibrary": "“{0}” fjernet fra biblioteket. Tilføj mappen igen for at gendanne det.",
-  "Status.Running": "Kører {0}",
-  "Status.Stopping": "Stopper…",
-  "Status.Idle": "Inaktiv",
-
-  "Clipboard.Path": "Sti",
-  "Clipboard.TitleId": "Titel-ID",
-
-  "Discord.Playing": "Spiller {0}",
-  "Discord.Browsing": "Gennemser biblioteket",
-
-  "Dialog.ChooseGameFolder": "Vælg en mappe der indeholder spil",
-  "Dialog.OpenExecutable": "Åbn et program der skal startes",
-  "Dialog.PsExecutables": "PS-programmer",
-  "Dialog.SaveLogFile": "Vælg hvor logfilen skal gemmes",
-  "Dialog.PlainTextFiles": "Almindelige tekstfiler",
-  "Dialog.LogFiles": "Logfiler"
-}

src/SharpEmu.GUI/Languages/en.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "English",
-
-  "Page.Library": "Library",
-  "Page.Options": "Options",
-  "Page.GameCount.One": "1 game",
-  "Page.GameCount.Other": "{0} games",
-
-  "Library.SearchWatermark": "Search library…",
-  "Library.AddFolder": "＋ Add folder",
-  "Library.Rescan": "⟳ Rescan",
-  "Library.OpenFile": "Open file…",
-
-  "Library.Context.Launch": "Launch",
-  "Library.Context.OpenFolder": "Open game folder",
-  "Library.Context.CopyPath": "Copy path",
-  "Library.Context.CopyTitleId": "Copy title ID",
-  "Library.Context.Remove": "Remove from library",
-
-  "Library.Empty.Title": "Your library is empty",
-  "Library.Empty.Hint": "Add a folder containing your games to get started.",
-  "Library.Empty.SearchTitle": "No games match your search",
-  "Library.Empty.SearchHint": "Nothing in the library matches “{0}”.",
-  "Library.Empty.AddFolder": "＋ Add game folder",
-
-  "Library.Loading": "Loading library…",
-
-  "Options.General": "General",
-  "Options.Section.Emulation": "EMULATION",
-  "Options.Section.Logging": "LOGGING",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "CPU engine",
-  "Options.CpuEngine.Desc": "Execution engine used to run game code.",
-  "Options.CpuEngine.Native": "Native",
-
-  "Options.Strict.Label": "Strict dynlib resolution",
-  "Options.Strict.Desc": "Fail the launch when an imported symbol cannot be resolved.",
-
-  "Options.LogLevel.Label": "Log level",
-  "Options.LogLevel.Desc": "Verbosity of the emulator console output.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Warning",
-  "Options.LogLevel.Error": "Error",
-  "Options.LogLevel.Critical": "Critical",
-
-  "Options.TraceImports.Label": "Import trace limit",
-  "Options.TraceImports.Desc": "Trace the first N imports per module (0 = off).",
-
-  "Options.LogToFile.Label": "Log to file",
-  "Options.LogToFile.Desc": "Mirror emulator output to a log file.",
-
-  "Options.LogFilePath.Label": "Log file path",
-  "Options.LogFilePath.Default": "No custom path — logs go to user/logs next to the emulator.",
-  "Options.LogFilePath.Select": "Select…",
-
-  "Options.OverrideLogFile.Label": "Override log file",
-  "Options.OverrideLogFile.Desc": "Use the exact file path instead of appending title ID and timestamp.",
-
-  "Options.TitleMusic.Label": "Title music",
-  "Options.TitleMusic.Desc": "Loop the selected game's preview music in the library.",
-
-  "Options.Discord.Label": "Discord presence",
-  "Options.Discord.Desc": "Show the running game on your Discord profile.",
-
-  "Options.Language.Label": "Emulator language",
-  "Options.Language.Desc": "Language used throughout the launcher. Applies immediately.",
-
-  "Common.On": "On",
-  "Common.Off": "Off",
-
-  "Console.Title": "CONSOLE",
-  "Console.SearchWatermark": "Search...",
-  "Console.AutoScroll": "Auto-scroll",
-  "Console.Split": "Split",
-  "Console.Copy": "Copy",
-  "Console.Clear": "Clear",
-  "Console.WindowTitle": "SharpEmu Console",
-
-  "Launch.NoGameSelected": "No game selected",
-  "Launch.NoGameHint": "Pick a game from the library, or open an eboot.bin directly.",
-  "Launch.Idle": "Idle",
-  "Launch.Console": "≡ Console",
-  "Launch.Launch": "▶  Launch",
-  "Launch.Stop": "■  Stop",
-  "Launch.Running": "Running — {0}",
-  "Launch.Stopping": "Stopping…",
-  "Launch.Exited": "Exited with code {0} ({1})",
-  "Launch.ExeNotFound": "SharpEmu executable not found. Build the SharpEmu.CLI project first (dotnet build).",
-  "Launch.LogFile": "Log file: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Failed to start the emulator: {0}",
-  "Launch.ProcessExited": "Process exited with code {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "invalid arguments",
-  "Exit.EbootNotFound": "eboot not found",
-  "Exit.RuntimeException": "runtime exception",
-  "Exit.EmulationError": "emulation error",
-  "Exit.Unknown": "unknown",
-
-  "Status.EmulatorLocating": "Emulator: locating…",
-  "Status.EmulatorPath": "Emulator: {0}",
-  "Status.EmulatorNotFound": "Emulator: SharpEmu executable not found — build SharpEmu.CLI first.",
-  "Status.ScanningLibrary": "Scanning library…",
-  "Status.AddFolderPrompt": "Add a game folder to populate the library.",
-  "Status.LibraryScanned": "Library scanned: {0} game(s) in {1} folder(s).",
-  "Status.CouldNotOpenFolder": "Could not open folder: {0}",
-  "Status.CopiedToClipboard": "{0} copied to clipboard.",
-  "Status.RemovedFromLibrary": "Removed “{0}” from the library. Re-add its folder to restore it.",
-  "Status.Running": "Running {0}",
-  "Status.Stopping": "Stopping…",
-  "Status.Idle": "Idle",
-
-  "Clipboard.Path": "Path",
-  "Clipboard.TitleId": "Title ID",
-
-  "Discord.Playing": "Playing {0}",
-  "Discord.Browsing": "Browsing the library",
-
-  "Dialog.ChooseGameFolder": "Choose a folder containing games",
-  "Dialog.OpenExecutable": "Open an executable to launch",
-  "Dialog.PsExecutables": "PS executables",
-  "Dialog.SaveLogFile": "Select where to save the Log file",
-  "Dialog.PlainTextFiles": "Plain Text Files",
-  "Dialog.LogFiles": "Log Files"
-}

src/SharpEmu.GUI/Languages/es.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Español",
-
-  "Page.Library": "Biblioteca",
-  "Page.Options": "Opciones",
-  "Page.GameCount.One": "1 juego",
-  "Page.GameCount.Other": "{0} juegos",
-
-  "Library.SearchWatermark": "Buscar en la biblioteca…",
-  "Library.AddFolder": "＋ Añadir carpeta",
-  "Library.Rescan": "⟳ Volver a escanear",
-  "Library.OpenFile": "Abrir archivo…",
-
-  "Library.Context.Launch": "Iniciar",
-  "Library.Context.OpenFolder": "Abrir carpeta de juegos",
-  "Library.Context.CopyPath": "Copiar ruta",
-  "Library.Context.CopyTitleId": "Copiar ID del título",
-  "Library.Context.Remove": "Eliminar de la biblioteca",
-
-  "Library.Empty.Title": "Tu biblioteca está vacía",
-  "Library.Empty.Hint": "Añade una carpeta que contenga tus juegos para empezar.",
-  "Library.Empty.SearchTitle": "Ningún juego coincide con la búsqueda",
-  "Library.Empty.SearchHint": "No se ha encontrado nada en la biblioteca que coincida con “{0}”.",
-  "Library.Empty.AddFolder": "＋ Añadir carpeta de juegos",
-
-  "Library.Loading": "Cargando biblioteca…",
-
-  "Options.General": "General",
-  "Options.Section.Emulation": "EMULACIÓN",
-  "Options.Section.Logging": "LOGS",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "Motor de CPU",
-  "Options.CpuEngine.Desc": "Motor utilizado para ejecutar el código del juego.",
-  "Options.CpuEngine.Native": "Nativo",
-
-  "Options.Strict.Label": "Resolución estricta de dynlib (Bibliotecas dinámicas)",
-  "Options.Strict.Desc": "Detener la ejecución cuando un símbolo importado no se pueda resolver.",
-
-  "Options.LogLevel.Label": "Nivel de Log",
-  "Options.LogLevel.Desc": "Verbosidad de la salida en consola del emulador.",
-  "Options.LogLevel.Trace": "Trazas",
-  "Options.LogLevel.Debug": "Depuración",
-  "Options.LogLevel.Info": "Información",
-  "Options.LogLevel.Warning": "Advertencia",
-  "Options.LogLevel.Error": "Error",
-  "Options.LogLevel.Critical": "Crítico",
-
-  "Options.TraceImports.Label": "Límite de trazado de importaciones",
-  "Options.TraceImports.Desc": "Trazar las primeras N importaciones por módulo (0 = off).",
-
-  "Options.LogToFile.Label": "Registrar log en archivo",
-  "Options.LogToFile.Desc": "Duplicar la salida del emulador en un archivo de logs.",
-
-  "Options.LogFilePath.Label": "Ruta del archivo de Log",
-  "Options.LogFilePath.Default": "Sin ruta personalizada — los logs van a user/logs al lado del emulador.",
-  "Options.LogFilePath.Select": "Seleccionar…",
-
-  "Options.OverrideLogFile.Label": "Sobreescribir archivo de logs",
-  "Options.OverrideLogFile.Desc": "Utilizar la misma ruta para el archivo de logs en vez de añadir la ID del título y marca de tiempo.",
-
-  "Options.TitleMusic.Label": "Música del título",
-  "Options.TitleMusic.Desc": "Repetir en bucle la preview de la música del juego seleccionado en la biblioteca.",
-
-  "Options.Discord.Label": "Actividad de Discord",
-  "Options.Discord.Desc": "Mostrar juego en ejecución en tu perfil de Discord.",
-
-  "Options.Language.Label": "Idioma del emulador",
-  "Options.Language.Desc": "Idioma utilizado en todo el launcher. Se aplica inmediatamente.",
-
-  "Common.On": "Encendido",
-  "Common.Off": "Apagado",
-
-  "Console.Title": "CONSOLA",
-  "Console.SearchWatermark": "Buscar...",
-  "Console.AutoScroll": "Desplazamiento automático",
-  "Console.Split": "Desacoplar",
-  "Console.Copy": "Copiar",
-  "Console.Clear": "Limpiar",
-  "Console.WindowTitle": "Consola SharpEmu",
-
-  "Launch.NoGameSelected": "No hay ningún juego seleccionado",
-  "Launch.NoGameHint": "Selecciona un juego de la biblioteca o abre un eboot.bin directamente.",
-  "Launch.Idle": "Inactivo",
-  "Launch.Console": "≡ Consola",
-  "Launch.Launch": "▶  Iniciar",
-  "Launch.Stop": "■  Detener",
-  "Launch.Running": "En ejecución — {0}",
-  "Launch.Stopping": "Deteniendo…",
-  "Launch.Exited": "Finalizó con el código {0} ({1})",
-  "Launch.ExeNotFound": "No se ha encontrado el ejecutable de SharpEmu. Compila previamente el proyecto SharpEmu.CLI (dotnet build).",
-  "Launch.LogFile": "Archivo de Log: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Error al iniciar el emulador: {0}",
-  "Launch.ProcessExited": "El proceso finalizó con el código {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "argumentos no válidos",
-  "Exit.EbootNotFound": "no se encontró eboot",
-  "Exit.RuntimeException": "excepción en tiempo de ejecución",
-  "Exit.EmulationError": "error de emulación",
-  "Exit.Unknown": "desconocido",
-
-  "Status.EmulatorLocating": "Emulador: localizando…",
-  "Status.EmulatorPath": "Emulador: {0}",
-  "Status.EmulatorNotFound": "Emulador: No se encontró el ejecutable de SharpEmu — compila previamente SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Escaneando biblioteca…",
-  "Status.AddFolderPrompt": "Añade una carpeta de juegos para poblar la biblioteca.",
-  "Status.LibraryScanned": "Biblioteca escaneada: Se encontraron {0} juego(s) en {1} carpeta(s).",
-  "Status.CouldNotOpenFolder": "No se ha podido abrir la carpeta: {0}",
-  "Status.CopiedToClipboard": "{0} copiado al portapapeles.",
-  "Status.RemovedFromLibrary": "Se eliminó “{0}” de la biblioteca. Vuelve a añadir su carpeta para restaurarlo.",
-  "Status.Running": "Ejecutando {0}",
-  "Status.Stopping": "Deteniendo…",
-  "Status.Idle": "Inactivo",
-
-  "Clipboard.Path": "Ruta",
-  "Clipboard.TitleId": "ID del título",
-
-  "Discord.Playing": "Jugando a {0}",
-  "Discord.Browsing": "Navegando en la biblioteca, buscando un juego para divertirse.",
-
-  "Dialog.ChooseGameFolder": "Selecciona una carpeta que contenga juegos",
-  "Dialog.OpenExecutable": "Abrir un ejecutable para iniciar",
-  "Dialog.PsExecutables": "Ejecutables de PS",
-  "Dialog.SaveLogFile": "Selecciona dónde guardar el archivo de Logs",
-  "Dialog.PlainTextFiles": "Archivos en texto plano",
-  "Dialog.LogFiles": "Archivos de Log"
-}

src/SharpEmu.GUI/Languages/fr.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Français",
-
-  "Page.Library": "Bibliothèque",
-  "Page.Options": "Options",
-  "Page.GameCount.One": "1 jeu",
-  "Page.GameCount.Other": "{0} jeux",
-
-  "Library.SearchWatermark": "Rechercher dans la bibliothèque…",
-  "Library.AddFolder": "＋ Ajouter un dossier",
-  "Library.Rescan": "⟳ Analyser à nouveau",
-  "Library.OpenFile": "Ouvrir un fichier…",
-
-  "Library.Context.Launch": "Lancer",
-  "Library.Context.OpenFolder": "Ouvrir le dossier du jeu",
-  "Library.Context.CopyPath": "Copier le chemin",
-  "Library.Context.CopyTitleId": "Copier l’identifiant du jeu",
-  "Library.Context.Remove": "Retirer de la bibliothèque",
-
-  "Library.Empty.Title": "Votre bibliothèque est vide",
-  "Library.Empty.Hint": "Ajoutez un dossier contenant vos jeux pour commencer.",
-  "Library.Empty.SearchTitle": "Aucun jeu ne correspond à votre recherche",
-  "Library.Empty.SearchHint": "Aucun élément de la bibliothèque ne correspond à « {0} ».",
-  "Library.Empty.AddFolder": "＋ Ajouter un dossier de jeux",
-
-  "Library.Loading": "Chargement de la bibliothèque…",
-
-  "Options.General": "Général",
-  "Options.Section.Emulation": "ÉMULATION",
-  "Options.Section.Logging": "JOURNALISATION",
-  "Options.Section.Launcher": "LANCEUR",
-
-  "Options.CpuEngine.Label": "Moteur CPU",
-  "Options.CpuEngine.Desc": "Moteur d’exécution utilisé pour exécuter le code du jeu.",
-  "Options.CpuEngine.Native": "Natif",
-
-  "Options.Strict.Label": "Résolution stricte des bibliothèques dynamiques",
-  "Options.Strict.Desc": "Interrompre le lancement lorsqu’un symbole importé ne peut pas être résolu.",
-
-  "Options.LogLevel.Label": "Niveau de journalisation",
-  "Options.LogLevel.Desc": "Niveau de détail des messages affichés dans la console de l’émulateur.",
-  "Options.LogLevel.Trace": "Traçage",
-  "Options.LogLevel.Debug": "Débogage",
-  "Options.LogLevel.Info": "Informations",
-  "Options.LogLevel.Warning": "Avertissements",
-  "Options.LogLevel.Error": "Erreurs",
-  "Options.LogLevel.Critical": "Erreurs critiques",
-
-  "Options.TraceImports.Label": "Limite de traçage des imports",
-  "Options.TraceImports.Desc": "Tracer les N premiers imports de chaque module (0 = désactivé).",
-
-  "Options.LogToFile.Label": "Enregistrer dans un fichier",
-  "Options.LogToFile.Desc": "Copier la sortie de l’émulateur dans un fichier journal.",
-
-  "Options.LogFilePath.Label": "Chemin du fichier journal",
-  "Options.LogFilePath.Default": "Aucun chemin personnalisé — les journaux sont enregistrés dans user/logs à côté de l’émulateur.",
-  "Options.LogFilePath.Select": "Sélectionner…",
-
-  "Options.OverrideLogFile.Label": "Remplacer le fichier journal",
-  "Options.OverrideLogFile.Desc": "Utiliser exactement ce chemin au lieu d’ajouter l’identifiant du jeu et l’horodatage.",
-
-  "Options.TitleMusic.Label": "Musique du jeu",
-  "Options.TitleMusic.Desc": "Lire en boucle la musique d’aperçu du jeu sélectionné dans la bibliothèque.",
-
-  "Options.Discord.Label": "Présence Discord",
-  "Options.Discord.Desc": "Afficher le jeu en cours d’exécution sur votre profil Discord.",
-
-  "Options.Language.Label": "Langue de l’émulateur",
-  "Options.Language.Desc": "Langue utilisée dans l’ensemble du lanceur. Le changement est immédiat.",
-
-  "Common.On": "Activé",
-  "Common.Off": "Désactivé",
-
-  "Console.Title": "CONSOLE",
-  "Console.SearchWatermark": "Rechercher…",
-  "Console.AutoScroll": "Défilement automatique",
-  "Console.Split": "Détacher",
-  "Console.Copy": "Copier",
-  "Console.Clear": "Effacer",
-  "Console.WindowTitle": "Console SharpEmu",
-
-  "Launch.NoGameSelected": "Aucun jeu sélectionné",
-  "Launch.NoGameHint": "Choisissez un jeu dans la bibliothèque ou ouvrez directement un fichier eboot.bin.",
-  "Launch.Idle": "Inactif",
-  "Launch.Console": "≡ Console",
-  "Launch.Launch": "▶  Lancer",
-  "Launch.Stop": "■  Arrêter",
-  "Launch.Running": "En cours d’exécution — {0}",
-  "Launch.Stopping": "Arrêt en cours…",
-  "Launch.Exited": "Processus terminé avec le code {0} ({1})",
-  "Launch.ExeNotFound": "L’exécutable SharpEmu est introuvable. Compilez d’abord le projet SharpEmu.CLI (dotnet build).",
-  "Launch.LogFile": "Fichier journal : {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Impossible de démarrer l’émulateur : {0}",
-  "Launch.ProcessExited": "Le processus s’est terminé avec le code {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "arguments non valides",
-  "Exit.EbootNotFound": "eboot introuvable",
-  "Exit.RuntimeException": "exception d’exécution",
-  "Exit.EmulationError": "erreur d’émulation",
-  "Exit.Unknown": "inconnu",
-
-  "Status.EmulatorLocating": "Émulateur : recherche en cours…",
-  "Status.EmulatorPath": "Émulateur : {0}",
-  "Status.EmulatorNotFound": "Émulateur : l’exécutable SharpEmu est introuvable — compilez d’abord SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Analyse de la bibliothèque…",
-  "Status.AddFolderPrompt": "Ajoutez un dossier de jeux pour remplir la bibliothèque.",
-  "Status.LibraryScanned": "Bibliothèque analysée : {0} jeu(x) dans {1} dossier(s).",
-  "Status.CouldNotOpenFolder": "Impossible d’ouvrir le dossier : {0}",
-  "Status.CopiedToClipboard": "{0} copié dans le presse-papiers.",
-  "Status.RemovedFromLibrary": "« {0} » a été retiré de la bibliothèque. Ajoutez à nouveau son dossier pour le restaurer.",
-  "Status.Running": "Exécution de {0}",
-  "Status.Stopping": "Arrêt en cours…",
-  "Status.Idle": "Inactif",
-
-  "Clipboard.Path": "Chemin",
-  "Clipboard.TitleId": "Identifiant du jeu",
-
-  "Discord.Playing": "Joue à {0}",
-  "Discord.Browsing": "Parcourt la bibliothèque",
-
-  "Dialog.ChooseGameFolder": "Choisir un dossier contenant des jeux",
-  "Dialog.OpenExecutable": "Ouvrir un exécutable à lancer",
-  "Dialog.PsExecutables": "Exécutables PlayStation",
-  "Dialog.SaveLogFile": "Choisir l’emplacement du fichier journal",
-  "Dialog.PlainTextFiles": "Fichiers texte brut",
-  "Dialog.LogFiles": "Fichiers journaux"
-}

src/SharpEmu.GUI/Languages/it.json

@@ -1,134 +0,0 @@
-{
-  "_languageName": "Italiano",
-
-  "Page.Library": "Libreria",
-  "Page.Options": "Opzioni",
-  "Page.GameCount.One": "1 gioco",
-  "Page.GameCount.Other": "{0} giochi",
-
-  "Library.SearchWatermark": "Cerca nella libreria…",
-  "Library.AddFolder": "＋ Aggiungi cartella",
-  "Library.Rescan": "⟳ Riscansiona",
-  "Library.OpenFile": "Apri file…",
-
-  "Library.Context.Launch": "Avvia",
-  "Library.Context.OpenFolder": "Apri cartella gioco",
-  "Library.Context.CopyPath": "Copia percorso",
-  "Library.Context.CopyTitleId": "Copia ID titolo",
-  "Library.Context.Remove": "Rimuovi dalla libreria",
-
-  "Library.Empty.Title": "La tua libreria è vuota",
-  "Library.Empty.Hint": "Aggiungi la cartella che contiene i tuoi giochi per partire.",
-  "Library.Empty.SearchTitle": "Nessun gioco corrisponde alla ricerca",
-  "Library.Empty.SearchHint": "Nulla nella libreria corrisponde a “{0}”.",
-  "Library.Empty.AddFolder": "＋ Aggiungi cartella giochi",
-
-  "Library.Loading": "Caricamento libreria…",
-
-  "Options.General": "Generale",
-  "Options.Section.Emulation": "EMULAZIONE",
-  "Options.Section.Logging": "LOG",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "CPU engine",
-  "Options.CpuEngine.Desc": "Motore di esecuzione utilizzato per eseguire il codice del gioco.",
-  "Options.CpuEngine.Native": "Nativo",
-
-  "Options.Strict.Label": "Risoluzione rigorosa dynlib",
-  "Options.Strict.Desc": "Interrompi l'avvio quando un simbolo importato non può essere trovato.",
-
-  "Options.LogLevel.Label": "Livello Log",
-  "Options.LogLevel.Desc": "Livello di dettaglio dell'output console dell'emulatore.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Warning",
-  "Options.LogLevel.Error": "Error",
-  "Options.LogLevel.Critical": "Critical",
-
-  "Options.TraceImports.Label": "Limite tracciamento import",
-  "Options.TraceImports.Desc": "Traccia i primi N import per modulo (0 = disattivato).",
-
-
-  "Options.LogToFile.Label": "Salva log su file",
-  "Options.LogToFile.Desc": "Duplica l'output dell'emulatore in un file di log.",
-
-
-  "Options.LogFilePath.Label": "Percorso file di log",
-  "Options.LogFilePath.Default": "Nessun percorso personalizzato — i log vengono salvati in user/logs accanto all'emulatore.",
-  "Options.LogFilePath.Select": "Seleziona…",
-
-  "Options.OverrideLogFile.Label": "Sovrascrivi file di log",
-  "Options.OverrideLogFile.Desc": "Usa esattamente il percorso specificato invece di aggiungere Title ID e timestamp.",
-
-
-  "Options.TitleMusic.Label": "Musica del titolo",
-  "Options.TitleMusic.Desc": "Riproduci in loop la musica di anteprima del gioco selezionato nella libreria.",
-
-  "Options.Discord.Label": "Presenza Discord",
-  "Options.Discord.Desc": "Mostra il gioco in esecuzione sul tuo profilo Discord.",
-
-  "Options.Language.Label": "Lingua dell'emulatore",
-  "Options.Language.Desc": "Lingua utilizzata in tutto il launcher. Viene applicata immediatamente.",
-
-  "Common.On": "On",
-  "Common.Off": "Off",
-
-  "Console.Title": "CONSOLE",
-  "Console.SearchWatermark": "Cerca...",
-  "Console.AutoScroll": "Scorrimento automatico",
-  "Console.Split": "Dividi",
-  "Console.Copy": "Copia",
-  "Console.Clear": "Cancella",
-  "Console.WindowTitle": "Console SharpEmu",
-
-  "Launch.NoGameSelected": "Nessun gioco selezionato",
-  "Launch.NoGameHint": "Scegli un gioco dalla libreria, oppure apri direttamente un eboot.bin.",
-  "Launch.Idle": "Inattivo",
-  "Launch.Console": "≡ Console",
-  "Launch.Launch": "▶  Avvia",
-  "Launch.Stop": "■  Ferma",
-  "Launch.Running": "In esecuzione — {0}",
-  "Launch.Stopping": "Arresto in corso…",
-  "Launch.Exited": "Terminato con codice {0} ({1})",
-  "Launch.ExeNotFound": "Eseguibile SharpEmu non trovato. Compila prima il progetto SharpEmu.CLI (dotnet build).",
-  "Launch.LogFile": "File di log: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Impossibile avviare l'emulatore: {0}",
-  "Launch.ProcessExited": "Processo terminato con codice {0} ({1}).",
-
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "argomenti non validi",
-  "Exit.EbootNotFound": "eboot non trovato",
-  "Exit.RuntimeException": "errore di runtime",
-  "Exit.EmulationError": "errore di emulazione",
-  "Exit.Unknown": "sconosciuto",
-
-  
-  "Status.EmulatorLocating": "Emulatore: ricerca in corso…",
-  "Status.EmulatorPath": "Emulatore: {0}",
-  "Status.EmulatorNotFound": "Emulatore: eseguibile SharpEmu non trovato — compila prima SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Scansione della libreria…",
-  "Status.AddFolderPrompt": "Aggiungi una cartella di giochi per popolare la libreria.",
-  "Status.LibraryScanned": "Libreria scansionata: {0} gioco/giochi in {1} cartella/e.",
-  "Status.CouldNotOpenFolder": "Impossibile aprire la cartella: {0}",
-  "Status.CopiedToClipboard": "{0} copiato negli appunti.",
-  "Status.RemovedFromLibrary": "“{0}” rimosso dalla libreria. Riaggiungi la sua cartella per ripristinarlo.",
-  "Status.Running": "In esecuzione: {0}",
-  "Status.Stopping": "Arresto in corso…",
-  "Status.Idle": "Inattivo",
-
-  "Clipboard.Path": "Percorso",
-  "Clipboard.TitleId": "ID Titolo",
-
-  "Discord.Playing": "Sta giocando a {0}",
-  "Discord.Browsing": "Sta esplorando la libreria",
-  
-  "Dialog.ChooseGameFolder": "Scegli una cartella contenente giochi",
-  "Dialog.OpenExecutable": "Apri un eseguibile da avviare",
-  "Dialog.PsExecutables": "Eseguibili PS",
-  "Dialog.SaveLogFile": "Scegli dove salvare il file di log",
-  "Dialog.PlainTextFiles": "File di testo semplice",
-  "Dialog.LogFiles": "File di log"
-}

src/SharpEmu.GUI/Languages/ru.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Русский",
-
-  "Page.Library": "Библиотека",
-  "Page.Options": "Настройки",
-  "Page.GameCount.One": "1 игра",
-  "Page.GameCount.Other": "Игр: {0}",
-
-  "Library.SearchWatermark": "Поиск…",
-  "Library.AddFolder": "＋ Добавить папку",
-  "Library.Rescan": "⟳ Сканировать",
-  "Library.OpenFile": "Открыть файл…",
-
-  "Library.Context.Launch": "Запустить",
-  "Library.Context.OpenFolder": "Открыть папку с игрой",
-  "Library.Context.CopyPath": "Скопировать путь",
-  "Library.Context.CopyTitleId": "Скопировать ID игры",
-  "Library.Context.Remove": "Удалить из библиотеки",
-
-  "Library.Empty.Title": "Ваша библиотека пуста",
-  "Library.Empty.Hint": "Добавьте папку с играми, чтобы начать.",
-  "Library.Empty.SearchTitle": "По вашему запросу ничего не найдено",
-  "Library.Empty.SearchHint": "В библиотеке нет игр, соответствующих запросу «{0}».",
-  "Library.Empty.AddFolder": "＋ Добавить папку с играми",
-
-  "Library.Loading": "Загрузка библиотеки…",
-
-  "Options.General": "Основные",
-  "Options.Section.Emulation": "ЭМУЛЯЦИЯ",
-  "Options.Section.Logging": "ЛОГГИРОВАНИЕ",
-  "Options.Section.Launcher": "ЛАУНЧЕР",
-
-  "Options.CpuEngine.Label": "Движок ЦП",
-  "Options.CpuEngine.Desc": "Движок выполнения, используемый для запуска игрового кода.",
-  "Options.CpuEngine.Native": "Нативный",
-
-  "Options.Strict.Label": "Строгое разрешение динамических библиотек",
-  "Options.Strict.Desc": "Не запускать игру, если не удается найти или связать импортируемую функцию/переменную.",
-
-  "Options.LogLevel.Label": "Уровень логгирования",
-  "Options.LogLevel.Desc": "Подробность вывода в консоль эмулятора.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Warning",
-  "Options.LogLevel.Error": "Error",
-  "Options.LogLevel.Critical": "Critical",
-
-  "Options.TraceImports.Label": "Лимит трассировки импортов",
-  "Options.TraceImports.Desc": "Трассировать первые N импортов в каждом модуле (0 - выключено).",
-
-  "Options.LogToFile.Label": "Запись лога в файл",
-  "Options.LogToFile.Desc": "Дублировать вывод эмулятора в файл лога.",
-
-  "Options.LogFilePath.Label": "Путь к файлу лога",
-  "Options.LogFilePath.Default": "Пользовательский путь не задан: логи сохраняются в user/logs рядом с эмулятором.",
-  "Options.LogFilePath.Select": "Выбрать…",
-
-  "Options.OverrideLogFile.Label": "Переопределить файл лога",
-  "Options.OverrideLogFile.Desc": "Использовать указанный путь к файлу без добавления ID игры и метки времени.",
-
-  "Options.TitleMusic.Label": "Музыка игры",
-  "Options.TitleMusic.Desc": "Зацикленно воспроизводить музыку предпросмотра выбранной игры в библиотеке.",
-
-  "Options.Discord.Label": "Статус Discord",
-  "Options.Discord.Desc": "Показывать запущенную игру в профиле Discord.",
-
-  "Options.Language.Label": "Язык эмулятора",
-  "Options.Language.Desc": "Язык интерфейса лаунчера. Изменение применяется сразу.",
-
-  "Common.On": "Включено",
-  "Common.Off": "Выключено",
-
-  "Console.Title": "КОНСОЛЬ",
-  "Console.SearchWatermark": "Поиск...",
-  "Console.AutoScroll": "Авто-прокрутка",
-  "Console.Split": "Разделить",
-  "Console.Copy": "Скопировать",
-  "Console.Clear": "Очистить",
-  "Console.WindowTitle": "Консоль SharpEmu",
-
-  "Launch.NoGameSelected": "Ничего не выбрано",
-  "Launch.NoGameHint": "Выберите игру из библиотеки или откройте eboot.bin напрямую.",
-  "Launch.Idle": "Ожидание",
-  "Launch.Console": "≡ Консоль",
-  "Launch.Launch": "▶  Запустить",
-  "Launch.Stop": "■  Остановить",
-  "Launch.Running": "Запущено - {0}",
-  "Launch.Stopping": "Остановка…",
-  "Launch.Exited": "Завершено с кодом {0} ({1})",
-  "Launch.ExeNotFound": "Исполняемый файл SharpEmu не найден. Скомпилируйте сначала проект SharpEmu.CLI (dotnet build).",
-  "Launch.LogFile": "Лог: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Не удалось запустить эмулятор: {0}",
-  "Launch.ProcessExited": "Процесс завершился с кодом {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "некорректные аргументы",
-  "Exit.EbootNotFound": "eboot не найден",
-  "Exit.RuntimeException": "ошибка выполнения",
-  "Exit.EmulationError": "ошибка эмуляции",
-  "Exit.Unknown": "неизвестная ошибка",
-
-  "Status.EmulatorLocating": "Эмулятор: поиск…",
-  "Status.EmulatorPath": "Эмулятор: {0}",
-  "Status.EmulatorNotFound": "Эмулятор: исполняемый файл SharpEmu не был найден - скомпилируйте сначала SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Сканирование библиотеки…",
-  "Status.AddFolderPrompt": "Добавьте папку с играми, чтобы заполнить библиотеку.",
-  "Status.LibraryScanned": "Сканирование библиотеки завершено: игр: {0}, папок: {1}.",
-  "Status.CouldNotOpenFolder": "Не удалось открыть папку: {0}",
-  "Status.CopiedToClipboard": "{0}: скопировано в буфер обмена.",
-  "Status.RemovedFromLibrary": "Игра «{0}» удалена из библиотеки. Добавьте её папку заново, чтобы вернуть.",
-  "Status.Running": "Запущено: {0}",
-  "Status.Stopping": "Остановка…",
-  "Status.Idle": "Ожидание",
-
-  "Clipboard.Path": "Путь",
-  "Clipboard.TitleId": "ID игры",
-
-  "Discord.Playing": "Играет в {0}",
-  "Discord.Browsing": "Просматривает библиотеку",
-
-  "Dialog.ChooseGameFolder": "Выберите папку, содержащую игры",
-  "Dialog.OpenExecutable": "Открыть исполняемый файл для запуска",
-  "Dialog.PsExecutables": "Исполняемые файлы PS",
-  "Dialog.SaveLogFile": "Выберите, куда сохранить файл с логами",
-  "Dialog.PlainTextFiles": "Текстовые файлы",
-  "Dialog.LogFiles": "Логи"
-}

src/SharpEmu.GUI/Languages/tr.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Türkçe",
-
-  "Page.Library": "Kütüphane",
-  "Page.Options": "Ayarlar",
-  "Page.GameCount.One": "1 oyun",
-  "Page.GameCount.Other": "{0} oyun",
-
-  "Library.SearchWatermark": "Kütüphanede ara…",
-  "Library.AddFolder": "＋ Klasör ekle",
-  "Library.Rescan": "⟳ Yeniden tara",
-  "Library.OpenFile": "Dosya aç…",
-
-  "Library.Context.Launch": "Başlat",
-  "Library.Context.OpenFolder": "Oyun klasörünü aç",
-  "Library.Context.CopyPath": "Yolu kopyala",
-  "Library.Context.CopyTitleId": "Title ID'yi kopyala",
-  "Library.Context.Remove": "Kütüphaneden kaldır",
-
-  "Library.Empty.Title": "Kütüphaneniz boş",
-  "Library.Empty.Hint": "Başlamak için oyunlarınızı içeren bir klasör ekleyin.",
-  "Library.Empty.SearchTitle": "Aramanızla eşleşen oyun yok",
-  "Library.Empty.SearchHint": "Kütüphanede “{0}” ile eşleşen bir şey yok.",
-  "Library.Empty.AddFolder": "＋ Oyun klasörü ekle",
-
-  "Library.Loading": "Kütüphane yükleniyor…",
-
-  "Options.General": "Genel",
-  "Options.Section.Emulation": "EMÜLASYON",
-  "Options.Section.Logging": "GÜNLÜKLEME",
-  "Options.Section.Launcher": "BAŞLATICI",
-
-  "Options.CpuEngine.Label": "CPU motoru",
-  "Options.CpuEngine.Desc": "Oyun kodunu çalıştırmak için kullanılan yürütme motoru.",
-  "Options.CpuEngine.Native": "Native",
-
-  "Options.Strict.Label": "Katı dynlib çözümü",
-  "Options.Strict.Desc": "İçe aktarılan bir sembol çözümlenemediğinde başlatmayı başarısız kılar.",
-
-  "Options.LogLevel.Label": "Günlük seviyesi",
-  "Options.LogLevel.Desc": "Emülatör konsol çıktısının ayrıntı düzeyi.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Warning",
-  "Options.LogLevel.Error": "Error",
-  "Options.LogLevel.Critical": "Critical",
-
-  "Options.TraceImports.Label": "Import izleme sınırı",
-  "Options.TraceImports.Desc": "Modül başına ilk N import'u izle (0 = kapalı).",
-
-  "Options.LogToFile.Label": "Dosyaya günlükle",
-  "Options.LogToFile.Desc": "Emülatör çıktısını bir günlük dosyasına yansıt.",
-
-  "Options.LogFilePath.Label": "Günlük dosyası yolu",
-  "Options.LogFilePath.Default": "Özel yol yok — günlükler emülatörün yanındaki user/logs klasörüne yazılır.",
-  "Options.LogFilePath.Select": "Seç…",
-
-  "Options.OverrideLogFile.Label": "Günlük dosyasının üzerine yaz",
-  "Options.OverrideLogFile.Desc": "Title ID ve zaman damgası eklemek yerine tam dosya yolunu kullan.",
-
-  "Options.TitleMusic.Label": "Oyun müziği",
-  "Options.TitleMusic.Desc": "Kütüphanede seçili oyunun önizleme müziğini döngüye al.",
-
-  "Options.Discord.Label": "Discord durumu",
-  "Options.Discord.Desc": "Discord profilinde çalışan oyunu göster.",
-
-  "Options.Language.Label": "Emülatör dili",
-  "Options.Language.Desc": "Başlatıcı genelinde kullanılan dil. Hemen uygulanır.",
-
-  "Common.On": "Açık",
-  "Common.Off": "Kapalı",
-
-  "Console.Title": "KONSOL",
-  "Console.SearchWatermark": "Ara...",
-  "Console.AutoScroll": "Otomatik kaydır",
-  "Console.Split": "Ayır",
-  "Console.Copy": "Kopyala",
-  "Console.Clear": "Temizle",
-  "Console.WindowTitle": "SharpEmu Konsol",
-
-  "Launch.NoGameSelected": "Oyun seçilmedi",
-  "Launch.NoGameHint": "Kütüphaneden bir oyun seçin veya doğrudan bir eboot.bin açın.",
-  "Launch.Idle": "Boşta",
-  "Launch.Console": "≡ Konsol",
-  "Launch.Launch": "▶  Başlat",
-  "Launch.Stop": "■  Durdur",
-  "Launch.Running": "Çalışıyor — {0}",
-  "Launch.Stopping": "Durduruluyor…",
-  "Launch.Exited": "Çıkış kodu {0} ({1})",
-  "Launch.ExeNotFound": "SharpEmu çalıştırılabilir dosyası bulunamadı. Önce SharpEmu.CLI projesini derleyin (dotnet build).",
-  "Launch.LogFile": "Günlük dosyası: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Emülatör başlatılamadı: {0}",
-  "Launch.ProcessExited": "İşlem {0} kodla sonlandı ({1}).",
-
-  "Exit.Ok": "Tamam",
-  "Exit.InvalidArguments": "geçersiz argümanlar",
-  "Exit.EbootNotFound": "eboot bulunamadı",
-  "Exit.RuntimeException": "çalışma zamanı hatası",
-  "Exit.EmulationError": "emülasyon hatası",
-  "Exit.Unknown": "bilinmiyor",
-
-  "Status.EmulatorLocating": "Emülatör: bulunuyor…",
-  "Status.EmulatorPath": "Emülatör: {0}",
-  "Status.EmulatorNotFound": "Emülatör: SharpEmu çalıştırılabilir dosyası bulunamadı — önce SharpEmu.CLI'yi derleyin.",
-  "Status.ScanningLibrary": "Kütüphane taranıyor…",
-  "Status.AddFolderPrompt": "Kütüphaneyi doldurmak için bir oyun klasörü ekleyin.",
-  "Status.LibraryScanned": "Kütüphane tarandı: {1} klasörde {0} oyun.",
-  "Status.CouldNotOpenFolder": "Klasör açılamadı: {0}",
-  "Status.CopiedToClipboard": "{0} panoya kopyalandı.",
-  "Status.RemovedFromLibrary": "“{0}” kütüphaneden kaldırıldı. Geri getirmek için klasörünü yeniden ekleyin.",
-  "Status.Running": "{0} çalışıyor",
-  "Status.Stopping": "Durduruluyor…",
-  "Status.Idle": "Boşta",
-
-  "Clipboard.Path": "Yol",
-  "Clipboard.TitleId": "Title ID",
-
-  "Discord.Playing": "{0} oynuyor",
-  "Discord.Browsing": "Kütüphaneye göz atıyor",
-
-  "Dialog.ChooseGameFolder": "Oyunlarınızı içeren bir klasör seçin",
-  "Dialog.OpenExecutable": "Başlatılacak bir çalıştırılabilir dosya aç",
-  "Dialog.PsExecutables": "PS çalıştırılabilirleri",
-  "Dialog.SaveLogFile": "Günlük dosyasının kaydedileceği yeri seçin",
-  "Dialog.PlainTextFiles": "Düz Metin Dosyaları",
-  "Dialog.LogFiles": "Günlük Dosyaları"
-}

src/SharpEmu.GUI/Localization.cs

@@ -1,164 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Text.Json;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Loads UI strings for the launcher. Every language ships embedded in the
-/// assembly (see SharpEmu.GUI.csproj) so a release build is fully
-/// self-contained; an optional Languages/&lt;code&gt;.json file next to the
-/// executable overrides the embedded copy for that code, so a translation
-/// fix or a brand-new language never needs a rebuild.
-/// </summary>
-public sealed class Localization
-{
-    public static Localization Instance { get; } = new();
-
-    public sealed record LanguageInfo(string Code, string NativeName);
-
-    private const string EmbeddedResourcePrefix = "Languages.";
-    private const string EmbeddedResourceSuffix = ".json";
-
-    private Dictionary<string, string> _strings = new();
-
-    private Localization()
-    {
-    }
-
-    /// <summary>Directory holding optional *.json language overrides, next to the executable.</summary>
-    public static string LanguagesDirectory => Path.Combine(AppContext.BaseDirectory, "Languages");
-
-    public string CurrentCode { get; private set; } = "en";
-
-    public string Get(string key) => _strings.TryGetValue(key, out var value) ? value : key;
-
-    public string Format(string key, params object?[] args) => string.Format(Get(key), args);
-
-    /// <summary>
-    /// Languages available either embedded in the binary or as a loose
-    /// override file, sorted by code. A loose file's declared name wins when
-    /// the same code exists in both places.
-    /// </summary>
-    public List<LanguageInfo> DiscoverLanguages()
-    {
-        var languages = new Dictionary<string, LanguageInfo>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var code in EmbeddedLanguageCodes())
-        {
-            using var stream = OpenEmbeddedLanguageStream(code);
-            if (stream is not null)
-            {
-                languages[code] = new LanguageInfo(code, ReadLanguageName(stream) ?? code);
-            }
-        }
-
-        try
-        {
-            foreach (var file in Directory.EnumerateFiles(LanguagesDirectory, "*.json"))
-            {
-                var code = Path.GetFileNameWithoutExtension(file);
-                using var stream = File.OpenRead(file);
-                languages[code] = new LanguageInfo(code, ReadLanguageName(stream) ?? code);
-            }
-        }
-        catch (Exception)
-        {
-            // No loose Languages directory: the embedded languages still stand.
-        }
-
-        var result = languages.Values.ToList();
-        result.Sort((a, b) => string.CompareOrdinal(a.Code, b.Code));
-        return result;
-    }
-
-    /// <summary>Loads a language by code (e.g. "en"): a loose override file first, then the embedded copy.</summary>
-    public void Load(string code)
-    {
-        if (!TryLoadLooseFile(code) && !TryLoadEmbedded(code) &&
-            !string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
-        {
-            _ = TryLoadLooseFile("en") || TryLoadEmbedded("en");
-        }
-    }
-
-    private static IEnumerable<string> EmbeddedLanguageCodes()
-    {
-        foreach (var name in typeof(Localization).Assembly.GetManifestResourceNames())
-        {
-            if (name.StartsWith(EmbeddedResourcePrefix, StringComparison.Ordinal) &&
-                name.EndsWith(EmbeddedResourceSuffix, StringComparison.Ordinal))
-            {
-                yield return name[EmbeddedResourcePrefix.Length..^EmbeddedResourceSuffix.Length];
-            }
-        }
-    }
-
-    private static Stream? OpenEmbeddedLanguageStream(string code) =>
-        typeof(Localization).Assembly.GetManifestResourceStream($"{EmbeddedResourcePrefix}{code}{EmbeddedResourceSuffix}");
-
-    private static string? ReadLanguageName(Stream stream)
-    {
-        try
-        {
-            using var document = JsonDocument.Parse(stream);
-            if (document.RootElement.TryGetProperty("_languageName", out var name) &&
-                name.ValueKind == JsonValueKind.String)
-            {
-                return name.GetString();
-            }
-        }
-        catch (Exception)
-        {
-            // Malformed file: fall back to the code as its own display name.
-        }
-
-        return null;
-    }
-
-    private bool TryLoadLooseFile(string code)
-    {
-        try
-        {
-            var path = Path.Combine(LanguagesDirectory, $"{code}.json");
-            return File.Exists(path) && TryLoad(code, File.ReadAllText(path));
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-    }
-
-    private bool TryLoadEmbedded(string code)
-    {
-        try
-        {
-            using var stream = OpenEmbeddedLanguageStream(code);
-            if (stream is null)
-            {
-                return false;
-            }
-
-            using var reader = new StreamReader(stream);
-            return TryLoad(code, reader.ReadToEnd());
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-    }
-
-    private bool TryLoad(string code, string json)
-    {
-        var loaded = JsonSerializer.Deserialize<Dictionary<string, string>>(json);
-        if (loaded is null)
-        {
-            return false;
-        }
-
-        _strings = loaded;
-        CurrentCode = code;
-        return true;
-    }
-}

src/SharpEmu.GUI/MainWindow.axaml

@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
         Title="SharpEmu"
         Width="1280" Height="820"
         MinWidth="980" MinHeight="640"
-        WindowState="Maximized"
         WindowStartupLocation="CenterScreen"
         Background="{StaticResource BgBrush}"
         ExtendClientAreaToDecorationsHint="True"
@@ -18,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
         Icon="avares://SharpEmu.GUI/Assets/SharpEmu.ico"
         KeyDown="OnKeyDown">
 
-  <Grid RowDefinitions="Auto,*,Auto">
+  <Grid RowDefinitions="44,*,32">
 
     <!-- Selected-game backdrop: key art behind the main content, dimmed by
          a scrim so tiles and text stay readable. Fades on selection. -->
@@ -42,9 +41,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
       </Border>
     </Panel>
 
-    <!-- Title bar; hidden in fullscreen (F11) along with the status bar, so
-         the game gets the whole screen. -->
-    <Grid x:Name="TitleBar" Grid.Row="0" Height="44" Background="{StaticResource ChromeBrush}">
+    <!-- Title bar -->
+    <Grid x:Name="TitleBar" Grid.Row="0" Background="{StaticResource ChromeBrush}">
       <StackPanel Orientation="Horizontal" Spacing="10" Margin="16,0" VerticalAlignment="Center">
         <Image Source="avares://SharpEmu.GUI/Assets/SharpEmu.ico" Width="20" Height="20"
                RenderOptions.BitmapInterpolationMode="HighQuality" />
@@ -56,273 +54,106 @@ SPDX-License-Identifier: GPL-2.0-or-later
     </Grid>
 
     <!-- Main content -->
-    <Grid Grid.Row="1" Margin="32,24,32,20" RowDefinitions="Auto,*,Auto,Auto">
+    <Grid Grid.Row="1" Margin="18,14,18,14" RowDefinitions="Auto,*,Auto,Auto">
 
-      <!-- Library / Options page switcher, with the library toolbar sharing
-           the same row on the right. Plain buttons (not TabItem) so there is
-           no underline; LB/RB hint chips flank the pair and the gamepad's
-           shoulder buttons actually switch pages from anywhere. -->
-      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Margin="0,0,0,20">
-        <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="14" VerticalAlignment="Center">
-          <Border Classes="padHint" VerticalAlignment="Center">
-            <TextBlock Text="LB" FontSize="11" FontWeight="Bold" Foreground="{StaticResource MutedBrush}" />
-          </Border>
-          <Button x:Name="LibraryTabButton" Classes="segment active" Content="Library" />
-          <Button x:Name="OptionsTabButton" Classes="segment" Content="Options" />
-          <Border Classes="padHint" VerticalAlignment="Center">
-            <TextBlock Text="RB" FontSize="11" FontWeight="Bold" Foreground="{StaticResource MutedBrush}" />
-          </Border>
-        </StackPanel>
-
-        <StackPanel Grid.Column="2" x:Name="LibraryToolbar" Orientation="Horizontal" Spacing="8"
-                    VerticalAlignment="Center">
-          <TextBox x:Name="SearchBox" Watermark="Search library…" Width="240" VerticalAlignment="Center" />
-          <Button x:Name="AddFolderButton" Classes="ghost" Content="＋ Add folder" VerticalAlignment="Center" />
-          <Button x:Name="RescanButton" Classes="ghost" Content="⟳ Rescan" VerticalAlignment="Center" />
-          <Button x:Name="OpenFileButton" Classes="ghost" Content="Open file…" VerticalAlignment="Center" />
-        </StackPanel>
+      <!-- Library toolbar -->
+      <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto,Auto" Margin="6,0,6,12">
+        <TextBlock Grid.Column="0" Text="Library" FontSize="22" FontWeight="Bold" VerticalAlignment="Center" />
+        <Border Grid.Column="1" Classes="pill" Margin="12,2,0,0" VerticalAlignment="Center">
+          <TextBlock x:Name="GameCountText" Text="0 games" FontSize="11" Foreground="{StaticResource MutedBrush}" />
+        </Border>
+        <TextBox Grid.Column="3" x:Name="SearchBox" Watermark="Search library…" Width="280"
+                 VerticalAlignment="Center" Margin="0,0,12,0" />
+        <Button Grid.Column="4" x:Name="AddFolderButton" Classes="ghost" Content="＋ Add folder"
+                VerticalAlignment="Center" Margin="0,0,8,0" />
+        <Button Grid.Column="5" x:Name="RescanButton" Classes="ghost" Content="⟳ Rescan"
+                VerticalAlignment="Center" Margin="0,0,8,0" />
+        <Button Grid.Column="6" x:Name="OpenFileButton" Classes="ghost" Content="Open file…"
+                VerticalAlignment="Center" />
       </Grid>
 
+      <!-- Cover-art grid -->
       <Panel Grid.Row="1">
-
-        <!-- Library page. The tile row gets extra top margin so it sits
-             closer to eye level (PS5 home-screen style) instead of hugging
-             the Library/Options switcher above it. -->
-        <Panel x:Name="LibraryPage" Margin="0,64,0,0">
-          <ListBox x:Name="GameList" Classes="tileGrid" Background="Transparent"
-                   SelectionMode="Single" Padding="0">
-            <ListBox.ContextMenu>
-              <ContextMenu x:Name="GameContextMenu" Placement="Pointer">
-                <MenuItem x:Name="CtxLaunch" Header="Launch" FontWeight="SemiBold">
-                  <MenuItem.Icon>
-                    <TextBlock Text="▶" FontSize="11" Foreground="{StaticResource AccentHoverBrush}"
-                               HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem x:Name="CtxOpenFolder" Header="Open game folder">
-                  <MenuItem.Icon>
-                    <TextBlock Text="📂" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem x:Name="CtxCopyPath" Header="Copy path">
-                  <MenuItem.Icon>
-                    <TextBlock Text="⧉" FontSize="13" Foreground="{StaticResource MutedBrush}"
-                               HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem x:Name="CtxCopyTitleId" Header="Copy title ID">
-                  <MenuItem.Icon>
-                    <TextBlock Text="⧉" FontSize="13" Foreground="{StaticResource MutedBrush}"
-                               HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem x:Name="CtxRemove" Header="Remove from library"
-                          Foreground="{StaticResource DangerHoverBrush}">
-                  <MenuItem.Icon>
-                    <TextBlock Text="✕" FontSize="12" Foreground="{StaticResource DangerHoverBrush}"
-                               HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </MenuItem.Icon>
-                </MenuItem>
-              </ContextMenu>
-            </ListBox.ContextMenu>
-            <ListBox.ItemsPanel>
-              <ItemsPanelTemplate>
-                <WrapPanel />
-              </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-            <ListBox.ItemTemplate>
-              <DataTemplate>
-                <StackPanel Width="128" Height="172" Spacing="7">
-                  <Border Classes="coverShadow" Width="128" Height="128">
-                    <Border Classes="coverClip">
-                      <Panel>
-                        <Border Background="{Binding PlaceholderBrush}" IsVisible="{Binding !HasCover}">
-                          <TextBlock Text="{Binding Initials}" FontSize="36" FontWeight="Bold"
-                                     Foreground="#E8ECF4" Opacity="0.85"
-                                     HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        </Border>
-                        <Image Source="{Binding Cover}" Stretch="UniformToFill" IsVisible="{Binding HasCover}" />
-                      </Panel>
-                    </Border>
+        <ListBox x:Name="GameList" Classes="tileGrid" Background="Transparent"
+                 SelectionMode="Single" Padding="0">
+          <ListBox.ContextMenu>
+            <ContextMenu x:Name="GameContextMenu" Placement="Pointer">
+              <MenuItem x:Name="CtxLaunch" Header="Launch" FontWeight="SemiBold">
+                <MenuItem.Icon>
+                  <TextBlock Text="▶" FontSize="11" Foreground="{StaticResource AccentHoverBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </MenuItem.Icon>
+              </MenuItem>
+              <MenuItem x:Name="CtxOpenFolder" Header="Open game folder">
+                <MenuItem.Icon>
+                  <TextBlock Text="📂" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </MenuItem.Icon>
+              </MenuItem>
+              <Separator />
+              <MenuItem x:Name="CtxCopyPath" Header="Copy path">
+                <MenuItem.Icon>
+                  <TextBlock Text="⧉" FontSize="13" Foreground="{StaticResource MutedBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </MenuItem.Icon>
+              </MenuItem>
+              <MenuItem x:Name="CtxCopyTitleId" Header="Copy title ID">
+                <MenuItem.Icon>
+                  <TextBlock Text="⧉" FontSize="13" Foreground="{StaticResource MutedBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </MenuItem.Icon>
+              </MenuItem>
+              <Separator />
+              <MenuItem x:Name="CtxRemove" Header="Remove from library"
+                        Foreground="{StaticResource DangerHoverBrush}">
+                <MenuItem.Icon>
+                  <TextBlock Text="✕" FontSize="12" Foreground="{StaticResource DangerHoverBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </MenuItem.Icon>
+              </MenuItem>
+            </ContextMenu>
+          </ListBox.ContextMenu>
+          <ListBox.ItemsPanel>
+            <ItemsPanelTemplate>
+              <WrapPanel />
+            </ItemsPanelTemplate>
+          </ListBox.ItemsPanel>
+          <ListBox.ItemTemplate>
+            <DataTemplate>
+              <StackPanel Width="128" Height="186" Spacing="7">
+                <Border Classes="coverShadow" Width="128" Height="128">
+                  <Border Classes="coverClip">
+                    <Panel>
+                      <Border Background="{Binding PlaceholderBrush}" IsVisible="{Binding !HasCover}">
+                        <TextBlock Text="{Binding Initials}" FontSize="36" FontWeight="Bold"
+                                   Foreground="#E8ECF4" Opacity="0.85"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center" />
+                      </Border>
+                      <Image Source="{Binding Cover}" Stretch="UniformToFill" IsVisible="{Binding HasCover}" />
+                    </Panel>
                   </Border>
+                </Border>
+                <StackPanel Spacing="2">
                   <TextBlock Text="{Binding Name}" FontSize="13" FontWeight="SemiBold"
-                             TextWrapping="Wrap" MaxLines="2" TextTrimming="CharacterEllipsis"
-                             TextAlignment="Center" HorizontalAlignment="Center" />
+                             TextWrapping="Wrap" MaxLines="2" TextTrimming="CharacterEllipsis" />
+                  <TextBlock Text="{Binding Detail}" FontSize="11" Foreground="{StaticResource MutedBrush}"
+                             TextTrimming="CharacterEllipsis" />
                 </StackPanel>
-              </DataTemplate>
-            </ListBox.ItemTemplate>
-          </ListBox>
+              </StackPanel>
+            </DataTemplate>
+          </ListBox.ItemTemplate>
+        </ListBox>
 
-          <!-- Empty state -->
-          <StackPanel x:Name="EmptyState" Spacing="10" HorizontalAlignment="Center" VerticalAlignment="Center"
-                      IsVisible="False">
-            <TextBlock Text="🎮" FontSize="44" HorizontalAlignment="Center" Opacity="0.7" />
-            <TextBlock x:Name="EmptyStateTitle" Text="Your library is empty" FontSize="18" FontWeight="SemiBold"
-                       HorizontalAlignment="Center" />
-            <TextBlock x:Name="EmptyStateHint" Text="Add a folder containing your games to get started."
-                       FontSize="13" Foreground="{StaticResource MutedBrush}" HorizontalAlignment="Center" />
-            <Button x:Name="EmptyAddFolderButton" Classes="accent" Content="＋ Add game folder"
-                    HorizontalAlignment="Center" Margin="0,8,0,0" />
-          </StackPanel>
-
-          <!-- Loading state: covers the grid while a scan (initial load,
-               rescan, or a just-added folder) is in flight, so the screen
-               never looks blank mid-scan. -->
-          <StackPanel x:Name="LoadingState" Spacing="14" HorizontalAlignment="Center" VerticalAlignment="Center"
-                      IsVisible="False">
-            <ProgressBar IsIndeterminate="True" Width="180" Height="3" />
-            <TextBlock x:Name="LoadingStateText" Text="Loading library…" FontSize="13"
-                       Foreground="{StaticResource MutedBrush}" HorizontalAlignment="Center" />
-          </StackPanel>
-        </Panel>
-
-        <!-- Options page: sub-tabs so future categories (Graphics, …) slot
-             in next to General. Card-grouped sections match the visual
-             language used by the console panel and launch bar below. -->
-        <Grid x:Name="OptionsPage" IsVisible="False">
-          <TabControl>
-            <TabItem x:Name="GeneralTabItem" Header="General" FontSize="15">
-              <ScrollViewer>
-                <StackPanel Margin="0,14,0,16" Spacing="16" MaxWidth="1280" HorizontalAlignment="Left">
-
-                  <Border Classes="card">
-                    <StackPanel Spacing="14">
-                      <TextBlock x:Name="EmulationSectionTitle" Classes="sectionTitle" Text="EMULATION" />
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="CpuEngineLabel" Text="CPU engine" FontSize="13" />
-                          <TextBlock x:Name="CpuEngineDesc" Text="Execution engine used to run game code."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ComboBox Grid.Column="1" x:Name="CpuEngineBox" Width="160" SelectedIndex="0"
-                                  VerticalAlignment="Center" CornerRadius="8">
-                          <ComboBoxItem x:Name="CpuEngineNativeItem" Content="Native" />
-                        </ComboBox>
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="StrictLabel" Text="Strict dynlib resolution" FontSize="13" />
-                          <TextBlock x:Name="StrictDesc" Text="Fail the launch when an imported symbol cannot be resolved."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ToggleSwitch Grid.Column="1" x:Name="StrictToggle" OnContent="On" OffContent="Off"
-                                      VerticalAlignment="Center" />
-                      </Grid>
-                    </StackPanel>
-                  </Border>
-
-                  <Border Classes="card">
-                    <StackPanel Spacing="14">
-                      <TextBlock x:Name="LoggingSectionTitle" Classes="sectionTitle" Text="LOGGING" />
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="LogLevelLabel" Text="Log level" FontSize="13" />
-                          <TextBlock x:Name="LogLevelDesc" Text="Verbosity of the emulator console output."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ComboBox Grid.Column="1" x:Name="LogLevelBox" Width="160" SelectedIndex="2"
-                                  VerticalAlignment="Center" CornerRadius="8">
-                          <ComboBoxItem x:Name="LogLevelTraceItem" Content="Trace" />
-                          <ComboBoxItem x:Name="LogLevelDebugItem" Content="Debug" />
-                          <ComboBoxItem x:Name="LogLevelInfoItem" Content="Info" />
-                          <ComboBoxItem x:Name="LogLevelWarningItem" Content="Warning" />
-                          <ComboBoxItem x:Name="LogLevelErrorItem" Content="Error" />
-                          <ComboBoxItem x:Name="LogLevelCriticalItem" Content="Critical" />
-                        </ComboBox>
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="TraceImportsLabel" Text="Import trace limit" FontSize="13" />
-                          <TextBlock x:Name="TraceImportsDesc" Text="Trace the first N imports per module (0 = off)."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <NumericUpDown Grid.Column="1" x:Name="TraceImportsBox" Width="160" Minimum="0"
-                                       Maximum="4096" Increment="16" Value="0" FormatString="0"
-                                       VerticalAlignment="Center" CornerRadius="8" />
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="LogToFileLabel" Text="Log to file" FontSize="13" />
-                          <TextBlock x:Name="LogToFileDesc" Text="Mirror emulator output to a log file."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ToggleSwitch Grid.Column="1" x:Name="LogToFileToggle" OnContent="On" OffContent="Off"
-                                      VerticalAlignment="Center" />
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="LogFilePathLabel" Text="Log file path" FontSize="13" />
-                          <TextBlock x:Name="LogFilePathText" Text="No custom path"
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <Button Grid.Column="1" x:Name="SelectLogFilePathButton" Classes="ghost" Content="Select…"
-                                VerticalAlignment="Center" />
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="OverrideLogFileLabel" Text="Override log file" FontSize="13" />
-                          <TextBlock x:Name="OverrideLogFileDesc"
-                                     Text="Use the exact file path instead of appending title ID and timestamp."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ToggleSwitch Grid.Column="1" x:Name="OverrideLogFileToggle" OnContent="On" OffContent="Off"
-                                      VerticalAlignment="Center" />
-                      </Grid>
-                    </StackPanel>
-                  </Border>
-
-                  <Border Classes="card">
-                    <StackPanel Spacing="14">
-                      <TextBlock x:Name="LauncherSectionTitle" Classes="sectionTitle" Text="LAUNCHER" />
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="LanguageLabel" Text="Emulator language" FontSize="13" />
-                          <TextBlock x:Name="LanguageDesc"
-                                     Text="Language used throughout the launcher. Applies immediately."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ComboBox Grid.Column="1" x:Name="LanguageBox" Width="160"
-                                  VerticalAlignment="Center" CornerRadius="8"
-                                  DisplayMemberBinding="{Binding NativeName}" />
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="TitleMusicLabel" Text="Title music" FontSize="13" />
-                          <TextBlock x:Name="TitleMusicDesc" Text="Loop the selected game's preview music in the library."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ToggleSwitch Grid.Column="1" x:Name="TitleMusicToggle" OnContent="On" OffContent="Off"
-                                      IsChecked="True" VerticalAlignment="Center" />
-                      </Grid>
-
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-                          <TextBlock x:Name="DiscordLabel" Text="Discord presence" FontSize="13" />
-                          <TextBlock x:Name="DiscordDesc" Text="Show the running game on your Discord profile."
-                                     FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
-                        </StackPanel>
-                        <ToggleSwitch Grid.Column="1" x:Name="DiscordToggle" OnContent="On" OffContent="Off"
-                                      VerticalAlignment="Center" />
-                      </Grid>
-                    </StackPanel>
-                  </Border>
-
-                </StackPanel>
-              </ScrollViewer>
-            </TabItem>
-          </TabControl>
-        </Grid>
+        <!-- Empty state -->
+        <StackPanel x:Name="EmptyState" Spacing="10" HorizontalAlignment="Center" VerticalAlignment="Center"
+                    IsVisible="False">
+          <TextBlock Text="🎮" FontSize="44" HorizontalAlignment="Center" Opacity="0.7" />
+          <TextBlock x:Name="EmptyStateTitle" Text="Your library is empty" FontSize="18" FontWeight="SemiBold"
+                     HorizontalAlignment="Center" />
+          <TextBlock x:Name="EmptyStateHint" Text="Add a folder containing your games to get started."
+                     FontSize="13" Foreground="{StaticResource MutedBrush}" HorizontalAlignment="Center" />
+          <Button x:Name="EmptyAddFolderButton" Classes="accent" Content="＋ Add game folder"
+                  HorizontalAlignment="Center" Margin="0,8,0,0" />
+        </StackPanel>
       </Panel>
 
       <!-- Console (collapsible) -->
@@ -330,7 +161,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
               Margin="0,12,0,0" IsVisible="False">
         <Grid RowDefinitions="Auto,*">
           <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto,Auto,Auto" Margin="16,12,16,8">
-            <TextBlock x:Name="ConsoleSectionTitle" Classes="sectionTitle" Text="CONSOLE" VerticalAlignment="Center" />
+            <TextBlock Classes="sectionTitle" Text="CONSOLE" VerticalAlignment="Center" />
             <TextBox Grid.Column="1" FontSize="12" Margin="0,0,12,0" x:Name="ConsoleSearchBox"
                     Watermark="Search..." Width="320" />
             <CheckBox Grid.Column="2" x:Name="AutoScrollCheck" Content="Auto-scroll" IsChecked="True"
@@ -353,8 +184,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
         </Grid>
       </Border>
 
-      <!-- Launch bar; capped so it does not sprawl on a maximized window. -->
-      <Border Grid.Row="3" Classes="card" Margin="0,12,0,0" Padding="14" MaxWidth="1280">
+      <!-- Launch bar -->
+      <Border Grid.Row="3" Classes="card" Margin="0,12,0,0" Padding="14">
         <StackPanel Spacing="14">
           <Grid ColumnDefinitions="Auto,*,Auto">
 
@@ -373,32 +204,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
               </Panel>
             </Border>
 
-            <StackPanel Grid.Column="1" Spacing="4" VerticalAlignment="Center" Margin="14,0,14,0">
-              <Grid ColumnDefinitions="Auto,Auto,*">
-                <TextBlock Grid.Column="0" x:Name="SelectedGameTitle" Text="No game selected" FontSize="16"
-                           FontWeight="Bold" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"
-                           MaxWidth="340" Margin="0,0,10,0" />
-
-                <!-- Title id / version / size badges, right next to the
-                     title. The title's own MaxWidth (not a "*" column) is
-                     what keeps them from drifting to the far right. -->
-                <StackPanel Grid.Column="1" x:Name="SelectedBadgesRow" Orientation="Horizontal" Spacing="6"
-                            IsVisible="False" VerticalAlignment="Center">
-                  <Border Classes="pill" IsVisible="{Binding HasTitleId, FallbackValue=False}">
-                    <TextBlock Text="{Binding TitleId}" FontSize="10" FontWeight="SemiBold"
-                               Foreground="{StaticResource MutedBrush}" />
-                  </Border>
-                  <Border Classes="pill" IsVisible="{Binding HasVersion, FallbackValue=False}">
-                    <TextBlock Text="{Binding VersionText}" FontSize="10" FontWeight="SemiBold"
-                               Foreground="{StaticResource MutedBrush}" />
-                  </Border>
-                  <Border Classes="pill">
-                    <TextBlock Text="{Binding SizeText, FallbackValue=''}" FontSize="10" FontWeight="SemiBold"
-                               Foreground="{StaticResource MutedBrush}" />
-                  </Border>
-                </StackPanel>
-              </Grid>
-
+            <StackPanel Grid.Column="1" Spacing="3" VerticalAlignment="Center" Margin="14,0,14,0">
+              <TextBlock x:Name="SelectedGameTitle" Text="No game selected" FontSize="16" FontWeight="Bold"
+                         TextTrimming="CharacterEllipsis" />
               <TextBlock x:Name="SelectedGamePath" Text="Pick a game from the library, or open an eboot.bin directly."
                          FontSize="11" Foreground="{StaticResource MutedBrush}" TextTrimming="CharacterEllipsis" />
               <StackPanel Orientation="Horizontal" Spacing="7">
@@ -410,18 +218,69 @@ SPDX-License-Identifier: GPL-2.0-or-later
             </StackPanel>
 
             <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+              <ToggleButton x:Name="OptionsToggle" Classes="ghost" Content="⚙ Options" />
               <ToggleButton x:Name="ConsoleToggle" Classes="ghost" Content="≡ Console" />
               <Button x:Name="LaunchButton" Classes="accent" Content="▶  Launch" IsEnabled="False" />
               <Button x:Name="StopButton" Classes="danger" Content="■  Stop" IsEnabled="False" />
             </StackPanel>
           </Grid>
+
+          <!-- Launch options (collapsible) -->
+          <WrapPanel x:Name="OptionsPanel" IsVisible="False">
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="CPU engine" />
+              <ComboBox x:Name="CpuEngineBox" Width="150" SelectedIndex="0" CornerRadius="8">
+                <ComboBoxItem Content="Native" />
+              </ComboBox>
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Log level" />
+              <ComboBox x:Name="LogLevelBox" Width="150" SelectedIndex="2" CornerRadius="8">
+                <ComboBoxItem Content="Trace" />
+                <ComboBoxItem Content="Debug" />
+                <ComboBoxItem Content="Info" />
+                <ComboBoxItem Content="Warning" />
+                <ComboBoxItem Content="Error" />
+                <ComboBoxItem Content="Critical" />
+              </ComboBox>
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Import trace limit (0 = off)" />
+              <NumericUpDown x:Name="TraceImportsBox" Width="170" Minimum="0" Maximum="4096" Increment="16"
+                             Value="0" FormatString="0" CornerRadius="8" />
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Strict dynlib resolution" />
+              <ToggleSwitch x:Name="StrictToggle" OnContent="On" OffContent="Off" />
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Log to file" />
+              <ToggleSwitch x:Name="LogToFileToggle" OnContent="On" OffContent="Off" />
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Log file path" />
+              <Button x:Name="SelectLogFilePathButton" Classes="ghost" Content="Select…"
+                VerticalAlignment="Center" />
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Override log file" />
+              <ToggleSwitch x:Name="OverrideLogFileToggle" OnContent="On" OffContent="Off" />
+            </StackPanel>
+            <StackPanel Margin="0,0,24,0">
+              <TextBlock Classes="fieldLabel" Text="Title music" />
+              <ToggleSwitch x:Name="TitleMusicToggle" OnContent="On" OffContent="Off" IsChecked="True" />
+            </StackPanel>
+            <StackPanel>
+              <TextBlock Classes="fieldLabel" Text="Discord presence" />
+              <ToggleSwitch x:Name="DiscordToggle" OnContent="On" OffContent="Off" />
+            </StackPanel>
+          </WrapPanel>
         </StackPanel>
       </Border>
     </Grid>
 
     <!-- Status bar -->
-    <Grid x:Name="StatusBar" Grid.Row="2" Height="32" Background="{StaticResource ChromeBrush}"
-          ColumnDefinitions="*,Auto">
+    <Grid Grid.Row="2" Background="{StaticResource ChromeBrush}" ColumnDefinitions="*,Auto">
       <TextBlock x:Name="EmulatorPathText" Grid.Column="0" Text="Emulator: locating…" FontSize="11"
                  Foreground="{StaticResource FaintBrush}" VerticalAlignment="Center" Margin="16,0"
                  TextTrimming="CharacterEllipsis" />

src/SharpEmu.GUI/MainWindow.axaml.cs

@@ -25,7 +25,6 @@ namespace SharpEmu.GUI;
 public partial class MainWindow : Window
 {
     private const int MaxConsoleLines = 4000;
-    private const int MaxConsoleLinesPerFlush = 500;
 
     private static readonly IBrush DefaultLineBrush = new SolidColorBrush(Color.Parse("#C7CFDE"));
     private static readonly IBrush DimLineBrush = new SolidColorBrush(Color.Parse("#6B7488"));
@@ -49,7 +48,6 @@ public partial class MainWindow : Window
     private string? _emulatorExePath;
     private bool _isRunning;
     private int _autoScrollTicks;
-    private int _activePageIndex;
 
     // Discord Rich Presence state.
     private readonly long _launcherStartUnixSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
@@ -102,38 +100,23 @@ public partial class MainWindow : Window
         ClearLogButton.Click += (_, _) => _consoleLines.Clear();
         CopyLogButton.Click += async (_, _) => await CopyConsoleAsync();
         DetachConsoleButton.Click += (_, _) => ShowConsoleWindow();
-        LibraryTabButton.Click += (_, _) => SetActivePage(0);
-        OptionsTabButton.Click += (_, _) => SetActivePage(1);
+        OptionsToggle.IsCheckedChanged += (_, _) => OptionsPanel.IsVisible = OptionsToggle.IsChecked == true;
         ConsoleToggle.IsCheckedChanged += (_, _) => ConsolePanel.IsVisible = ConsoleToggle.IsChecked == true && _consoleWindow is null;
-
-        // The settings page edits _settings live, so a launch started while
-        // it is open already uses the new values.
-        LogLevelBox.SelectionChanged += (_, _) => _settings.LogLevel = SelectedLogLevel();
-        TraceImportsBox.ValueChanged += (_, _) => _settings.ImportTraceLimit = (int)(TraceImportsBox.Value ?? 0);
-        StrictToggle.IsCheckedChanged += (_, _) => _settings.StrictDynlibResolution = StrictToggle.IsChecked == true;
-        LogToFileToggle.IsCheckedChanged += (_, _) => _settings.LogToFile = LogToFileToggle.IsChecked == true;
-        OverrideLogFileToggle.IsCheckedChanged += (_, _) =>
-            _settings.OverrideLogFile = OverrideLogFileToggle.IsChecked == true;
-        TitleMusicToggle.IsCheckedChanged += (_, _) =>
-        {
-            _settings.PlayTitleMusic = TitleMusicToggle.IsChecked == true;
-            OnTitleMusicSettingChanged();
-        };
+        SelectLogFilePathButton.Click += async (_, _) => await SelectFilePathAsync();
+        TitleMusicToggle.IsCheckedChanged += (_, _) => OnTitleMusicToggled();
         DiscordToggle.IsCheckedChanged += (_, _) =>
         {
             _settings.DiscordRichPresence = DiscordToggle.IsChecked == true;
             UpdateDiscordPresence();
         };
-        SelectLogFilePathButton.Click += async (_, _) => await SelectLogFilePathAsync();
-        LanguageBox.SelectionChanged += (_, _) => OnLanguageChanged();
 
         GameList.AddHandler(ContextRequestedEvent, OnGameContextRequested, RoutingStrategies.Tunnel);
         CtxLaunch.Click += (_, _) => LaunchSelected();
         CtxOpenFolder.Click += (_, _) => OpenSelectedGameFolder();
         CtxCopyPath.Click += async (_, _) =>
-            await CopyToClipboardAsync((GameList.SelectedItem as GameEntry)?.Path, "Clipboard.Path");
+            await CopyToClipboardAsync((GameList.SelectedItem as GameEntry)?.Path, "Path");
         CtxCopyTitleId.Click += async (_, _) =>
-            await CopyToClipboardAsync((GameList.SelectedItem as GameEntry)?.TitleId, "Clipboard.TitleId");
+            await CopyToClipboardAsync((GameList.SelectedItem as GameEntry)?.TitleId, "Title ID");
         CtxRemove.Click += (_, _) => RemoveSelectedFromLibrary();
 
         Opened += async (_, _) => await OnOpenedAsync();
@@ -149,45 +132,6 @@ public partial class MainWindow : Window
         _gamepadTimer.Start();
     }
 
-    /// <summary>
-    /// Switches between the Library and Options pages. Also reachable via
-    /// the gamepad's shoulder buttons (LB/RB, L1/R1) from <see cref="PollGamepad"/>.
-    /// </summary>
-    private void SetActivePage(int index)
-    {
-        if (index == _activePageIndex)
-        {
-            return;
-        }
-
-        if (_activePageIndex == 1)
-        {
-            _settings.Save(); // leaving the Options page
-        }
-
-        _activePageIndex = index;
-        SetActiveClass(LibraryTabButton, index == 0);
-        SetActiveClass(OptionsTabButton, index == 1);
-        LibraryPage.IsVisible = index == 0;
-        LibraryToolbar.IsVisible = index == 0;
-        OptionsPage.IsVisible = index == 1;
-    }
-
-    private static void SetActiveClass(Button button, bool active)
-    {
-        if (active)
-        {
-            if (!button.Classes.Contains("active"))
-            {
-                button.Classes.Add("active");
-            }
-        }
-        else
-        {
-            button.Classes.Remove("active");
-        }
-    }
-
     // ---- Controller navigation ----
 
     private void PollGamepad()
@@ -201,25 +145,8 @@ public partial class MainWindow : Window
 
         if (!IsActive)
         {
-            // Ignore input while the launcher is in the background, e.g. the
-            // game window is focused and using the same controller.
-            _previousPadButtons = pad.Buttons;
-            return;
-        }
-
-        var shoulderPressed = pad.Buttons & ~_previousPadButtons;
-        if ((shoulderPressed & OrbisPadButton.L1) != 0)
-        {
-            SetActivePage(0);
-        }
-
-        if ((shoulderPressed & OrbisPadButton.R1) != 0)
-        {
-            SetActivePage(1);
-        }
-
-        if (_activePageIndex != 0)
-        {
+            // Ignore input while the launcher is in the background (e.g. the
+            // game window is focused and using the same controller).
             _previousPadButtons = pad.Buttons;
             return;
         }
@@ -327,126 +254,12 @@ public partial class MainWindow : Window
         ToolTip.SetTip(VersionText, BuildInfo.Banner);
 
         _settings = GuiSettings.Load();
-        Localization.Instance.Load(_settings.Language);
-        PopulateLanguageBox();
-        ApplyLocalization();
         ApplySettingsToControls();
         LocateEmulator();
         UpdateDiscordPresence();
         await RescanLibraryAsync();
     }
 
-    private void PopulateLanguageBox()
-    {
-        var languages = Localization.Instance.DiscoverLanguages();
-        LanguageBox.ItemsSource = languages;
-        LanguageBox.SelectedItem = languages.FirstOrDefault(language =>
-            string.Equals(language.Code, _settings.Language, StringComparison.OrdinalIgnoreCase))
-            ?? languages.FirstOrDefault();
-    }
-
-    private void OnLanguageChanged()
-    {
-        if (LanguageBox.SelectedItem is not Localization.LanguageInfo language)
-        {
-            return;
-        }
-
-        _settings.Language = language.Code;
-        Localization.Instance.Load(language.Code);
-        ApplyLocalization();
-    }
-
-    /// <summary>
-    /// Re-applies every UI string from the current language, so switching
-    /// languages in Options takes effect immediately without reopening the
-    /// window.
-    /// </summary>
-    private void ApplyLocalization()
-    {
-        var loc = Localization.Instance;
-
-        LibraryTabButton.Content = loc.Get("Page.Library");
-        OptionsTabButton.Content = loc.Get("Page.Options");
-
-        SearchBox.Watermark = loc.Get("Library.SearchWatermark");
-        AddFolderButton.Content = loc.Get("Library.AddFolder");
-        RescanButton.Content = loc.Get("Library.Rescan");
-        OpenFileButton.Content = loc.Get("Library.OpenFile");
-
-        CtxLaunch.Header = loc.Get("Library.Context.Launch");
-        CtxOpenFolder.Header = loc.Get("Library.Context.OpenFolder");
-        CtxCopyPath.Header = loc.Get("Library.Context.CopyPath");
-        CtxCopyTitleId.Header = loc.Get("Library.Context.CopyTitleId");
-        CtxRemove.Header = loc.Get("Library.Context.Remove");
-
-        EmptyAddFolderButton.Content = loc.Get("Library.Empty.AddFolder");
-        LoadingStateText.Text = loc.Get("Library.Loading");
-
-        GeneralTabItem.Header = loc.Get("Options.General");
-        EmulationSectionTitle.Text = loc.Get("Options.Section.Emulation");
-        LoggingSectionTitle.Text = loc.Get("Options.Section.Logging");
-        LauncherSectionTitle.Text = loc.Get("Options.Section.Launcher");
-
-        CpuEngineLabel.Text = loc.Get("Options.CpuEngine.Label");
-        CpuEngineDesc.Text = loc.Get("Options.CpuEngine.Desc");
-        CpuEngineNativeItem.Content = loc.Get("Options.CpuEngine.Native");
-
-        StrictLabel.Text = loc.Get("Options.Strict.Label");
-        StrictDesc.Text = loc.Get("Options.Strict.Desc");
-
-        LogLevelLabel.Text = loc.Get("Options.LogLevel.Label");
-        LogLevelDesc.Text = loc.Get("Options.LogLevel.Desc");
-        LogLevelTraceItem.Content = loc.Get("Options.LogLevel.Trace");
-        LogLevelDebugItem.Content = loc.Get("Options.LogLevel.Debug");
-        LogLevelInfoItem.Content = loc.Get("Options.LogLevel.Info");
-        LogLevelWarningItem.Content = loc.Get("Options.LogLevel.Warning");
-        LogLevelErrorItem.Content = loc.Get("Options.LogLevel.Error");
-        LogLevelCriticalItem.Content = loc.Get("Options.LogLevel.Critical");
-
-        TraceImportsLabel.Text = loc.Get("Options.TraceImports.Label");
-        TraceImportsDesc.Text = loc.Get("Options.TraceImports.Desc");
-
-        LogToFileLabel.Text = loc.Get("Options.LogToFile.Label");
-        LogToFileDesc.Text = loc.Get("Options.LogToFile.Desc");
-
-        LogFilePathLabel.Text = loc.Get("Options.LogFilePath.Label");
-        SelectLogFilePathButton.Content = loc.Get("Options.LogFilePath.Select");
-        UpdateLogFilePathText();
-
-        OverrideLogFileLabel.Text = loc.Get("Options.OverrideLogFile.Label");
-        OverrideLogFileDesc.Text = loc.Get("Options.OverrideLogFile.Desc");
-
-        LanguageLabel.Text = loc.Get("Options.Language.Label");
-        LanguageDesc.Text = loc.Get("Options.Language.Desc");
-
-        TitleMusicLabel.Text = loc.Get("Options.TitleMusic.Label");
-        TitleMusicDesc.Text = loc.Get("Options.TitleMusic.Desc");
-
-        DiscordLabel.Text = loc.Get("Options.Discord.Label");
-        DiscordDesc.Text = loc.Get("Options.Discord.Desc");
-
-        foreach (var toggle in new[] { StrictToggle, LogToFileToggle, OverrideLogFileToggle, TitleMusicToggle, DiscordToggle })
-        {
-            toggle.OnContent = loc.Get("Common.On");
-            toggle.OffContent = loc.Get("Common.Off");
-        }
-
-        ConsoleSectionTitle.Text = loc.Get("Console.Title");
-        ConsoleSearchBox.Watermark = loc.Get("Console.SearchWatermark");
-        AutoScrollCheck.Content = loc.Get("Console.AutoScroll");
-        DetachConsoleButton.Content = loc.Get("Console.Split");
-        CopyLogButton.Content = loc.Get("Console.Copy");
-        ClearLogButton.Content = loc.Get("Console.Clear");
-
-        ConsoleToggle.Content = loc.Get("Launch.Console");
-        LaunchButton.Content = loc.Get("Launch.Launch");
-        StopButton.Content = loc.Get("Launch.Stop");
-
-        UpdateEmptyStateTexts();
-        UpdateSelectedGameTexts();
-    }
-
     // ---- Discord Rich Presence ----
 
     /// <summary>
@@ -467,7 +280,7 @@ public partial class MainWindow : Window
         if (_isRunning && _runningGameName is { } gameName)
         {
             _discord.SetPresence(
-                Localization.Instance.Format("Discord.Playing", gameName),
+                $"Playing {gameName}",
                 _runningGameTitleId,
                 _runningSinceUnixSeconds);
         }
@@ -475,12 +288,9 @@ public partial class MainWindow : Window
         {
             // Discord does not render activities without timestamps, so the
             // browsing state carries the launcher's start time.
-            var count = _allGames.Count == 1
-                ? Localization.Instance.Get("Page.GameCount.One")
-                : Localization.Instance.Format("Page.GameCount.Other", _allGames.Count);
             _discord.SetPresence(
-                Localization.Instance.Get("Discord.Browsing"),
-                count,
+                "Browsing the library",
+                $"{_allGames.Count} game(s)",
                 _launcherStartUnixSeconds);
         }
     }
@@ -505,20 +315,17 @@ public partial class MainWindow : Window
         {
             WindowState = WindowState.Normal;
             ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.PreferSystemChrome;
-            TitleBar.IsVisible = true;
-            StatusBar.IsVisible = true;
         }
         else
         {
             WindowState = WindowState.FullScreen;
             ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
-            TitleBar.IsVisible = false;
-            StatusBar.IsVisible = false;
         }
     }
 
     private void OnWindowClosing()
     {
+        ReadControlsIntoSettings();
         _settings.Save();
         _consoleFlushTimer.Stop();
         _gamepadTimer.Stop();
@@ -537,7 +344,7 @@ public partial class MainWindow : Window
         }
     }
 
-    // ---- Settings ----
+    // ---- Settings <-> controls ----
 
     private void ApplySettingsToControls()
     {
@@ -556,8 +363,19 @@ public partial class MainWindow : Window
         LogToFileToggle.IsChecked = _settings.LogToFile;
         OverrideLogFileToggle.IsChecked = _settings.OverrideLogFile;
         TitleMusicToggle.IsChecked = _settings.PlayTitleMusic;
+        ToolTip.SetTip(SelectLogFilePathButton, string.IsNullOrWhiteSpace(_settings.LogFilePath) ? "No path selected" : _settings.LogFilePath);
         DiscordToggle.IsChecked = _settings.DiscordRichPresence;
-        UpdateLogFilePathText();
+    }
+
+    private void ReadControlsIntoSettings()
+    {
+        _settings.LogLevel = SelectedLogLevel();
+        _settings.ImportTraceLimit = (int)(TraceImportsBox.Value ?? 0);
+        _settings.StrictDynlibResolution = StrictToggle.IsChecked == true;
+        _settings.LogToFile = LogToFileToggle.IsChecked == true;
+        _settings.OverrideLogFile = OverrideLogFileToggle.IsChecked == true;
+        _settings.PlayTitleMusic = TitleMusicToggle.IsChecked == true;
+        _settings.DiscordRichPresence = DiscordToggle.IsChecked == true;
     }
 
     private string SelectedLogLevel()
@@ -574,35 +392,6 @@ public partial class MainWindow : Window
         };
     }
 
-    private void UpdateLogFilePathText()
-    {
-        LogFilePathText.Text = string.IsNullOrWhiteSpace(_settings.LogFilePath)
-            ? Localization.Instance.Get("Options.LogFilePath.Default")
-            : _settings.LogFilePath;
-    }
-
-    private async Task SelectLogFilePathAsync()
-    {
-        var loc = Localization.Instance;
-        SaveFilePickerResult result = await StorageProvider.SaveFilePickerWithResultAsync(new FilePickerSaveOptions
-        {
-            Title = loc.Get("Dialog.SaveLogFile"),
-            SuggestedFileName = "SharpEmuLog",
-            DefaultExtension = "log",
-            FileTypeChoices =
-                [
-                    new FilePickerFileType(loc.Get("Dialog.PlainTextFiles")) { Patterns = ["*.txt"] },
-                    new FilePickerFileType(loc.Get("Dialog.LogFiles")) { Patterns = ["*.log"] }
-                ]
-        });
-
-        if (result.File is not null)
-        {
-            _settings.LogFilePath = result.File.Path.LocalPath;
-            UpdateLogFilePathText();
-        }
-    }
-
     // ---- Emulator discovery ----
 
     private void LocateEmulator()
@@ -632,8 +421,8 @@ public partial class MainWindow : Window
             : null;
 
         EmulatorPathText.Text = _emulatorExePath is not null
-            ? Localization.Instance.Format("Status.EmulatorPath", _emulatorExePath)
-            : Localization.Instance.Get("Status.EmulatorNotFound");
+            ? $"Emulator: {_emulatorExePath}"
+            : "Emulator: SharpEmu executable not found — build SharpEmu.CLI first.";
     }
 
     // ---- Game library ----
@@ -642,7 +431,7 @@ public partial class MainWindow : Window
     {
         var folders = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
         {
-            Title = Localization.Instance.Get("Dialog.ChooseGameFolder"),
+            Title = "Choose a folder containing games",
             AllowMultiple = false,
         });
 
@@ -677,21 +466,18 @@ public partial class MainWindow : Window
     {
         var folders = _settings.GameFolders.ToArray();
         var excluded = new HashSet<string>(_settings.ExcludedGames, StringComparer.OrdinalIgnoreCase);
-        StatusBarRight.Text = Localization.Instance.Get("Status.ScanningLibrary");
-        EmptyState.IsVisible = false;
-        LoadingState.IsVisible = true;
+        StatusBarRight.Text = "Scanning library…";
 
         var games = await Task.Run(() => ScanFolders(folders, excluded));
 
         _allGames.Clear();
         _allGames.AddRange(games);
         RefreshVisibleGames();
-        LoadingState.IsVisible = false;
         LoadGameDetailsInBackground(games);
         UpdateDiscordPresence();
         StatusBarRight.Text = folders.Length == 0
-            ? Localization.Instance.Get("Status.AddFolderPrompt")
-            : Localization.Instance.Format("Status.LibraryScanned", games.Count, folders.Length);
+            ? "Add a game folder to populate the library."
+            : $"Library scanned: {games.Count} game(s) in {folders.Length} folder(s).";
     }
 
     /// <summary>
@@ -828,9 +614,9 @@ public partial class MainWindow : Window
                     {
                     }
 
-                    var (title, titleId, version) = TryReadParamJson(fullPath);
+                    var (title, titleId) = TryReadParamJson(fullPath);
                     games.Add(new GameEntry(
-                        title ?? GameNameFor(fullPath), titleId, version, fullPath, size,
+                        title ?? GameNameFor(fullPath), titleId, fullPath, size,
                         FindCoverFor(fullPath), FindBackgroundFor(fullPath)));
                 }
             }
@@ -845,23 +631,23 @@ public partial class MainWindow : Window
     }
 
     /// <summary>
-    /// Reads the game title, title id and content version from
-    /// sce_sys/param.json next to the executable, when present.
+    /// Reads the game title and title id from sce_sys/param.json next to the
+    /// executable, when present.
     /// </summary>
-    private static (string? Title, string? TitleId, string? Version) TryReadParamJson(string ebootPath)
+    private static (string? Title, string? TitleId) TryReadParamJson(string ebootPath)
     {
         try
         {
             var directory = Path.GetDirectoryName(ebootPath);
             if (directory is null)
             {
-                return (null, null, null);
+                return (null, null);
             }
 
             var paramPath = Path.Combine(directory, "sce_sys", "param.json");
             if (!File.Exists(paramPath))
             {
-                return (null, null, null);
+                return (null, null);
             }
 
             // ReadAllText handles a UTF-8 BOM, which JsonDocument rejects in
@@ -875,20 +661,6 @@ public partial class MainWindow : Window
                 titleId = idElement.GetString();
             }
 
-            // contentVersion carries the installed app version
-            // ("01.000.000"); masterVersion is the fallback on older dumps.
-            string? version = null;
-            if (root.TryGetProperty("contentVersion", out var versionElement) &&
-                versionElement.ValueKind == JsonValueKind.String)
-            {
-                version = versionElement.GetString();
-            }
-            else if (root.TryGetProperty("masterVersion", out var masterElement) &&
-                     masterElement.ValueKind == JsonValueKind.String)
-            {
-                version = masterElement.GetString();
-            }
-
             string? title = null;
             if (root.TryGetProperty("localizedParameters", out var localized) &&
                 localized.ValueKind == JsonValueKind.Object)
@@ -919,12 +691,11 @@ public partial class MainWindow : Window
 
             return (
                 string.IsNullOrWhiteSpace(title) ? null : title,
-                string.IsNullOrWhiteSpace(titleId) ? null : titleId,
-                string.IsNullOrWhiteSpace(version) ? null : version.Trim());
+                string.IsNullOrWhiteSpace(titleId) ? null : titleId);
         }
         catch (Exception)
         {
-            return (null, null, null);
+            return (null, null);
         }
     }
 
@@ -1035,12 +806,11 @@ public partial class MainWindow : Window
         }
         catch (Exception ex)
         {
-            StatusBarRight.Text = Localization.Instance.Format("Status.CouldNotOpenFolder", ex.Message);
+            StatusBarRight.Text = $"Could not open folder: {ex.Message}";
         }
     }
 
-    /// <summary>Copies <paramref name="text"/> and reports it via <paramref name="whatKey"/>, e.g. "Clipboard.Path".</summary>
-    private async Task CopyToClipboardAsync(string? text, string whatKey)
+    private async Task CopyToClipboardAsync(string? text, string what)
     {
         if (string.IsNullOrEmpty(text) || Clipboard is null)
         {
@@ -1048,7 +818,7 @@ public partial class MainWindow : Window
         }
 
         await Clipboard.SetTextAsync(text);
-        StatusBarRight.Text = Localization.Instance.Format("Status.CopiedToClipboard", Localization.Instance.Get(whatKey));
+        StatusBarRight.Text = $"{what} copied to clipboard.";
     }
 
     private void RemoveSelectedFromLibrary()
@@ -1067,7 +837,7 @@ public partial class MainWindow : Window
         _allGames.RemoveAll(g => string.Equals(g.Path, game.Path, StringComparison.OrdinalIgnoreCase));
         GameList.SelectedItem = null;
         RefreshVisibleGames();
-        StatusBarRight.Text = Localization.Instance.Format("Status.RemovedFromLibrary", game.Name);
+        StatusBarRight.Text = $"Removed “{game.Name}” from the library. Re-add its folder to restore it.";
     }
 
     private void RefreshVisibleGames()
@@ -1087,6 +857,8 @@ public partial class MainWindow : Window
             }
         }
 
+        GameCountText.Text = _visibleGames.Count == 1 ? "1 game" : $"{_visibleGames.Count} games";
+
         if (selectedPath is not null &&
             _visibleGames.FirstOrDefault(g => g.Path.Equals(selectedPath, StringComparison.OrdinalIgnoreCase))
                 is { } reselected)
@@ -1095,50 +867,34 @@ public partial class MainWindow : Window
         }
 
         EmptyState.IsVisible = _visibleGames.Count == 0;
-        UpdateEmptyStateTexts();
-
-        UpdateSelectedGame();
-    }
-
-    /// <summary>
-    /// Refreshes the empty-state title/hint from the current language and
-    /// search text; a no-op while the empty state is not showing.
-    /// </summary>
-    private void UpdateEmptyStateTexts()
-    {
-        if (_visibleGames.Count != 0)
+        if (_visibleGames.Count == 0)
         {
-            return;
+            var hasFilter = query.Length > 0;
+            EmptyStateTitle.Text = hasFilter ? "No games match your search" : "Your library is empty";
+            EmptyStateHint.Text = hasFilter
+                ? $"Nothing in the library matches “{query}”."
+                : "Add a folder containing your games to get started.";
+            EmptyAddFolderButton.IsVisible = !hasFilter;
         }
 
-        var query = SearchBox.Text?.Trim() ?? string.Empty;
-        var hasFilter = query.Length > 0;
-        EmptyStateTitle.Text = hasFilter
-            ? Localization.Instance.Get("Library.Empty.SearchTitle")
-            : Localization.Instance.Get("Library.Empty.Title");
-        EmptyStateHint.Text = hasFilter
-            ? Localization.Instance.Format("Library.Empty.SearchHint", query)
-            : Localization.Instance.Get("Library.Empty.Hint");
-        EmptyAddFolderButton.IsVisible = !hasFilter;
+        UpdateSelectedGame();
     }
 
     private void UpdateSelectedGame()
     {
         if (GameList.SelectedItem is GameEntry game)
         {
-            UpdateSelectedGameTexts();
+            SelectedGameTitle.Text = game.Name;
+            SelectedGamePath.Text = game.Path;
             SelectedCoverPanel.DataContext = game;
-            SelectedBadgesRow.DataContext = game;
-            SelectedBadgesRow.IsVisible = true;
             _ = UpdateBackdropAsync(game);
             PlaySelectedGamePreview(game);
         }
         else
         {
-            UpdateSelectedGameTexts();
+            SelectedGameTitle.Text = "No game selected";
+            SelectedGamePath.Text = "Pick a game from the library, or open an eboot.bin directly.";
             SelectedCoverPanel.DataContext = null;
-            SelectedBadgesRow.DataContext = null;
-            SelectedBadgesRow.IsVisible = false;
             _ = UpdateBackdropAsync(null);
             _sndPreview.Stop();
         }
@@ -1146,25 +902,6 @@ public partial class MainWindow : Window
         UpdateRunButtons();
     }
 
-    /// <summary>
-    /// Text-only refresh of the launch bar's title/path, split out of
-    /// <see cref="UpdateSelectedGame"/> so a language change can re-apply it
-    /// without restarting the backdrop fade or preview music.
-    /// </summary>
-    private void UpdateSelectedGameTexts()
-    {
-        if (GameList.SelectedItem is GameEntry game)
-        {
-            SelectedGameTitle.Text = game.Name;
-            SelectedGamePath.Text = game.Path;
-        }
-        else
-        {
-            SelectedGameTitle.Text = Localization.Instance.Get("Launch.NoGameSelected");
-            SelectedGamePath.Text = Localization.Instance.Get("Launch.NoGameHint");
-        }
-    }
-
     /// <summary>
     /// Loops the selected game's sce_sys/snd0.at9 preview music, console
     /// home screen style. Silent while a game is running or when disabled
@@ -1189,8 +926,9 @@ public partial class MainWindow : Window
         }
     }
 
-    private void OnTitleMusicSettingChanged()
+    private void OnTitleMusicToggled()
     {
+        _settings.PlayTitleMusic = TitleMusicToggle.IsChecked == true;
         if (!_settings.PlayTitleMusic)
         {
             _sndPreview.Stop();
@@ -1263,12 +1001,11 @@ public partial class MainWindow : Window
     {
         var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
         {
-            Title = Localization.Instance.Get("Dialog.OpenExecutable"),
+            Title = "Open an executable to launch",
             AllowMultiple = false,
             FileTypeFilter = new[]
             {
-                new FilePickerFileType(Localization.Instance.Get("Dialog.PsExecutables"))
-                    { Patterns = new[] { "eboot.bin", "*.bin", "*.self", "*.elf" } },
+                new FilePickerFileType("PS executables") { Patterns = new[] { "eboot.bin", "*.bin", "*.self", "*.elf" } },
                 FilePickerFileTypes.All,
             },
         });
@@ -1300,12 +1037,14 @@ public partial class MainWindow : Window
             LocateEmulator();
             if (_emulatorExePath is null)
             {
-                AppendConsoleLine(Localization.Instance.Get("Launch.ExeNotFound"), ErrorLineBrush);
+                AppendConsoleLine("SharpEmu executable not found. Build the SharpEmu.CLI project first (dotnet build).", ErrorLineBrush);
                 return;
             }
         }
 
         _sndPreview.Stop();
+        ReadControlsIntoSettings();
+        _settings.Save();
 
         var arguments = new List<string>
         {
@@ -1323,6 +1062,7 @@ public partial class MainWindow : Window
         }
 
         _consoleLines.Clear();
+        ConsoleToggle.IsChecked = true;
 
         // Let the CLI mirror stdout/stderr itself; it sees loader/native
         // diagnostics before the GUI pipe reader can filter or batch them.
@@ -1365,15 +1105,13 @@ public partial class MainWindow : Window
             {
                 arguments.Add("--log-file");
                 arguments.Add(filePath);
-                AppendConsoleLine(Localization.Instance.Format("Launch.LogFile", filePath), DimLineBrush);
+                AppendConsoleLine($"Log file: {filePath}", DimLineBrush);
             }
         }
 
         arguments.Add(ebootPath);
 
-        AppendConsoleLine(
-            Localization.Instance.Format("Launch.Command", string.Join(' ', arguments)),
-            DimLineBrush);
+        AppendConsoleLine($"$ SharpEmu {string.Join(' ', arguments)}", DimLineBrush);
 
         var emulator = new EmulatorProcess();
         emulator.OutputReceived += (line, isError) => _pendingLines.Enqueue((line, isError));
@@ -1386,7 +1124,7 @@ public partial class MainWindow : Window
         catch (Exception ex)
         {
             emulator.Dispose();
-            AppendConsoleLine(Localization.Instance.Format("Launch.StartFailed", ex.Message), ErrorLineBrush);
+            AppendConsoleLine($"Failed to start the emulator: {ex.Message}", ErrorLineBrush);
             DropFileLog();
             return;
         }
@@ -1399,8 +1137,8 @@ public partial class MainWindow : Window
             .TitleId;
         _runningSinceUnixSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
         StatusDot.Fill = SuccessLineBrush;
-        StatusText.Text = Localization.Instance.Format("Launch.Running", displayName);
-        StatusBarRight.Text = Localization.Instance.Format("Status.Running", displayName);
+        StatusText.Text = $"Running — {displayName}";
+        StatusBarRight.Text = $"Running {displayName}";
         UpdateRunButtons();
         UpdateDiscordPresence();
     }
@@ -1422,8 +1160,8 @@ public partial class MainWindow : Window
         _emulator?.Stop();
         _runningGameName = null;
         _runningGameTitleId = null;
-        StatusText.Text = Localization.Instance.Get("Launch.Stopping");
-        StatusBarRight.Text = Localization.Instance.Get("Status.Stopping");
+        StatusText.Text = "Stopping…";
+        StatusBarRight.Text = "Stopping…";
         UpdateDiscordPresence();
     }
 
@@ -1465,23 +1203,22 @@ public partial class MainWindow : Window
         _emulator?.Dispose();
         _emulator = null;
 
-        var meaningKey = exitCode switch
+        var meaning = exitCode switch
         {
-            0 => "Exit.Ok",
-            1 => "Exit.InvalidArguments",
-            2 => "Exit.EbootNotFound",
-            3 => "Exit.RuntimeException",
-            4 => "Exit.EmulationError",
-            _ => "Exit.Unknown",
+            0 => "OK",
+            1 => "invalid arguments",
+            2 => "eboot not found",
+            3 => "runtime exception",
+            4 => "emulation error",
+            _ => "unknown",
         };
-        var meaning = Localization.Instance.Get(meaningKey);
         var brush = exitCode == 0 ? SuccessLineBrush : ErrorLineBrush;
-        AppendConsoleLine(Localization.Instance.Format("Launch.ProcessExited", exitCode, meaning), brush);
+        AppendConsoleLine($"Process exited with code {exitCode} ({meaning}).", brush);
         CloseFileLogSoon();
 
         StatusDot.Fill = exitCode == 0 ? (IBrush)SuccessLineBrush : ErrorLineBrush;
-        StatusText.Text = Localization.Instance.Format("Launch.Exited", exitCode, meaning);
-        StatusBarRight.Text = Localization.Instance.Get("Status.Idle");
+        StatusText.Text = $"Exited with code {exitCode} ({meaning})";
+        StatusBarRight.Text = "Idle";
         _runningGameName = null;
         _runningGameTitleId = null;
         UpdateRunButtons();
@@ -1495,6 +1232,27 @@ public partial class MainWindow : Window
         OpenFileButton.IsEnabled = !_isRunning;
     }
 
+    private async Task SelectFilePathAsync()
+    {
+        SaveFilePickerResult result = await StorageProvider.SaveFilePickerWithResultAsync(new FilePickerSaveOptions
+        {
+            Title = "Select where to save the Log file",
+            SuggestedFileName = "SharpEmuLog",
+            DefaultExtension = "log",
+            FileTypeChoices =
+                [
+                    new FilePickerFileType("Plain Text Files") { Patterns = ["*.txt"] },
+                    new FilePickerFileType("Log Files") { Patterns = ["*.log"] }
+                ]
+        });
+
+        if (result.File is not null)
+        {
+            _settings.LogFilePath = result.File.Path.LocalPath;
+            ToolTip.SetTip(SelectLogFilePathButton, _settings.LogFilePath);
+        }
+    }
+
     // ---- Console ----
 
     private void FlushPendingConsoleLines()
@@ -1505,8 +1263,7 @@ public partial class MainWindow : Window
         }
 
         var incoming = new List<LogLine>();
-        while (incoming.Count < MaxConsoleLinesPerFlush &&
-               _pendingLines.TryDequeue(out var pending))
+        while (_pendingLines.TryDequeue(out var pending))
         {
             WriteFileLog(pending.Line);
             incoming.Add(new LogLine(pending.Line, BrushForLine(pending.Line)));

src/SharpEmu.GUI/SharpEmu.GUI.csproj

@@ -30,14 +30,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <AvaloniaResource Include="..\..\assets\images\SharpEmu.ico" Link="Assets/SharpEmu.ico" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Languages\*.json">
-      <LogicalName>Languages.%(Filename)%(Extension)</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-
-
-
   <!-- The controller readers (DualSense raw HID + Xbox XInput) are shared
        with the emulator's pad HLE. They are dependency-free, so they are
        compiled in directly rather than pulling a reference to all of

src/SharpEmu.GUI/SndPreviewPlayer.cs

@@ -47,7 +47,7 @@ internal sealed class SndPreviewPlayer
         {
             // Debounce so skimming through the library does not decode (or
             // start) a preview per tile.
-            await Task.Delay(120).ConfigureAwait(false);
+            await Task.Delay(300).ConfigureAwait(false);
 
             byte[]? wav;
             lock (_sync)

src/SharpEmu.HLE/ModuleManager.cs

@@ -3,17 +3,18 @@
 
 using System.Collections.Concurrent;
 using System.Reflection;
-using System.Runtime.CompilerServices;
+using SharpEmu.Logging;
 
 namespace SharpEmu.HLE;
 
 public sealed class ModuleManager : IModuleManager
 {
+    private static readonly SharpEmuLogger Log = SharpEmuLog.For("HLE");
+
     private readonly ConcurrentDictionary<string, Delegate> _dispatchTable = new(StringComparer.Ordinal);
     private readonly ConcurrentDictionary<string, ExportedFunction> _exportTable = new(StringComparer.Ordinal);
     private readonly ConcurrentDictionary<string, ExportedFunction> _exportNameTable = new(StringComparer.Ordinal);
     private readonly object _registrationGate = new();
-    private readonly HashSet<(Assembly Assembly, Generation Generation)> _scannedAssemblies = new();
     private bool _isFrozen;
 
     public int RegisterFromAssembly(Assembly assembly, Generation generation, ISymbolCatalog? symbolCatalog = null)
@@ -27,12 +28,6 @@ public sealed class ModuleManager : IModuleManager
                 throw new InvalidOperationException("Module registration is frozen.");
             }
 
-            // Deduplicated: one assembly is reached through many types.
-            if (!_scannedAssemblies.Add((assembly, generation)))
-            {
-                return 0;
-            }
-
             var registeredCount = 0;
             var instances = new Dictionary<Type, object>();
 
@@ -55,7 +50,7 @@ public sealed class ModuleManager : IModuleManager
                     var handler = CreateHandler(type, method, instances);
                     if (!_dispatchTable.TryAdd(exportInfo.Value.Nid, handler))
                     {
-                        Console.Error.WriteLine($"[HLE] Duplicate NID '{exportInfo.Value.Nid}' ({exportInfo.Value.ExportName}) — already registered, skipping.");
+                        Log.Warning($"Duplicate NID '{exportInfo.Value.Nid}' ({exportInfo.Value.ExportName}) — already registered, skipping.");
                         continue;
                     }
 
@@ -81,195 +76,8 @@ public sealed class ModuleManager : IModuleManager
         {
             _isFrozen = true;
         }
-
-        WarmHleTypeInitializers();
     }
 
-    // A .cctor or first JIT running on a guest thread's hijacked stack fail-fasts the CLR.
-    // Run every HLE type's initializer and JIT its methods here first, on a host thread.
-    private void WarmHleTypeInitializers()
-    {
-        Assembly[] assemblies;
-        lock (_registrationGate)
-        {
-            assemblies = _scannedAssemblies.Select(entry => entry.Assembly).Distinct().ToArray();
-        }
-
-        assemblies = WithGuestReachableDependencies(assemblies);
-        var bclWarmed = WarmFrameworkTypeInitializers();
-
-        var warmed = 0;
-        var failed = 0;
-        var jitted = 0;
-        var jitFailed = 0;
-        foreach (var assembly in assemblies)
-        {
-            Type[] types;
-            try
-            {
-                types = assembly.GetTypes();
-            }
-            catch (ReflectionTypeLoadException ex)
-            {
-                types = ex.Types.Where(t => t is not null).ToArray()!;
-            }
-
-            const BindingFlags allMembers = BindingFlags.Public | BindingFlags.NonPublic |
-                BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
-
-            foreach (var type in types)
-            {
-                if (type is null || type.ContainsGenericParameters)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    RuntimeHelpers.RunClassConstructor(type.TypeHandle);
-                    warmed++;
-                }
-                catch
-                {
-                    // A throw here beats a guest-thread fail-fast later; swallow and continue.
-                    failed++;
-                }
-
-                // Force-JIT (not execute) every method so no guest thread compiles one first.
-                MethodBase[] members;
-                try
-                {
-                    members = type.GetConstructors(allMembers)
-                        .Concat<MethodBase>(type.GetMethods(allMembers))
-                        .ToArray();
-                }
-                catch
-                {
-                    continue;
-                }
-
-                foreach (var member in members)
-                {
-                    if (member.ContainsGenericParameters || member.IsAbstract || member.MethodImplementationFlags.HasFlag(MethodImplAttributes.InternalCall))
-                    {
-                        continue;
-                    }
-
-                    try
-                    {
-                        RuntimeHelpers.PrepareMethod(member.MethodHandle);
-                        jitted++;
-                    }
-                    catch
-                    {
-                        jitFailed++;
-                    }
-                }
-            }
-        }
-
-        Console.Error.WriteLine(
-            $"[HLE] Warmed {warmed} type initializers ({failed} threw) + JIT-compiled {jitted} methods ({jitFailed} skipped) across {assemblies.Length} HLE assemblies, plus {bclWarmed} framework type initializers.");
-    }
-
-    // Framework .cctors too (but not JIT — the BCL is too large).
-    private static int WarmFrameworkTypeInitializers()
-    {
-        var warmed = 0;
-        foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-        {
-            var name = assembly.GetName().Name;
-            if (name is null || !IsFrameworkAssembly(name))
-            {
-                continue;
-            }
-
-            Type[] types;
-            try
-            {
-                types = assembly.GetTypes();
-            }
-            catch (ReflectionTypeLoadException ex)
-            {
-                types = ex.Types.Where(t => t is not null).ToArray()!;
-            }
-            catch
-            {
-                continue;
-            }
-
-            foreach (var type in types)
-            {
-                if (type is null || type.ContainsGenericParameters)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    RuntimeHelpers.RunClassConstructor(type.TypeHandle);
-                    warmed++;
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        return warmed;
-    }
-
-    private static bool IsFrameworkAssembly(string assemblyName) =>
-        assemblyName.StartsWith("System", StringComparison.Ordinal) ||
-        string.Equals(assemblyName, "netstandard", StringComparison.Ordinal);
-
-    // Warm the interop assemblies guest threads reach (e.g. Silk.NET via the flip path).
-    private static Assembly[] WithGuestReachableDependencies(Assembly[] scanned)
-    {
-        var result = new Dictionary<string, Assembly>(StringComparer.Ordinal);
-        foreach (var assembly in scanned)
-        {
-            result[assembly.FullName ?? assembly.GetName().Name ?? string.Empty] = assembly;
-        }
-
-        foreach (var assembly in scanned)
-        {
-            AssemblyName[] references;
-            try
-            {
-                references = assembly.GetReferencedAssemblies();
-            }
-            catch
-            {
-                continue;
-            }
-
-            foreach (var reference in references)
-            {
-                var name = reference.Name;
-                if (name is null || !IsGuestReachableInterop(name))
-                {
-                    continue;
-                }
-
-                try
-                {
-                    var loaded = Assembly.Load(reference);
-                    result[loaded.FullName ?? name] = loaded;
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        return result.Values.ToArray();
-    }
-
-    private static bool IsGuestReachableInterop(string assemblyName) =>
-        assemblyName.StartsWith("Silk.NET", StringComparison.Ordinal) ||
-        assemblyName.StartsWith("SharpEmu", StringComparison.Ordinal);
-
     public bool TryGetFunction(string nid, out Delegate function)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(nid);
@@ -301,7 +109,7 @@ public sealed class ModuleManager : IModuleManager
 
         if (!_dispatchTable.TryGetValue(nid, out var function) || !_exportTable.TryGetValue(nid, out var export))
         {
-            Console.Error.WriteLine($"[HLE] NID '{nid}' not found in dispatch table.");
+            Log.Warning($"NID '{nid}' not found in dispatch table.");
             context[CpuRegister.Rax] = unchecked((ulong)(int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND);
             result = OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
             return false;
@@ -309,7 +117,7 @@ public sealed class ModuleManager : IModuleManager
 
         if ((export.Target & context.TargetGeneration) == 0)
         {
-            Console.Error.WriteLine($"[HLE] NID '{nid}' ({export.Name}) found but not implemented for generation {context.TargetGeneration} (targets: {export.Target}).");
+            Log.Warning($"NID '{nid}' ({export.Name}) found but not implemented for generation {context.TargetGeneration} (targets: {export.Target}).");
             context[CpuRegister.Rax] = unchecked((ulong)(int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_IMPLEMENTED);
             result = OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_IMPLEMENTED;
             return false;

src/SharpEmu.Libs/Agc/AgcExports.cs

@@ -120,9 +120,6 @@ public static class AgcExports
     private const uint RegisterDefaultsVersion13 = 13;
     private const int RegisterDefaultsSize = 0x40;
     private const int RegisterDefaultBlockSize = 16 * 8;
-    private const ulong ResourceRegistrationBytesPerResource = 0x118;
-    private const ulong ResourceRegistrationBytesPerOwner = 0x1E0;
-    private const int ResourceRegistrationMaxNameLength = 256;
 
     private const ulong ShaderUserDataOffset = 0x08;
     private const ulong ShaderCodeOffset = 0x10;
@@ -391,26 +388,9 @@ public static class AgcExports
         public SubmittedDcbState Graphics { get; } = new();
         public Dictionary<uint, SubmittedDcbState> ComputeQueues { get; } = new();
         public Dictionary<ulong, ComputeImageWriter> ComputeImageWriters { get; } = new();
-        public Dictionary<uint, string> ResourceOwners { get; } = new();
-        public Dictionary<uint, RegisteredAgcResource> RegisteredResources { get; } = new();
-        public bool ResourceRegistrationInitialized { get; set; }
-        public ulong ResourceRegistrationMemory { get; set; }
-        public ulong ResourceRegistrationMemorySize { get; set; }
-        public uint ResourceRegistrationMaxOwners { get; set; }
-        public uint DefaultOwner { get; set; } = DefaultAgcOwner;
-        public uint NextOwner { get; set; } = 1;
-        public uint NextResource { get; set; } = 1;
         public ulong WorkSequence { get; set; }
     }
 
-    private readonly record struct RegisteredAgcResource(
-        uint Owner,
-        ulong Address,
-        ulong Size,
-        string Name,
-        uint Type,
-        uint Flags);
-
     private readonly record struct RegisterDefaultValue(uint Offset, uint Value);
 
     private readonly record struct RegisterDefaultGroup(
@@ -2140,87 +2120,12 @@ public static class AgcExports
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
         }
 
-        if (!ctx.TryWriteUInt32(outAddress, ResourceRegistrationMaxNameLength))
+        if (!ctx.TryWriteUInt32(outAddress, 256))
         {
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
         }
 
-        TraceAgc(
-            $"agc.driver_get_resource_registration_max_name_length " +
-            $"out=0x{outAddress:X16} value={ResourceRegistrationMaxNameLength}");
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    [SysAbiExport(
-        Nid = "AOLcoIkQDgM",
-        ExportName = "sceAgcDriverQueryResourceRegistrationUserMemoryRequirements",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DriverQueryResourceRegistrationUserMemoryRequirements(CpuContext ctx)
-    {
-        var sizeAddress = ctx[CpuRegister.Rdi];
-        var resourceCount = ctx[CpuRegister.Rsi];
-        var ownerCount = ctx[CpuRegister.Rdx];
-        if (sizeAddress == 0 || resourceCount == 0 || ownerCount == 0)
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        ulong requiredSize;
-        try
-        {
-            requiredSize = checked(
-                resourceCount * ResourceRegistrationBytesPerResource +
-                ownerCount * ResourceRegistrationBytesPerOwner);
-        }
-        catch (OverflowException)
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        if (!ctx.TryWriteUInt64(sizeAddress, requiredSize))
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
-
-        TraceAgc(
-            $"agc.driver_query_resource_registration_memory resources={resourceCount} " +
-            $"owners={ownerCount} bytes=0x{requiredSize:X}");
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    [SysAbiExport(
-        Nid = "F0Y42t-3e18",
-        ExportName = "sceAgcDriverInitResourceRegistration",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DriverInitResourceRegistration(CpuContext ctx)
-    {
-        var memoryAddress = ctx[CpuRegister.Rdi];
-        var memorySize = ctx[CpuRegister.Rsi];
-        var ownerCount = ctx[CpuRegister.Rdx];
-        if (memoryAddress == 0 || memorySize == 0 || ownerCount == 0 || ownerCount > uint.MaxValue)
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        lock (state.Gate)
-        {
-            state.ResourceRegistrationInitialized = true;
-            state.ResourceRegistrationMemory = memoryAddress;
-            state.ResourceRegistrationMemorySize = memorySize;
-            state.ResourceRegistrationMaxOwners = (uint)ownerCount;
-            state.ResourceOwners.Clear();
-            state.RegisteredResources.Clear();
-            state.DefaultOwner = DefaultAgcOwner;
-            state.NextOwner = 1;
-            state.NextResource = 1;
-        }
-
-        TraceAgc(
-            $"agc.driver_init_resource_registration memory=0x{memoryAddress:X16} " +
-            $"bytes=0x{memorySize:X} owners={ownerCount}");
+        TraceAgc($"agc.driver_get_resource_registration_max_name_length out=0x{outAddress:X16} value=256");
         return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
@@ -2239,97 +2144,12 @@ public static class AgcExports
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
         }
 
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        uint owner;
-        lock (state.Gate)
-        {
-            owner = state.DefaultOwner;
-        }
-
-        if (!ctx.TryWriteUInt32(ownerAddress, owner))
+        if (!ctx.TryWriteUInt32(ownerAddress, DefaultAgcOwner))
         {
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
         }
 
-        TraceAgc($"agc.driver_get_default_owner out=0x{ownerAddress:X16} owner={owner}");
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    [SysAbiExport(
-        Nid = "U9ueyEhSkF4",
-        ExportName = "sceAgcDriverRegisterDefaultOwner",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DriverRegisterDefaultOwner(CpuContext ctx)
-    {
-        var owner = (uint)ctx[CpuRegister.Rdi];
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        lock (state.Gate)
-        {
-            state.DefaultOwner = owner;
-        }
-
-        TraceAgc($"agc.driver_register_default_owner owner={owner}");
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    [SysAbiExport(
-        Nid = "X-Nm5KLREeg",
-        ExportName = "sceAgcDriverRegisterOwner",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DriverRegisterOwner(CpuContext ctx)
-    {
-        var ownerAddress = ctx[CpuRegister.Rdi];
-        var nameAddress = ctx[CpuRegister.Rsi];
-        if (ownerAddress == 0 || nameAddress == 0 ||
-            !TryReadGuestCString(
-                ctx,
-                nameAddress,
-                ResourceRegistrationMaxNameLength,
-                out var nameBytes))
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        uint owner;
-        lock (state.Gate)
-        {
-            if (!state.ResourceRegistrationInitialized ||
-                state.ResourceRegistrationMaxOwners != 0 &&
-                state.ResourceOwners.Count >= state.ResourceRegistrationMaxOwners)
-            {
-                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            }
-
-            owner = state.NextOwner;
-            while (owner == state.DefaultOwner || state.ResourceOwners.ContainsKey(owner))
-            {
-                owner++;
-                if (owner == 0)
-                {
-                    return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-                }
-            }
-
-            state.NextOwner = owner + 1;
-            state.ResourceOwners.Add(owner, System.Text.Encoding.UTF8.GetString(nameBytes));
-        }
-
-        if (!ctx.TryWriteUInt32(ownerAddress, owner))
-        {
-            lock (state.Gate)
-            {
-                state.ResourceOwners.Remove(owner);
-            }
-
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
-
-        TraceAgc(
-            $"agc.driver_register_owner out=0x{ownerAddress:X16} owner={owner} " +
-            $"name={System.Text.Encoding.UTF8.GetString(nameBytes)}");
+        TraceAgc($"agc.driver_get_default_owner out=0x{ownerAddress:X16} owner={DefaultAgcOwner}");
         return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
@@ -2340,90 +2160,19 @@ public static class AgcExports
     LibraryName = "libSceAgc")]
     public static int DriverRegisterResource(CpuContext ctx)
     {
-        var resourceHandleAddress = ctx[CpuRegister.Rdi];
+        var resourceAddress = ctx[CpuRegister.Rdi];
         var owner = (uint)ctx[CpuRegister.Rsi];
-        var resourceAddress = ctx[CpuRegister.Rdx];
-        var resourceSize = ctx[CpuRegister.Rcx];
-        var nameAddress = ctx[CpuRegister.R8];
-        var type = (uint)ctx[CpuRegister.R9];
-        if (resourceHandleAddress == 0 || resourceAddress == 0 || resourceSize == 0 ||
-            !ctx.TryReadUInt32(ctx[CpuRegister.Rsp] + sizeof(ulong), out var flags) ||
-            !TryReadGuestCString(
-                ctx,
-                nameAddress,
-                ResourceRegistrationMaxNameLength,
-                out var nameBytes))
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        uint resourceHandle;
-        lock (state.Gate)
-        {
-            if (!state.ResourceRegistrationInitialized ||
-                owner != state.DefaultOwner &&
-                !state.ResourceOwners.ContainsKey(owner))
-            {
-                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            }
-
-            resourceHandle = state.NextResource++;
-            if (resourceHandle == 0)
-            {
-                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            }
-
-            state.RegisteredResources.Add(
-                resourceHandle,
-                new RegisteredAgcResource(
-                    owner,
-                    resourceAddress,
-                    resourceSize,
-                    System.Text.Encoding.UTF8.GetString(nameBytes),
-                    type,
-                    flags));
-        }
-
-        if (!ctx.TryWriteUInt32(resourceHandleAddress, resourceHandle))
-        {
-            lock (state.Gate)
-            {
-                state.RegisteredResources.Remove(resourceHandle);
-            }
-
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
+        var nameAddress = ctx[CpuRegister.Rdx];
+        var type = (uint)ctx[CpuRegister.R8];
+        var flags = (uint)ctx[CpuRegister.R9];
 
         TraceAgc(
-            $"agc.driver_register_resource handle={resourceHandle} owner={owner} " +
-            $"resource=0x{resourceAddress:X16} bytes=0x{resourceSize:X} " +
-            $"name={System.Text.Encoding.UTF8.GetString(nameBytes)} type={type} flags={flags}");
+            $"agc.driver_register_resource resource=0x{resourceAddress:X16} owner={owner} " +
+            $"name=0x{nameAddress:X16} type={type} flags={flags}");
 
         return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
-    [SysAbiExport(
-        Nid = "pWLG7WOpVcw",
-        ExportName = "sceAgcDriverUnregisterResource",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DriverUnregisterResource(CpuContext ctx)
-    {
-        var resourceHandle = (uint)ctx[CpuRegister.Rdi];
-        var state = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
-        lock (state.Gate)
-        {
-            if (!state.RegisteredResources.Remove(resourceHandle))
-            {
-                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            }
-        }
-
-        TraceAgc($"agc.driver_unregister_resource handle={resourceHandle}");
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
     [SysAbiExport(
     Nid = "-KRzWekV120",
     ExportName = "sceAgcDriverUnknown_KRzWekV120",
@@ -4501,7 +4250,7 @@ public static class AgcExports
         var localSizeZ = GetComputeLocalSize(state.ShRegisters, ComputeNumThreadZ);
         var gpuDispatch = false;
         var computeError = string.Empty;
-        if ((hasStorageBinding || evaluation.GlobalMemoryBindings.Count != 0) &&
+        if (hasStorageBinding &&
             (ulong)localSizeX * localSizeY * localSizeZ <= 1024)
         {
             var shaderKey = (
@@ -4571,8 +4320,7 @@ public static class AgcExports
                     $"groups={dispatch.GroupCountX}x{dispatch.GroupCountY}x{dispatch.GroupCountZ} " +
                     $"local={localSizeX}x{localSizeY}x{localSizeZ} " +
                     $"sys={DescribeComputeSystemRegisters(computeSystemRegisters)} " +
-                    $"gpu={gpuDispatch} blits={blitCount} " +
-                    $"globals={evaluation.GlobalMemoryBindings.Count}" +
+                    $"gpu={gpuDispatch} blits={blitCount}" +
                     (computeError.Length == 0 ? string.Empty : $" error={computeError}") +
                     $" bindings=[{string.Join(',', descriptions)}]");
             }

src/SharpEmu.Libs/Agc/Gen5ShaderTranslator.cs

@@ -621,8 +621,6 @@ internal static class Gen5ShaderTranslator
             0x10 => "SSendmsg",
             0x16 => "STtraceData",
             0x20 => "SInstPrefetch",
-            0x21 => "SClause",
-            0x23 => "SWaitcntDepctr",
             _ => string.Empty,
         };
 
@@ -720,7 +718,7 @@ internal static class Gen5ShaderTranslator
         }
 
         var src0 = word & 0x1FF;
-        sizeDwords = opcode is 0x20 or 0x21 or 0x2C or 0x2D || src0 is 0xF9 or 0xFA or 0xFF ? 2u : 1u;
+        sizeDwords = opcode is 0x20 or 0x21 || src0 is 0xF9 or 0xFA or 0xFF ? 2u : 1u;
         error = string.Empty;
         name = opcode switch
         {
@@ -759,9 +757,7 @@ internal static class Gen5ShaderTranslator
             0x28 => "VAddcU32",
             0x29 => "VSubbU32",
             0x2A => "VSubbrevU32",
-            0x2B => "VFmacF32",
-            0x2C => "VFmamkF32",
-            0x2D => "VFmaakF32",
+            0x2B => "VLdexpF32",
             0x2F => "VCvtPkrtzF16F32",
             0x30 => "VCvtPkU16U32",
             0x31 => "VCvtPkI16I32",
@@ -802,15 +798,8 @@ internal static class Gen5ShaderTranslator
             0x14 => "VCmpxGtF32",
             0x15 => "VCmpxLgF32",
             0x16 => "VCmpxGeF32",
-            0x17 => "VCmpxOF32",
-            0x18 => "VCmpxUF32",
-            0x19 => "VCmpxNgeF32",
-            0x1A => "VCmpxNlgF32",
-            0x1B => "VCmpxNgtF32",
-            0x1C => "VCmpxNleF32",
             0x1D => "VCmpxNeqF32",
             0x1E => "VCmpxNltF32",
-            0x1F => "VCmpxTruF32",
             0x80 => "VCmpFI32",
             0x81 => "VCmpLtI32",
             0x82 => "VCmpEqI32",
@@ -881,7 +870,6 @@ internal static class Gen5ShaderTranslator
             0x10F => "VMinF32",
             0x110 => "VMaxF32",
             0x11F => "VMacF32",
-            0x12B => "VFmacF32",
             0x12F => "VCvtPkrtzF16F32",
             0x141 => "VMadF32",
             0x143 => "VMadU32U24",
@@ -909,7 +897,6 @@ internal static class Gen5ShaderTranslator
             0x169 => "VMulLoU32",
             0x16A => "VMulHiU32",
             0x16B => "VMulLoI32",
-            0x16C => "VMulHiI32",
             0x360 => "VMadU32U16",
             0x361 => "VMulLoU32",
             0x362 => "VLdexpF32",
@@ -1392,7 +1379,7 @@ internal static class Gen5ShaderTranslator
                         Gen5Operand.Source(word & 0x1FF, literal),
                         Gen5Operand.Vector((word >> 9) & 0xFF),
                     ];
-                    if (opcode is "VMadMkF32" or "VFmamkF32" && literal.HasValue)
+                    if (opcode == "VMadMkF32" && literal.HasValue)
                     {
                         sources =
                         [
@@ -1401,7 +1388,7 @@ internal static class Gen5ShaderTranslator
                             sources[1],
                         ];
                     }
-                    else if (opcode is "VMadAkF32" or "VFmaakF32" && literal.HasValue)
+                    else if (opcode == "VMadAkF32" && literal.HasValue)
                     {
                         sources =
                         [

src/SharpEmu.Libs/Agc/Gen5SpirvTranslator.Alu.cs

@@ -255,8 +255,6 @@ internal static partial class Gen5SpirvTranslator
                 case "VFmaF32":
                 case "VMadMkF32":
                 case "VMadAkF32":
-                case "VFmamkF32":
-                case "VFmaakF32":
                     result = EmitFloatResult(
                         instruction,
                         Ext(
@@ -267,7 +265,6 @@ internal static partial class Gen5SpirvTranslator
                             GetFloatSource(instruction, 2)));
                     break;
                 case "VMacF32":
-                case "VFmacF32":
                 {
                     var addend = Bitcast(_floatType, LoadV(destination));
                     result = EmitFloatResult(
@@ -337,7 +334,6 @@ internal static partial class Gen5SpirvTranslator
                     result = EmitSubtractWithBorrow(instruction, reverse: true);
                     break;
                 case "VMulLoU32":
-                case "VMulLoI32":
                 case "VMulU32U24":
                     result = EmitIntegerBinary(instruction, SpirvOp.IMul);
                     break;
@@ -373,37 +369,6 @@ internal static partial class Gen5SpirvTranslator
                             _module.Constant64(_ulongType, 32)));
                     break;
                 }
-                case "VMulHiI32":
-                {
-                    var wideLeft = _module.AddInstruction(
-                        SpirvOp.SConvert,
-                        _longType,
-                        Bitcast(_intType, GetRawSource(instruction, 0)));
-                    var wideRight = _module.AddInstruction(
-                        SpirvOp.SConvert,
-                        _longType,
-                        Bitcast(_intType, GetRawSource(instruction, 1)));
-                    var product = _module.AddInstruction(
-                        SpirvOp.IMul,
-                        _longType,
-                        wideLeft,
-                        wideRight);
-                    result = _module.AddInstruction(
-                        SpirvOp.UConvert,
-                        _uintType,
-                        ShiftRightLogical64(
-                            Bitcast(_ulongType, product),
-                            _module.Constant64(_ulongType, 32)));
-                    break;
-                }
-                case "VBcntU32B32":
-                    result = IAdd(
-                        _module.AddInstruction(
-                            SpirvOp.BitCount,
-                            _uintType,
-                            GetRawSource(instruction, 0)),
-                        GetRawSource(instruction, 1));
-                    break;
                 case "VMadU32U24":
                 {
                     var left = BitwiseAnd(
@@ -601,18 +566,6 @@ internal static partial class Gen5SpirvTranslator
                         Ext(38, _uintType, high, right));
                     break;
                 }
-                case "VSadU32":
-                {
-                    var left = GetRawSource(instruction, 0);
-                    var right = GetRawSource(instruction, 1);
-                    var difference = _module.AddInstruction(
-                        SpirvOp.ISub,
-                        _uintType,
-                        Ext(41, _uintType, left, right),
-                        Ext(38, _uintType, left, right));
-                    result = IAdd(difference, GetRawSource(instruction, 2));
-                    break;
-                }
                 case "VMed3I32":
                 {
                     var left = Bitcast(_intType, GetRawSource(instruction, 0));
@@ -722,14 +675,6 @@ internal static partial class Gen5SpirvTranslator
                     result = Ext(58, _uintType, vector);
                     break;
                 }
-                case "VCvtPkU16U32":
-                case "VCvtPkI16I32":
-                    result = BitwiseOr(
-                        BitwiseAnd(GetRawSource(instruction, 0), UInt(0xFFFF)),
-                        ShiftLeftLogical(
-                            BitwiseAnd(GetRawSource(instruction, 1), UInt(0xFFFF)),
-                            UInt(16)));
-                    break;
                 default:
                     error = $"unsupported vector opcode {instruction.Opcode}";
                     return false;
@@ -861,25 +806,6 @@ internal static partial class Gen5SpirvTranslator
             {
                 condition = _module.ConstantBool(true);
             }
-            else if (opcode is "VCmpOF32" or "VCmpxOF32" or "VCmpUF32" or "VCmpxUF32")
-            {
-                // The ordered/unordered predicates only test whether either
-                // operand is NaN. SPIR-V's OpOrdered/OpUnordered are Kernel-only,
-                // so build the same result from OpIsNan, which needs no extra
-                // capability: unordered = isnan(a) || isnan(b), ordered = !that.
-                var left = GetFloatSource(instruction, 0);
-                var right = GetFloatSource(instruction, 1);
-                var nanLeft = _module.AddInstruction(SpirvOp.IsNan, _boolType, left);
-                var nanRight = _module.AddInstruction(SpirvOp.IsNan, _boolType, right);
-                var unordered = _module.AddInstruction(
-                    SpirvOp.LogicalOr,
-                    _boolType,
-                    nanLeft,
-                    nanRight);
-                condition = opcode is "VCmpUF32" or "VCmpxUF32"
-                    ? unordered
-                    : _module.AddInstruction(SpirvOp.LogicalNot, _boolType, unordered);
-            }
             else if (opcode is not ("VCmpClassF32" or "VCmpxClassF32") &&
                      opcode.EndsWith("F32", StringComparison.Ordinal))
             {
@@ -894,7 +820,6 @@ internal static partial class Gen5SpirvTranslator
                     "VCmpLgF32" or "VCmpxLgF32" => SpirvOp.FOrdNotEqual,
                     "VCmpGeF32" or "VCmpxGeF32" => SpirvOp.FOrdGreaterThanEqual,
                     "VCmpNeqF32" or "VCmpxNeqF32" => SpirvOp.FUnordNotEqual,
-                    "VCmpNlgF32" or "VCmpxNlgF32" => SpirvOp.FUnordEqual,
                     "VCmpNltF32" or "VCmpxNltF32" => SpirvOp.FUnordGreaterThanEqual,
                     "VCmpNleF32" or "VCmpxNleF32" => SpirvOp.FUnordGreaterThan,
                     "VCmpNgtF32" or "VCmpxNgtF32" => SpirvOp.FUnordLessThanEqual,
@@ -945,8 +870,7 @@ internal static partial class Gen5SpirvTranslator
                 condition = _module.AddInstruction(operation, _boolType, left, right);
             }
 
-            // On gfx10, VCmpx writes EXEC only and preserves VCC; the sdst
-            // operand was removed from the cmpx encodings on this generation.
+            StoreWaveMask(106, condition);
             if (opcode.StartsWith("VCmpx", StringComparison.Ordinal))
             {
                 var active = _module.AddInstruction(
@@ -956,10 +880,6 @@ internal static partial class Gen5SpirvTranslator
                     condition);
                 StoreWaveMask(126, active);
             }
-            else
-            {
-                StoreWaveMask(106, condition);
-            }
 
             return true;
         }
@@ -1189,52 +1109,6 @@ internal static partial class Gen5SpirvTranslator
                                 left,
                                 right);
                             break;
-                        case "SMulHiU32":
-                        {
-                            var wideLeft = _module.AddInstruction(
-                                SpirvOp.UConvert,
-                                _ulongType,
-                                left);
-                            var wideRight = _module.AddInstruction(
-                                SpirvOp.UConvert,
-                                _ulongType,
-                                right);
-                            var product = _module.AddInstruction(
-                                SpirvOp.IMul,
-                                _ulongType,
-                                wideLeft,
-                                wideRight);
-                            result = _module.AddInstruction(
-                                SpirvOp.UConvert,
-                                _uintType,
-                                ShiftRightLogical64(
-                                    product,
-                                    _module.Constant64(_ulongType, 32)));
-                            break;
-                        }
-                        case "SMulHiI32":
-                        {
-                            var wideLeft = _module.AddInstruction(
-                                SpirvOp.SConvert,
-                                _longType,
-                                Bitcast(_intType, left));
-                            var wideRight = _module.AddInstruction(
-                                SpirvOp.SConvert,
-                                _longType,
-                                Bitcast(_intType, right));
-                            var product = _module.AddInstruction(
-                                SpirvOp.IMul,
-                                _longType,
-                                wideLeft,
-                                wideRight);
-                            result = _module.AddInstruction(
-                                SpirvOp.UConvert,
-                                _uintType,
-                                ShiftRightLogical64(
-                                    Bitcast(_ulongType, product),
-                                    _module.Constant64(_ulongType, 32)));
-                            break;
-                        }
                         case "SAndB32":
                             result = BitwiseAnd(left, right);
                             Store(_scc, IsNotZero(result));
@@ -1356,43 +1230,6 @@ internal static partial class Gen5SpirvTranslator
                             Store(_scc, IsNotZero(result));
                             break;
                         }
-                        case "SAbsdiffI32":
-                        {
-                            var wideLeft = _module.AddInstruction(
-                                SpirvOp.SConvert,
-                                _longType,
-                                Bitcast(_intType, left));
-                            var wideRight = _module.AddInstruction(
-                                SpirvOp.SConvert,
-                                _longType,
-                                Bitcast(_intType, right));
-                            var difference = _module.AddInstruction(
-                                SpirvOp.ISub,
-                                _longType,
-                                wideLeft,
-                                wideRight);
-                            result = _module.AddInstruction(
-                                SpirvOp.UConvert,
-                                _uintType,
-                                Ext(5, _longType, difference));
-                            Store(_scc, IsNotZero(result));
-                            break;
-                        }
-                        case "SPackLlB32B16":
-                            result = BitwiseOr(
-                                BitwiseAnd(left, UInt(0xFFFF)),
-                                ShiftLeftLogical(right, UInt(16)));
-                            break;
-                        case "SPackLhB32B16":
-                            result = BitwiseOr(
-                                BitwiseAnd(left, UInt(0xFFFF)),
-                                BitwiseAnd(right, UInt(0xFFFF0000)));
-                            break;
-                        case "SPackHhB32B16":
-                            result = BitwiseOr(
-                                ShiftRightLogical(left, UInt(16)),
-                                BitwiseAnd(right, UInt(0xFFFF0000)));
-                            break;
                         case "SCselectB32":
                             result = _module.AddInstruction(
                                 SpirvOp.Select,

src/SharpEmu.Libs/Ajm/AjmExports.cs

@@ -1,37 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Ajm;
-
-public static class AjmExports
-{
-    private const int OrbisAjmErrorInvalidParameter = unchecked((int)0x80930005);
-    private static int _nextContextId;
-
-    [SysAbiExport(
-        Nid = "dl+4eHSzUu4",
-        ExportName = "sceAjmInitialize",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAjm")]
-    public static int Initialize(CpuContext ctx)
-    {
-        var reserved = ctx[CpuRegister.Rdi];
-        var outContextAddress = ctx[CpuRegister.Rsi];
-
-        // AJM requires a zero reserved argument.
-        if (reserved != 0 || outContextAddress == 0)
-        {
-            return ctx.SetReturn(OrbisAjmErrorInvalidParameter);
-        }
-
-        var contextId = unchecked((uint)Interlocked.Increment(ref _nextContextId));
-        if (!ctx.TryWriteUInt32(outContextAddress, contextId))
-        {
-            return ctx.SetReturn(OrbisAjmErrorInvalidParameter);
-        }
-
-        return ctx.SetReturn(0);
-    }
-}

src/SharpEmu.Libs/Audio/AudioOut2Exports.cs

@@ -202,7 +202,7 @@ public static class AudioOut2Exports
     {
         var userId = unchecked((int)ctx[CpuRegister.Rdi]);
         var outUserAddress = ctx[CpuRegister.Rsi];
-        if ((userId != 0 && userId != 1 && userId != 1000 && userId != 255) || outUserAddress == 0)
+        if ((userId != 0 && userId != 1 && userId != 255) || outUserAddress == 0)
         {
             return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
         }

src/SharpEmu.Libs/HostTimerResolution.cs

@@ -1,46 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace SharpEmu.Libs;
-
-public static class HostTimerResolution
-{
-    private const uint TargetPeriodMilliseconds = 1;
-
-    private static int _requested;
-
-    public static void Request()
-    {
-        if (Interlocked.Exchange(ref _requested, 1) != 0)
-        {
-            return;
-        }
-
-        if (!OperatingSystem.IsWindows())
-        {
-            return;
-        }
-
-        try
-        {
-            if (TimeBeginPeriod(TargetPeriodMilliseconds) != 0)
-            {
-                Console.Error.WriteLine(
-                    "[LOADER][WARN] Host timer resolution request rejected; " +
-                    "timed waits keep the default ~15.6 ms granularity.");
-            }
-        }
-        catch (DllNotFoundException exception)
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][WARN] Host timer resolution unavailable: {exception.Message}");
-        }
-    }
-
-    [SupportedOSPlatform("windows")]
-    [DllImport("winmm.dll", EntryPoint = "timeBeginPeriod", ExactSpelling = true)]
-    private static extern uint TimeBeginPeriod(uint uPeriod);
-}

src/SharpEmu.Libs/Json/JsonExports.cs

@@ -78,58 +78,6 @@ public static class JsonExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "WSOuge5IsCg",
-        ExportName = "_ZN3sce4Json14InitParameter2C1Ev",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceJson2")]
-    public static int InitParameter2Constructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        TraceJson("InitParameter2.ctor", thisAddress, ctx[CpuRegister.Rsi]);
-        ctx[CpuRegister.Rax] = thisAddress;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "I2QC8PYhJWY",
-        ExportName = "_ZN3sce4Json14InitParameter212setAllocatorEPNS0_12MemAllocatorEPv",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceJson2")]
-    public static int InitParameter2SetAllocator(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        TraceJson("InitParameter2.setAllocator", thisAddress, ctx[CpuRegister.Rsi]);
-        ctx[CpuRegister.Rax] = thisAddress;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "Eu95jmqn5Rw",
-        ExportName = "_ZN3sce4Json14InitParameter217setFileBufferSizeEm",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceJson2")]
-    public static int InitParameter2SetFileBufferSize(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        TraceJson("InitParameter2.setFileBufferSize", thisAddress, ctx[CpuRegister.Rsi]);
-        ctx[CpuRegister.Rax] = thisAddress;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "IXW-z8pggfg",
-        ExportName = "_ZN3sce4Json11Initializer10initializeEPKNS0_14InitParameter2E",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceJson2")]
-    public static int Initializer2Constructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        TraceJson("Initializer2.ctor", thisAddress, ctx[CpuRegister.Rsi]);
-        ctx[CpuRegister.Rax] = thisAddress;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     private static void TraceJson(string operation, ulong thisAddress, ulong argument)
     {
         if (!string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_JSON"), "1", StringComparison.Ordinal))

src/SharpEmu.Libs/Kernel/KernelAprCompatExports.cs

@@ -80,8 +80,14 @@ public static class KernelAprCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
 
-        // Completion output was written when the command was submitted.
-        TraceApr(ctx, "wait", submissionId, submission.CommandBuffer, waitArg1, waitArg2);
+        var resultAddress = ResolveWaitResultAddress(waitArg1, waitArg2, submission.ResultAddress);
+        if (resultAddress != 0 && !TryWriteAprResult(ctx, resultAddress))
+        {
+            TraceAprWaitFailure(ctx, "wait_result_fault", submissionId, submission.CommandBuffer, waitArg1, waitArg2);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
+        }
+
+        TraceApr(ctx, "wait", submissionId, submission.CommandBuffer, waitArg1, resultAddress);
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
@@ -163,6 +169,27 @@ public static class KernelAprCompatExports
         return ctx.Memory.TryWrite(resultAddress, result);
     }
 
+    private static ulong ResolveWaitResultAddress(ulong waitArg1, ulong waitArg2, ulong submittedResultAddress)
+    {
+        if (waitArg2 == 0)
+        {
+            return submittedResultAddress;
+        }
+
+        if (IsAmprCompletionToken(waitArg1) && waitArg2 <= 0xFFFF)
+        {
+            return submittedResultAddress;
+        }
+
+        return waitArg2;
+    }
+
+    private static bool IsAmprCompletionToken(ulong value)
+    {
+        var tag = value >> 56;
+        return tag is 0x0C or 0x10;
+    }
+
     private static void TraceApr(
         CpuContext ctx,
         string operation,

src/SharpEmu.Libs/Kernel/KernelEventQueueCompatExports.cs

@@ -11,7 +11,6 @@ public static class KernelEventQueueCompatExports
 {
     private const int KernelEventSize = 0x20;
     public const short KernelEventFilterGraphics = -14;
-    public const short KernelEventFilterUser = -11;
     public const short KernelEventFilterAmpr = -16;
     public const short KernelEventFilterAmprSystem = -17;
 
@@ -90,16 +89,8 @@ public static class KernelEventQueueCompatExports
         LibraryName = "libKernel")]
     public static int KernelAddUserEventEdge(CpuContext ctx)
     {
-        var handle = ctx[CpuRegister.Rdi];
-        var registered = RegisterEvent(
-            handle,
-            ctx[CpuRegister.Rsi],
-            KernelEventFilterUser,
-            0);
-        TraceEventQueue(ctx, "add_user_edge", handle);
-        return registered
-            ? (int)OrbisGen2Result.ORBIS_GEN2_OK
-            : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
+        TraceEventQueue(ctx, "add_user_edge", ctx[CpuRegister.Rdi]);
+        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
     [SysAbiExport(
@@ -109,16 +100,8 @@ public static class KernelEventQueueCompatExports
         LibraryName = "libKernel")]
     public static int KernelAddUserEvent(CpuContext ctx)
     {
-        var handle = ctx[CpuRegister.Rdi];
-        var registered = RegisterEvent(
-            handle,
-            ctx[CpuRegister.Rsi],
-            KernelEventFilterUser,
-            0);
-        TraceEventQueue(ctx, "add_user", handle);
-        return registered
-            ? (int)OrbisGen2Result.ORBIS_GEN2_OK
-            : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
+        TraceEventQueue(ctx, "add_user", ctx[CpuRegister.Rdi]);
+        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
     [SysAbiExport(
@@ -128,15 +111,8 @@ public static class KernelEventQueueCompatExports
         LibraryName = "libKernel")]
     public static int KernelDeleteUserEvent(CpuContext ctx)
     {
-        var handle = ctx[CpuRegister.Rdi];
-        var deleted = DeleteRegisteredEvent(
-            handle,
-            ctx[CpuRegister.Rsi],
-            KernelEventFilterUser);
-        TraceEventQueue(ctx, "delete_user", handle);
-        return deleted
-            ? (int)OrbisGen2Result.ORBIS_GEN2_OK
-            : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
+        TraceEventQueue(ctx, "delete_user", ctx[CpuRegister.Rdi]);
+        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
     [SysAbiExport(
@@ -146,18 +122,8 @@ public static class KernelEventQueueCompatExports
         LibraryName = "libKernel")]
     public static int KernelTriggerUserEvent(CpuContext ctx)
     {
-        var handle = ctx[CpuRegister.Rdi];
-        var triggered = TriggerRegisteredEvent(
-            handle,
-            ctx[CpuRegister.Rsi],
-            KernelEventFilterUser,
-            flags: 0x21,
-            fflags: 0,
-            data: ctx[CpuRegister.Rdx]);
-        TraceEventQueue(ctx, "trigger_user", handle);
-        return triggered
-            ? (int)OrbisGen2Result.ORBIS_GEN2_OK
-            : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
+        TraceEventQueue(ctx, "trigger_user", ctx[CpuRegister.Rdi]);
+        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
     [SysAbiExport(
@@ -509,43 +475,6 @@ public static class KernelEventQueueCompatExports
         return triggeredCount;
     }
 
-    private static bool TriggerRegisteredEvent(
-        ulong handle,
-        ulong ident,
-        short filter,
-        ushort flags,
-        uint fflags,
-        ulong data)
-    {
-        lock (_eventQueueGate)
-        {
-            if (!_registeredEvents.TryGetValue(handle, out var registrations) ||
-                !registrations.TryGetValue((ident, filter), out var registration))
-            {
-                return false;
-            }
-
-            if (!_pendingEvents.TryGetValue(handle, out var queue))
-            {
-                queue = new LinkedList<KernelQueuedEvent>();
-                _pendingEvents[handle] = queue;
-            }
-
-            QueueOrUpdateEvent(
-                queue,
-                new KernelQueuedEvent(
-                    registration.Ident,
-                    registration.Filter,
-                    flags,
-                    fflags,
-                    data,
-                    registration.UserData));
-        }
-
-        WakeEventQueue(handle);
-        return true;
-    }
-
     public static bool TriggerDisplayEvent(
         ulong handle,
         ulong ident,
@@ -727,6 +656,6 @@ public static class KernelEventQueueCompatExports
 
         _ = ctx.TryReadUInt64(ctx[CpuRegister.Rsp], out ulong returnRip);
         Console.Error.WriteLine(
-            $"[LOADER][TRACE] equeue.{operation}: thread=0x{KernelPthreadState.GetCurrentThreadHandle():X16} handle=0x{handle:X16} rsi=0x{ctx[CpuRegister.Rsi]:X16} rdx=0x{ctx[CpuRegister.Rdx]:X16} ret=0x{returnRip:X16}");
+            $"[LOADER][TRACE] equeue.{operation}: handle=0x{handle:X16} rsi=0x{ctx[CpuRegister.Rsi]:X16} rdx=0x{ctx[CpuRegister.Rdx]:X16} ret=0x{returnRip:X16}");
     }
 }

src/SharpEmu.Libs/Kernel/KernelExports.cs

@@ -461,10 +461,66 @@ public static class KernelExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
+    // Unidentified kernel NIDs observed at runtime; stubbed to return 0 until they are
+    // resolved against scripts/ps5_names.txt.
+    [SysAbiExport(
+        Nid = "9T2pDF2Ryqg",
+        ExportName = "sceKernelUnknown9T2p",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknown9T2p(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "TU-d9PfIHPM",
+        ExportName = "sceKernelUnknownTU",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknownTU(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "iWQWrwiSt8A",
+        ExportName = "sceKernelUnknowniWQW",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknowniWQW(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "KuOmgKoqCdY",
+        ExportName = "sceKernelUnknownKuOmg",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknownKuOmg(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "RenI1lL1WFk",
+        ExportName = "sceKernelUnknownRenI",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknownRenI(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "pQGpHYopAIY",
+        ExportName = "sceKernelUnknownpQGp",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknownpQGp(CpuContext ctx) => SetZeroReturn(ctx);
+
+    [SysAbiExport(
+        Nid = "Rbvt+5Y2iEw",
+        ExportName = "sceKernelUnknownRbvt",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int KernelUnknownRbvt(CpuContext ctx) => SetZeroReturn(ctx);
+
     // NOTE: "SHtAad20YYM"/"DIxvoy7Ngvk" are sce::Json::Value::getType/getInteger, and
     // "3GPpjQdAMTw"/"9rAeANT2tyE"/"tsvEmnenz48" are __cxa_guard_acquire/__cxa_guard_release/
     // __cxa_atexit (verified by hashing against scripts/ps5_names.txt). Do not register them
     // here as kernel mutex functions: the cxa guards are implemented in CxxAbiExports.cs and
     // shadowing them breaks every C++ static-init guard in the game.
 
+    private static int SetZeroReturn(CpuContext ctx)
+    {
+        ctx[CpuRegister.Rax] = 0;
+        return 0;
+    }
 }

src/SharpEmu.Libs/Kernel/KernelMemoryCompatExports.cs

@@ -110,15 +110,6 @@ public static class KernelMemoryCompatExports
     private static readonly HashSet<string> _negativeStatCache = new(StringComparer.OrdinalIgnoreCase);
     private static readonly ConcurrentDictionary<string, ulong> _aprFileSizeCache = new(StringComparer.OrdinalIgnoreCase);
     private static long _nextFileDescriptor = 2;
-
-    internal static int AllocateGuestFileDescriptor()
-    {
-        lock (_fdGate)
-        {
-            return (int)Interlocked.Increment(ref _nextFileDescriptor);
-        }
-    }
-
     private static ulong _nextPhysicalAddress;
     private static ulong _nextVirtualAddress;
     private static ulong _mainDirectMemoryPoolBase = UnsetMainDirectMemoryPoolBase;
@@ -478,7 +469,7 @@ public static class KernelMemoryCompatExports
 
     [SysAbiExport(
         Nid = "LHMrG7e8G78",
-        ExportName = "wcsmisc",
+        ExportName = "wcslen",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libc")]
     public static int Wcslen(CpuContext ctx)
@@ -1488,214 +1479,6 @@ public static class KernelMemoryCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "ob5xAW4ln-0",
-        ExportName = "strchr",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Strchr(CpuContext ctx)
-    {
-        var address = ctx[CpuRegister.Rdi];
-        var needle = unchecked((byte)ctx[CpuRegister.Rsi]);
-        if (address == 0)
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        // The terminator counts as part of the scanned range, so strchr(s, '\0')
-        // returns a pointer to the string's null byte just like a native libc.
-        Span<byte> current = stackalloc byte[1];
-        for (ulong index = 0; index < 1_048_576; index++)
-        {
-            if (!TryReadCompat(ctx, address + index, current))
-            {
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-
-            if (current[0] == needle)
-            {
-                ctx[CpuRegister.Rax] = address + index;
-                return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-            }
-
-            if (current[0] == 0)
-            {
-                break;
-            }
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "9yDWMxEFdJU",
-        ExportName = "strrchr",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Strrchr(CpuContext ctx)
-    {
-        var address = ctx[CpuRegister.Rdi];
-        var needle = unchecked((byte)ctx[CpuRegister.Rsi]);
-        if (address == 0)
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ulong match = 0;
-        var found = false;
-        Span<byte> current = stackalloc byte[1];
-        for (ulong index = 0; index < 1_048_576; index++)
-        {
-            if (!TryReadCompat(ctx, address + index, current))
-            {
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-
-            if (current[0] == needle)
-            {
-                match = address + index;
-                found = true;
-            }
-
-            if (current[0] == 0)
-            {
-                break;
-            }
-        }
-
-        ctx[CpuRegister.Rax] = found ? match : 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "8u8lPzUEq+U",
-        ExportName = "memchr",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Memchr(CpuContext ctx)
-    {
-        var address = ctx[CpuRegister.Rdi];
-        var needle = unchecked((byte)ctx[CpuRegister.Rsi]);
-        var count = ctx[CpuRegister.Rdx];
-
-        Span<byte> current = stackalloc byte[1];
-        for (ulong index = 0; index < count; index++)
-        {
-            if (!TryReadCompat(ctx, address + index, current))
-            {
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-
-            if (current[0] == needle)
-            {
-                ctx[CpuRegister.Rax] = address + index;
-                return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-            }
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "Ls4tzzhimqQ",
-        ExportName = "strcat",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Strcat(CpuContext ctx)
-    {
-        var destination = ctx[CpuRegister.Rdi];
-        var source = ctx[CpuRegister.Rsi];
-        if (!TryReadCString(ctx, source, 1_048_576, out var sourceBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryReadCString(ctx, destination, 1_048_576, out var destinationBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        // Overwrite the destination terminator and re-terminate after the copied bytes.
-        var appendAddress = destination + (ulong)destinationBytes.Length;
-        var payload = new byte[sourceBytes.Length + 1];
-        sourceBytes.CopyTo(payload.AsSpan());
-        if (!TryWriteCompat(ctx, appendAddress, payload))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ctx[CpuRegister.Rax] = destination;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "kHg45qPC6f0",
-        ExportName = "strncat",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Strncat(CpuContext ctx)
-    {
-        var destination = ctx[CpuRegister.Rdi];
-        var source = ctx[CpuRegister.Rsi];
-        var limit = ctx[CpuRegister.Rdx];
-
-        // Bounding the source read by the count yields strncat's "at most n bytes"
-        // semantics while still stopping early at the source terminator.
-        if (!TryReadCString(ctx, source, limit, out var sourceBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryReadCString(ctx, destination, 1_048_576, out var destinationBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var appendAddress = destination + (ulong)destinationBytes.Length;
-        var payload = new byte[sourceBytes.Length + 1];
-        sourceBytes.CopyTo(payload.AsSpan());
-        if (!TryWriteCompat(ctx, appendAddress, payload))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ctx[CpuRegister.Rax] = destination;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "viiwFMaNamA",
-        ExportName = "strstr",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Strstr(CpuContext ctx)
-    {
-        var haystack = ctx[CpuRegister.Rdi];
-        var needle = ctx[CpuRegister.Rsi];
-        if (!TryReadCString(ctx, haystack, 1_048_576, out var haystackBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryReadCString(ctx, needle, 1_048_576, out var needleBytes))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        // An empty needle matches at the start of the haystack.
-        if (needleBytes.Length == 0)
-        {
-            ctx[CpuRegister.Rax] = haystack;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        var matchIndex = haystackBytes.AsSpan().IndexOf(needleBytes.AsSpan());
-        ctx[CpuRegister.Rax] = matchIndex >= 0 ? haystack + (ulong)matchIndex : 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "QrZZdJ8XsX0",
         ExportName = "fputs",
@@ -1772,10 +1555,9 @@ public static class KernelMemoryCompatExports
                     return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
                 }
 
-                int directoryFd;
+                var directoryFd = (int)Interlocked.Increment(ref _nextFileDescriptor);
                 lock (_fdGate)
                 {
-                    directoryFd = AllocateGuestFileDescriptor();
                     _openDirectories[directoryFd] = new OpenDirectory
                     {
                         Path = hostPath,
@@ -1796,10 +1578,9 @@ public static class KernelMemoryCompatExports
                 stream.Seek(0, SeekOrigin.End);
             }
 
-            int fd;
+            var fd = (int)Interlocked.Increment(ref _nextFileDescriptor);
             lock (_fdGate)
             {
-                fd = AllocateGuestFileDescriptor();
                 _openFiles[fd] = stream;
             }
 
@@ -1891,30 +1672,6 @@ public static class KernelMemoryCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "E6ao34wPw+U",
-        ExportName = "stat",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int PosixStat(CpuContext ctx)
-    {
-        var result = KernelStat(ctx);
-        if (result == (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return 0;
-        }
-
-        var errno = result switch
-        {
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT => Einval,
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT => Efault,
-            _ => 2,
-        };
-        KernelRuntimeCompatExports.TrySetErrno(ctx, errno);
-        ctx[CpuRegister.Rax] = ulong.MaxValue;
-        return -1;
-    }
-
     [SysAbiExport(
         Nid = "gEpBkcwxUjw",
         ExportName = "sceKernelAprResolveFilepathsToIdsAndFileSizes",
@@ -2196,12 +1953,6 @@ public static class KernelMemoryCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_OK;
         }
 
-        if (KernelSocketCompatExports.TryCloseSocketFd(fd))
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
         FileStream? stream;
         lock (_fdGate)
         {
@@ -2245,17 +1996,6 @@ public static class KernelMemoryCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_OK;
         }
 
-        if (KernelSocketCompatExports.TryReadSocketFd(ctx, fd, bufferAddress, requested, out var socketBytesRead, out var socketError))
-        {
-            if (socketError != OrbisGen2Result.ORBIS_GEN2_OK)
-            {
-                return (int)socketError;
-            }
-
-            ctx[CpuRegister.Rax] = socketBytesRead;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
         FileStream? stream;
         lock (_fdGate)
         {
@@ -2485,17 +2225,6 @@ public static class KernelMemoryCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_OK;
         }
 
-        if (KernelSocketCompatExports.TryWriteSocketFd(ctx, fd, payload, out var socketError))
-        {
-            if (socketError != OrbisGen2Result.ORBIS_GEN2_OK)
-            {
-                return (int)socketError;
-            }
-
-            ctx[CpuRegister.Rax] = unchecked((ulong)requested);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
         FileStream? stream;
         lock (_fdGate)
         {
@@ -3245,7 +2974,7 @@ public static class KernelMemoryCompatExports
 
     [SysAbiExport(
         Nid = "4h6F1LLbTiw",
-        ExportName = "sceKernelMapNamedFlexibleMemoryInternal",
+        ExportName = "sceKernelMapFlexibleMemoryInternal",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
     public static int KernelMapFlexibleMemoryInternal(CpuContext ctx)
@@ -3712,18 +3441,6 @@ public static class KernelMemoryCompatExports
         return true;
     }
 
-    internal static bool TryFormatStringFromVaList(CpuContext ctx, string format, ulong vaListAddress, out string rendered)
-    {
-        if (!TryCreateVaListCursor(ctx, vaListAddress, out var vaCursor))
-        {
-            rendered = format;
-            return false;
-        }
-
-        rendered = FormatString(ctx, format, ref vaCursor);
-        return true;
-    }
-
     private static int WriteSnprintfOutput(
         CpuContext ctx,
         ulong destination,
@@ -4197,7 +3914,7 @@ public static class KernelMemoryCompatExports
                             _ => unchecked((int)argumentSource.NextGpArg())
                         };
 
-                        var formatted = value.ToString(CultureInfo.InvariantCulture);
+                        var formatted = value.ToString();
                         if (showSign && value >= 0)
                             formatted = "+" + formatted;
                         else if (spaceForSign && value >= 0)
@@ -4221,7 +3938,7 @@ public static class KernelMemoryCompatExports
                             _ => (uint)argumentSource.NextGpArg()
                         };
 
-                        var formatted = value.ToString(CultureInfo.InvariantCulture);
+                        var formatted = value.ToString();
                         sb.Append(PadString(formatted, width, leftAlign, padWithZero && !leftAlign));
                     }
                     break;
@@ -4242,8 +3959,8 @@ public static class KernelMemoryCompatExports
                         };
 
                         var formatted = specifier == 'x'
-                            ? value.ToString("x", CultureInfo.InvariantCulture)
-                            : value.ToString("X", CultureInfo.InvariantCulture);
+                            ? value.ToString("x")
+                            : value.ToString("X");
 
                         if (alternateForm && value != 0)
                             formatted = specifier == 'x' ? "0x" + formatted : "0X" + formatted;
@@ -4351,10 +4068,7 @@ public static class KernelMemoryCompatExports
                         var formatStr = precision >= 0
                             ? $"{{0:{specifier}{precision}}}"
                             : $"{{0:{specifier}}}";
-                        var formatted = string.Format(
-                            CultureInfo.InvariantCulture,
-                            formatStr,
-                            value);
+                        var formatted = string.Format(formatStr, value);
 
                         if (showSign && value >= 0)
                             formatted = "+" + formatted;

src/SharpEmu.Libs/Kernel/KernelPthreadCompatExports.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Concurrent;
 using SharpEmu.HLE;
-using SharpEmu.Libs.Fiber;
 using System.Diagnostics.CodeAnalysis;
 
 namespace SharpEmu.Libs.Kernel;
@@ -25,8 +24,6 @@ public static class KernelPthreadCompatExports
 
     private static readonly object _stateGate = new();
     private static readonly ConcurrentDictionary<ulong, PthreadMutexState> _mutexStates = new();
-    private static readonly ConcurrentDictionary<ulong, string> _mutexWakeKeys = new();
-    private static readonly ConcurrentDictionary<ulong, string> _condWakeKeys = new();
     private static readonly Dictionary<ulong, PthreadMutexAttrState> _mutexAttrStates = new();
     private static readonly Dictionary<ulong, PthreadCondState> _condStates = new();
     private static readonly Dictionary<ulong, object> _onceGates = new();
@@ -38,15 +35,6 @@ public static class KernelPthreadCompatExports
         string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_PTHREAD_CONDS"), "1", StringComparison.Ordinal);
     private static readonly HashSet<ulong>? _tracePthreadMutexFilter = ParseTraceAddressFilter(
         Environment.GetEnvironmentVariable("SHARPEMU_LOG_PTHREAD_MUTEX_FILTER"));
-    private static readonly bool _enableMutexLockBlocking =
-        string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_MUTEX_LOCK_BLOCKING"), "1", StringComparison.Ordinal);
-
-    // On the outer class deliberately: a static on the nested state classes gives them a
-    // type initializer that first runs on a guest thread and fail-fasts the CLR.
-    private static long _nextMutexWakeId;
-    private static long _nextCondWakeId;
-    private static readonly ConcurrentDictionary<ulong, long> _posixTimedWaitCounts = new();
-    private static readonly ConcurrentDictionary<ulong, byte> _reportedContendedMutexes = new();
 
     private sealed class PthreadMutexState
     {
@@ -55,10 +43,6 @@ public static class KernelPthreadCompatExports
         public int RecursionCount { get; set; }
         public int Type { get; set; } = MutexTypeErrorCheck;
         public int Protocol { get; set; }
-
-        // Keyed on state identity, not the resolved address (which can differ between a
-        // lock and its unlock for the same state, stranding the waiter).
-        public string WakeKey { get; } = "pthread_mutex#" + Interlocked.Increment(ref _nextMutexWakeId).ToString("X");
     }
 
     private sealed class PthreadMutexWaiter
@@ -72,23 +56,6 @@ public static class KernelPthreadCompatExports
         public object SyncRoot { get; } = new();
         public ulong SignalEpoch { get; set; }
         public int Waiters { get; set; }
-
-        // See PthreadMutexState.WakeKey.
-        public string WakeKey { get; } = "pthread_cond#" + Interlocked.Increment(ref _nextCondWakeId).ToString("X");
-
-        // A signal with no waiter stays pending; the guest often signals before the wait.
-        public int PendingSignals { get; set; }
-
-        public bool TryConsumePendingSignal()
-        {
-            if (PendingSignals <= 0)
-            {
-                return false;
-            }
-
-            PendingSignals--;
-            return true;
-        }
     }
 
     private readonly record struct PthreadMutexAttrState(int Type, int Protocol);
@@ -140,32 +107,11 @@ public static class KernelPthreadCompatExports
         LibraryName = "libKernel")]
     public static int PthreadYield(CpuContext ctx)
     {
-        GuestThreadExecution.Scheduler?.Pump(ctx, "scePthreadYield");
+        _ = ctx;
         Thread.Yield();
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "GBUY7ywdULE",
-        ExportName = "scePthreadRename",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int PthreadRename(CpuContext ctx)
-    {
-        if (_tracePthreads)
-        {
-            var nameAddress = ctx[CpuRegister.Rsi];
-            var name = nameAddress != 0 &&
-                KernelMemoryCompatExports.TryReadNullTerminatedUtf8(ctx, nameAddress, 64, out var value)
-                    ? value
-                    : "<unreadable>";
-            Console.Error.WriteLine(
-                $"[LOADER][TRACE] pthread.rename thread=0x{ctx[CpuRegister.Rdi]:X16} name=\"{name}\"");
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "EI-5-jlq2dE",
         ExportName = "scePthreadGetthreadid",
@@ -347,104 +293,6 @@ public static class KernelPthreadCompatExports
         LibraryName = "libKernel")]
     public static int PthreadCondTimedwait(CpuContext ctx) => PthreadCondWaitCore(ctx, ctx[CpuRegister.Rdi], ctx[CpuRegister.Rsi], timed: true, timeoutUsec: unchecked((uint)ctx[CpuRegister.Rdx]));
 
-    [SysAbiExport(
-        Nid = "27bAgiJmOh0",
-        ExportName = "pthread_cond_timedwait",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int PosixPthreadCondTimedwait(CpuContext ctx)
-    {
-        var absoluteTimeAddress = ctx[CpuRegister.Rdx];
-        if (absoluteTimeAddress == 0 ||
-            !ctx.TryReadUInt64(absoluteTimeAddress, out var secondsRaw) ||
-            !ctx.TryReadUInt64(absoluteTimeAddress + sizeof(ulong), out var nanosecondsRaw))
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        var deadlineSeconds = unchecked((long)secondsRaw);
-        var deadlineNanoseconds = unchecked((long)nanosecondsRaw);
-        if (deadlineSeconds < 0 || deadlineNanoseconds is < 0 or >= 1_000_000_000)
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        long nowSeconds;
-        long nowNanoseconds;
-        if (deadlineSeconds >= 1_000_000_000)
-        {
-            var now = DateTimeOffset.UtcNow;
-            nowSeconds = now.ToUnixTimeSeconds();
-            nowNanoseconds = (now.Ticks % TimeSpan.TicksPerSecond) * 100;
-        }
-        else
-        {
-            // Engine condition variables use monotonic deadlines.
-            KernelRuntimeCompatExports.GetProcessMonotonicTime(out nowSeconds, out nowNanoseconds);
-        }
-
-        var remainingNanoseconds =
-            ((Int128)deadlineSeconds * 1_000_000_000 + deadlineNanoseconds) -
-            ((Int128)nowSeconds * 1_000_000_000 + nowNanoseconds);
-        var timeoutUsec = remainingNanoseconds <= 0
-            ? 0u
-            : (uint)Int128.Min(uint.MaxValue, (remainingNanoseconds + 999) / 1_000);
-
-        TracePosixTimedWait(
-            ctx,
-            deadlineSeconds,
-            deadlineNanoseconds,
-            nowSeconds,
-            nowNanoseconds,
-            remainingNanoseconds,
-            timeoutUsec);
-
-        return PthreadCondWaitCore(
-            ctx,
-            ctx[CpuRegister.Rdi],
-            ctx[CpuRegister.Rsi],
-            timed: true,
-            timeoutUsec,
-            posixResult: true);
-    }
-
-    private static void TracePosixTimedWait(
-        CpuContext ctx,
-        long deadlineSeconds,
-        long deadlineNanoseconds,
-        long nowSeconds,
-        long nowNanoseconds,
-        Int128 remainingNanoseconds,
-        uint timeoutUsec)
-    {
-        var condAddress = ctx[CpuRegister.Rdi];
-        var count = _posixTimedWaitCounts.AddOrUpdate(condAddress, 1, static (_, current) => current + 1);
-        if (count != 1 && count % 1_000_000 != 0)
-        {
-            return;
-        }
-
-        _ = ctx.TryReadUInt64(ctx[CpuRegister.Rsp], out var returnRip);
-        Console.Error.WriteLine(
-            $"[LOADER][DIAG] pthread_cond_timedwait#{count}: thread=0x{KernelPthreadState.GetCurrentThreadHandle():X16} " +
-            $"cond=0x{condAddress:X16} mutex=0x{ctx[CpuRegister.Rsi]:X16} abstime=0x{ctx[CpuRegister.Rdx]:X16} " +
-            $"deadline={deadlineSeconds}.{deadlineNanoseconds:D9} now={nowSeconds}.{nowNanoseconds:D9} " +
-            $"remaining_ns={remainingNanoseconds} timeout_us={timeoutUsec} ret=0x{returnRip:X16}");
-
-        if (GuestThreadExecution.Scheduler is not { } scheduler)
-        {
-            return;
-        }
-
-        foreach (var snapshot in scheduler.SnapshotThreads())
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][DIAG] guest_thread handle=0x{snapshot.ThreadHandle:X16} name='{snapshot.Name}' " +
-                $"state={snapshot.State} imports={snapshot.ImportCount} nid={snapshot.LastImportNid ?? "none"} " +
-                $"ret=0x{snapshot.LastReturnRip:X16} block={snapshot.BlockReason ?? "none"}");
-        }
-    }
-
     [SysAbiExport(
         Nid = "kDh-NfxgMtE",
         ExportName = "scePthreadCondSignal",
@@ -479,6 +327,12 @@ public static class KernelPthreadCompatExports
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
     public static int PosixPthreadCondSignal(CpuContext ctx) => PthreadCondSignalCore(ctx, ctx[CpuRegister.Rdi], broadcast: false);
+    [SysAbiExport(
+        Nid = "27bAgiJmOh0",
+        ExportName = "pthread_cond_timedwait",
+        Target = Generation.Gen4 | Generation.Gen5,
+        LibraryName = "libKernel")]
+    public static int PosixPthreadCondTimedwait(CpuContext ctx) => PthreadCondWaitCore(ctx, ctx[CpuRegister.Rdi], ctx[CpuRegister.Rsi], timed: true, timeoutUsec: unchecked((uint)ctx[CpuRegister.Rdx]));
 
     [SysAbiExport(
         Nid = "m5-2bsNfv7s",
@@ -705,43 +559,42 @@ public static class KernelPthreadCompatExports
                         return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY;
                     }
 
+                    // Normal/adaptive mutexes do not report EDEADLK on self-lock.
+                    // Under the current single-host-thread guest execution model,
+                    // treating them as nested ownership keeps init paths moving
+                    // without turning a would-block path into a hard error.
                     state.RecursionCount++;
                     TracePthreadMutex(ctx, "lock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_OK);
                     return (int)OrbisGen2Result.ORBIS_GEN2_OK;
                 }
-                else
-                {
-                    var ownedResult = tryOnly
-                        ? (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY
-                        : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DEADLOCK;
-                    TracePthreadMutex(ctx, tryOnly ? "trylock" : "lock", mutexAddress, resolvedAddress, state, currentThreadId, ownedResult);
-                    return ownedResult;
-                }
+
+                var ownedResult = tryOnly
+                    ? (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY
+                    : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DEADLOCK;
+                TracePthreadMutex(ctx, tryOnly ? "trylock" : "lock", mutexAddress, resolvedAddress, state, currentThreadId, ownedResult);
+                return ownedResult;
             }
         }
 
         var acquired = state.Semaphore.Wait(0);
         if (!acquired)
         {
-            TraceContendedMutex(ctx, mutexAddress, resolvedAddress, state, currentThreadId);
-            var waiter = new PthreadMutexWaiter { ThreadId = currentThreadId };
-            // Fibers retain the synchronous fallback to preserve switch state.
-            var currentFiber = FiberExports.GetCurrentFiberAddressForDiagnostics(ctx);
-            var canCooperativelyBlock = _enableMutexLockBlocking || currentFiber == 0;
-            if (canCooperativelyBlock &&
-                !tryOnly &&
+            // Guest-thread blocking for pthread_mutex_lock is currently disabled.
+            // Demon's Souls deadlocks during PS5SyncEvent initialization.
+            /* var waiter = new PthreadMutexWaiter { ThreadId = currentThreadId };
+            if (!tryOnly &&
                 GuestThreadExecution.IsGuestThread &&
                 GuestThreadExecution.TryGetCurrentImportCallFrame(out _) &&
                 GuestThreadExecution.RequestCurrentThreadBlock(
                     ctx,
                     "pthread_mutex_lock",
-                    state.WakeKey,
+                    GetMutexWakeKey(resolvedAddress),
                     () => CompleteBlockedMutexLock(ctx, mutexAddress, resolvedAddress, state, waiter),
                     () => TryReserveBlockedMutexLock(ctx, mutexAddress, resolvedAddress, state, waiter)))
             {
                 TracePthreadMutex(ctx, "lock-block", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_OK);
                 return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-            }
+            } */
 
             if (!tryOnly)
             {
@@ -758,7 +611,6 @@ public static class KernelPthreadCompatExports
 
         lock (state)
         {
-            DetectMutexDoubleOwner(resolvedAddress, state, currentThreadId, "lock");
             state.OwnerThreadId = currentThreadId;
             state.RecursionCount = 1;
         }
@@ -767,53 +619,6 @@ public static class KernelPthreadCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static void TraceContendedMutex(
-        CpuContext ctx,
-        ulong mutexAddress,
-        ulong resolvedAddress,
-        PthreadMutexState state,
-        ulong currentThreadId)
-    {
-        if (!_reportedContendedMutexes.TryAdd(resolvedAddress, 0))
-        {
-            return;
-        }
-
-        ulong ownerThreadId;
-        int recursionCount;
-        int type;
-        lock (state)
-        {
-            ownerThreadId = state.OwnerThreadId;
-            recursionCount = state.RecursionCount;
-            type = state.Type;
-        }
-
-        _ = ctx.TryReadUInt64(ctx[CpuRegister.Rsp], out var returnRip);
-        Console.Error.WriteLine(
-            $"[LOADER][DIAG] pthread_mutex_contended: waiter=0x{currentThreadId:X16} owner=0x{ownerThreadId:X16} " +
-            $"mutex=0x{mutexAddress:X16} resolved=0x{resolvedAddress:X16} recursion={recursionCount} " +
-            $"type={type} semaphore_count={state.Semaphore.CurrentCount} ret=0x{returnRip:X16}");
-
-        if (GuestThreadExecution.Scheduler is not { } scheduler)
-        {
-            return;
-        }
-
-        foreach (var snapshot in scheduler.SnapshotThreads())
-        {
-            if (snapshot.ThreadHandle != currentThreadId && snapshot.ThreadHandle != ownerThreadId)
-            {
-                continue;
-            }
-
-            Console.Error.WriteLine(
-                $"[LOADER][DIAG] pthread_mutex_party handle=0x{snapshot.ThreadHandle:X16} name='{snapshot.Name}' " +
-                $"state={snapshot.State} imports={snapshot.ImportCount} nid={snapshot.LastImportNid ?? "none"} " +
-                $"ret=0x{snapshot.LastReturnRip:X16} block={snapshot.BlockReason ?? "none"}");
-        }
-    }
-
     private static int PthreadMutexUnlockCore(CpuContext ctx, ulong mutexAddress, bool requireOwner)
     {
         if (mutexAddress == 0)
@@ -828,24 +633,16 @@ public static class KernelPthreadCompatExports
         }
 
         var currentThreadId = KernelPthreadState.GetCurrentThreadHandle();
-        var lenientOwnership = state.Type is MutexTypeNormal or MutexTypeAdaptiveNp;
-
         var shouldRelease = false;
         lock (state)
         {
             if (state.RecursionCount <= 0)
             {
-                if (lenientOwnership)
-                {
-                    TracePthreadMutex(ctx, "unlock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_OK);
-                    return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                }
-
                 TracePthreadMutex(ctx, "unlock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
                 return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
             }
 
-            if (requireOwner && !lenientOwnership && state.OwnerThreadId != currentThreadId)
+            if (requireOwner && state.OwnerThreadId != currentThreadId)
             {
                 TracePthreadMutex(ctx, "unlock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED);
                 return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED;
@@ -864,15 +661,12 @@ public static class KernelPthreadCompatExports
             try
             {
                 state.Semaphore.Release();
-                _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(state.WakeKey, 1);
+                _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(GetMutexWakeKey(resolvedAddress), 1);
             }
             catch (SemaphoreFullException)
             {
-                if (!lenientOwnership)
-                {
-                    TracePthreadMutex(ctx, "unlock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-                    return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-                }
+                TracePthreadMutex(ctx, "unlock", mutexAddress, resolvedAddress, state, currentThreadId, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
+                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
             }
         }
 
@@ -1193,13 +987,6 @@ public static class KernelPthreadCompatExports
 
         lock (_stateGate)
         {
-            if (_condStates.TryGetValue(condAddress, out var raced))
-            {
-                resolvedAddress = condAddress;
-                state = raced;
-                return true;
-            }
-
             _condStates[condAddress] = createdState;
             _condStates[handle] = createdState;
         }
@@ -1296,41 +1083,27 @@ public static class KernelPthreadCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static int PthreadCondWaitCore(
-        CpuContext ctx,
-        ulong condAddress,
-        ulong mutexAddress,
-        bool timed,
-        uint timeoutUsec = 0,
-        bool posixResult = false)
+    private static int PthreadCondWaitCore(CpuContext ctx, ulong condAddress, ulong mutexAddress, bool timed, uint timeoutUsec = 0)
     {
         if (condAddress == 0 || mutexAddress == 0)
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryResolveCondState(ctx, condAddress, createIfZero: true, out var resolvedCondAddress, out var state))
+        if (!TryResolveCondState(ctx, condAddress, createIfZero: true, out _, out var state))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
 
         var waitResult = (int)OrbisGen2Result.ORBIS_GEN2_OK;
         var spuriousWake = false;
-        var releasedRecursion = 0;
         lock (state.SyncRoot)
         {
             state.Waiters++;
             var observedEpoch = state.SignalEpoch;
-            var consumedPendingSignal = state.TryConsumePendingSignal();
-            TracePthreadCond(
-                consumedPendingSignal ? "wait-enter-pending" : "wait-enter",
-                condAddress,
-                mutexAddress,
-                state,
-                timed,
-                waitResult);
+            TracePthreadCond("wait-enter", condAddress, mutexAddress, state, timed, waitResult);
 
-            var unlockResult = PthreadMutexFullUnlockForCondWait(ctx, mutexAddress, out releasedRecursion);
+            var unlockResult = PthreadMutexUnlockCore(ctx, mutexAddress, requireOwner: true);
             if (unlockResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
             {
                 state.Waiters--;
@@ -1338,36 +1111,10 @@ public static class KernelPthreadCompatExports
                 return unlockResult;
             }
 
-            if (consumedPendingSignal)
-            {
-                state.Waiters = Math.Max(0, state.Waiters - 1);
-                TracePthreadCond("wait-wake-pending", condAddress, mutexAddress, state, timed, waitResult);
-
-                // Relock outside SyncRoot to preserve lock ordering.
-                Monitor.Exit(state.SyncRoot);
-                try
-                {
-                    var pendingLockResult = PthreadMutexRelockForCondWait(ctx, mutexAddress, releasedRecursion);
-                    return pendingLockResult != (int)OrbisGen2Result.ORBIS_GEN2_OK ? pendingLockResult : waitResult;
-                }
-                finally
-                {
-                    // Balance the surrounding lock statement.
-                    Monitor.Enter(state.SyncRoot);
-                }
-            }
-
             var scheduler = GuestThreadExecution.Scheduler;
-            if (GuestThreadExecution.IsGuestThread &&
-                GuestThreadExecution.RequestCurrentThreadBlock(
-                    ctx,
-                    timed ? "pthread_cond_timedwait" : "pthread_cond_wait",
-                    state.WakeKey,
-                    () => ResumePthreadCondWait(ctx, condAddress, mutexAddress, state, observedEpoch, timed, releasedRecursion, posixResult),
-                    () => state.SignalEpoch != observedEpoch,
-                    timed ? GuestThreadExecution.ComputeDeadlineTimestamp(GetCondWaitTimeout(timeoutUsec)) : 0))
+            if (!timed && GuestThreadExecution.RequestCurrentThreadBlock("pthread_cond_wait"))
             {
-                TracePthreadCond(timed ? "wait-block-timed" : "wait-block", condAddress, mutexAddress, state, timed, waitResult);
+                TracePthreadCond("wait-block", condAddress, mutexAddress, state, timed, waitResult);
                 return waitResult;
             }
 
@@ -1390,21 +1137,6 @@ public static class KernelPthreadCompatExports
                 {
                     if (!Monitor.Wait(state.SyncRoot, GetCondSpuriousWakeTimeout()))
                     {
-                        if (scheduler is not null && !GuestThreadExecution.IsGuestThread)
-                        {
-                            Monitor.Exit(state.SyncRoot);
-                            try
-                            {
-                                scheduler.Pump(ctx, "pthread_cond_wait");
-                            }
-                            finally
-                            {
-                                Monitor.Enter(state.SyncRoot);
-                            }
-
-                            continue;
-                        }
-
                         spuriousWake = true;
                         break;
                     }
@@ -1431,7 +1163,7 @@ public static class KernelPthreadCompatExports
                 waitResult);
         }
 
-        var lockResult = PthreadMutexRelockForCondWait(ctx, mutexAddress, releasedRecursion);
+        var lockResult = PthreadMutexLockCore(ctx, mutexAddress, tryOnly: false);
         if (lockResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
         {
             TracePthreadCond("wait-relock-fail", condAddress, mutexAddress, state, timed, lockResult);
@@ -1447,7 +1179,7 @@ public static class KernelPthreadCompatExports
             state,
             timed,
             waitResult);
-        return TranslatePthreadResult(waitResult, posixResult);
+        return waitResult;
     }
 
     private static int PthreadCondSignalCore(CpuContext ctx, ulong condAddress, bool broadcast)
@@ -1457,19 +1189,16 @@ public static class KernelPthreadCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryResolveCondState(ctx, condAddress, createIfZero: true, out var resolvedCondAddress, out var state))
+        if (!TryResolveCondState(ctx, condAddress, createIfZero: true, out _, out var state))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
 
-        var shouldWakeScheduler = false;
         lock (state.SyncRoot)
         {
-            // Advance the epoch even with no waiter registered — it's the wait predicate.
-            state.SignalEpoch++;
             if (state.Waiters > 0)
             {
-                shouldWakeScheduler = true;
+                state.SignalEpoch++;
                 if (broadcast)
                 {
                     Monitor.PulseAll(state.SyncRoot);
@@ -1479,161 +1208,15 @@ public static class KernelPthreadCompatExports
                     Monitor.Pulse(state.SyncRoot);
                 }
             }
-            else
-            {
-                state.PendingSignals++;
-            }
 
             TracePthreadCond(broadcast ? "broadcast" : "signal", condAddress, mutexAddress: 0, state, timed: false, (int)OrbisGen2Result.ORBIS_GEN2_OK);
         }
 
-        if (shouldWakeScheduler)
-        {
-            _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(
-                state.WakeKey,
-                broadcast ? int.MaxValue : 1);
-        }
-
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static int ResumePthreadCondWait(
-        CpuContext ctx,
-        ulong condAddress,
-        ulong mutexAddress,
-        PthreadCondState state,
-        ulong observedEpoch,
-        bool timed,
-        int releasedRecursion,
-        bool posixResult)
-    {
-        var waitResult = (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        lock (state.SyncRoot)
-        {
-            state.Waiters = Math.Max(0, state.Waiters - 1);
-            if (timed && state.SignalEpoch == observedEpoch)
-            {
-                waitResult = (int)OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT;
-            }
-
-            TracePthreadCond(
-                waitResult == (int)OrbisGen2Result.ORBIS_GEN2_OK ? "wait-resume" : "wait-resume-timeout",
-                condAddress,
-                mutexAddress,
-                state,
-                timed,
-                waitResult);
-        }
-
-        var lockResult = PthreadMutexRelockForCondWait(ctx, mutexAddress, releasedRecursion);
-        return TranslatePthreadResult(
-            lockResult == (int)OrbisGen2Result.ORBIS_GEN2_OK ? waitResult : lockResult,
-            posixResult);
-    }
-
-    private static int TranslatePthreadResult(int result, bool posixResult)
-    {
-        if (!posixResult || result == (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return result;
-        }
-
-        return result switch
-        {
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED => 1, // EPERM
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND => 2,        // ENOENT
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT => 22, // EINVAL
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DEADLOCK => 11,        // EDEADLK
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DELETED => 13,         // EACCES
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY => 16,            // EBUSY
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_TRY_AGAIN => 35,       // EAGAIN
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT => 60,       // ETIMEDOUT
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_CANCELED => 85,        // ECANCELED
-            (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT => 14,    // EFAULT
-            _ => result
-        };
-    }
-
-    private static string GetCondWakeKey(ulong resolvedCondAddress) =>
-        _condWakeKeys.GetOrAdd(resolvedCondAddress, static address => string.Create(
-            31,
-            address,
-            static (destination, value) =>
-            {
-                "pthread_cond:0x".AsSpan().CopyTo(destination);
-                _ = value.TryFormat(destination[15..], out _, "X16");
-            }));
-
-    private static int PthreadMutexFullUnlockForCondWait(CpuContext ctx, ulong mutexAddress, out int releasedRecursion)
-    {
-        releasedRecursion = 0;
-        if (!TryResolveMutexState(ctx, mutexAddress, createIfZero: false, out _, out var state))
-        {
-            return PthreadMutexUnlockCore(ctx, mutexAddress, requireOwner: true);
-        }
-
-        var currentThreadId = KernelPthreadState.GetCurrentThreadHandle();
-        lock (state)
-        {
-            if (state.RecursionCount <= 0 || state.OwnerThreadId != currentThreadId)
-            {
-                return PthreadMutexUnlockCore(ctx, mutexAddress, requireOwner: true);
-            }
-
-            releasedRecursion = state.RecursionCount;
-            state.RecursionCount = 1;
-        }
-
-        return PthreadMutexUnlockCore(ctx, mutexAddress, requireOwner: true);
-    }
-
-    private static int PthreadMutexRelockForCondWait(CpuContext ctx, ulong mutexAddress, int releasedRecursion)
-    {
-        var result = PthreadMutexLockCore(ctx, mutexAddress, tryOnly: false);
-        if (result != (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return result;
-        }
-
-        if (releasedRecursion > 1 &&
-            TryResolveMutexState(ctx, mutexAddress, createIfZero: false, out _, out var state))
-        {
-            lock (state)
-            {
-                if (state.OwnerThreadId == KernelPthreadState.GetCurrentThreadHandle())
-                {
-                    state.RecursionCount = releasedRecursion;
-                }
-            }
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    public static string? DumpMutexStateForStall(ulong mutexAddress)
-    {
-        if (!_mutexStates.TryGetValue(mutexAddress, out var state))
-        {
-            return null;
-        }
-
-        var waiterThreads = string.Join(",", _mutexStates
-            .Where(pair => ReferenceEquals(pair.Value, state))
-            .Select(pair => $"0x{pair.Key:X}"));
-
-        return $"mutex=0x{mutexAddress:X16} owner=0x{state.OwnerThreadId:X} recursion={state.RecursionCount} " +
-               $"type={state.Type} semaphore_count={state.Semaphore.CurrentCount} aliases=[{waiterThreads}]";
-    }
-
     private static string GetMutexWakeKey(ulong resolvedMutexAddress) =>
-        _mutexWakeKeys.GetOrAdd(resolvedMutexAddress, static address => string.Create(
-            32,
-            address,
-            static (destination, value) =>
-            {
-                "pthread_mutex:0x".AsSpan().CopyTo(destination);
-                _ = value.TryFormat(destination[16..], out _, "X16");
-            }));
+        $"pthread_mutex:0x{resolvedMutexAddress:X16}";
 
     private static bool TryReserveBlockedMutexLock(
         CpuContext ctx,
@@ -1650,13 +1233,6 @@ public static class KernelPthreadCompatExports
                 return false;
             }
 
-            if (!state.Semaphore.Wait(0))
-            {
-                TracePthreadMutex(ctx, "lock-reserve-busy", mutexAddress, resolvedAddress, state, waiter.ThreadId, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY);
-                return false;
-            }
-
-            DetectMutexDoubleOwner(resolvedAddress, state, waiter.ThreadId, "reserve");
             state.OwnerThreadId = waiter.ThreadId;
             state.RecursionCount = 1;
             Interlocked.Exchange(ref waiter.Reserved, 1);
@@ -1688,7 +1264,6 @@ public static class KernelPthreadCompatExports
 
         lock (state)
         {
-            DetectMutexDoubleOwner(resolvedAddress, state, currentThreadId, "resume");
             state.OwnerThreadId = currentThreadId;
             state.RecursionCount = 1;
         }
@@ -1697,19 +1272,6 @@ public static class KernelPthreadCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    // A nonzero foreign prior owner means two guest threads are in the same critical
-    // section. Call while holding lock(state).
-    private static void DetectMutexDoubleOwner(ulong resolvedAddress, PthreadMutexState state, ulong currentThreadId, string site)
-    {
-        var priorOwner = state.OwnerThreadId;
-        if (priorOwner != 0 && priorOwner != currentThreadId)
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][ERROR] MUTEX DOUBLE-OWNER at {site}: resolved=0x{resolvedAddress:X} acquirer=0x{currentThreadId:X} " +
-                $"prior_owner=0x{priorOwner:X} recursion={state.RecursionCount} type={state.Type} sem_count={state.Semaphore.CurrentCount}");
-        }
-    }
-
     private static TimeSpan GetCondWaitTimeout(uint timeoutUsec)
     {
         if (timeoutUsec == 0)
@@ -1717,10 +1279,7 @@ public static class KernelPthreadCompatExports
             return TimeSpan.Zero;
         }
 
-        // Round positive sub-millisecond waits to the host sleep quantum.
-        return timeoutUsec < 1_000
-            ? TimeSpan.FromMilliseconds(1)
-            : TimeSpan.FromTicks((long)timeoutUsec * 10L);
+        return TimeSpan.FromTicks((long)timeoutUsec * 10L);
     }
 
     private static TimeSpan GetCondSpuriousWakeTimeout()
@@ -1850,8 +1409,7 @@ public static class KernelPthreadCompatExports
             $"[LOADER][TRACE] pthread_{operation}: mutex=0x{mutexAddress:X16} resolved=0x{resolvedAddress:X16} " +
             $"guest[0]=0x{guestWord0:X16} guest[8]=0x{guestWord1:X16} " +
             $"current=0x{currentThreadId:X16} owner=0x{(state?.OwnerThreadId ?? 0):X16} " +
-            $"recursion={(state?.RecursionCount ?? 0)} type={(state?.Type ?? 0)} result=0x{unchecked((uint)result):X8} " +
-            $"guest_thread=0x{GuestThreadExecution.CurrentGuestThreadHandle:X16} managed={Environment.CurrentManagedThreadId}");
+            $"recursion={(state?.RecursionCount ?? 0)} type={(state?.Type ?? 0)} result=0x{unchecked((uint)result):X8}");
     }
 
     private static void TracePthreadCond(string operation, ulong condAddress, ulong mutexAddress, PthreadCondState? state, bool timed, int result)
@@ -1862,8 +1420,7 @@ public static class KernelPthreadCompatExports
         }
 
         Console.Error.WriteLine(
-            $"[LOADER][TRACE] pthread_cond_{operation}: thread=0x{KernelPthreadState.GetCurrentThreadHandle():X16} " +
-            $"cond=0x{condAddress:X16} key={state?.WakeKey ?? "none"} mutex=0x{mutexAddress:X16} " +
+            $"[LOADER][TRACE] pthread_cond_{operation}: cond=0x{condAddress:X16} mutex=0x{mutexAddress:X16} " +
             $"waiters={(state?.Waiters ?? 0)} epoch=0x{(state?.SignalEpoch ?? 0):X} timed={timed} result=0x{unchecked((uint)result):X8}");
     }
 

src/SharpEmu.Libs/Kernel/KernelPthreadExtendedCompatExports.cs

@@ -31,8 +31,6 @@ public static class KernelPthreadExtendedCompatExports
     private static long _nextSyntheticRwlockHandleId = 1;
     private static long _nextSyntheticPthreadAttrHandleId = 1;
     private static long _nextSyntheticRwlockAttrHandleId = 1;
-    private static readonly bool _strictRwlockWriterPreference =
-        string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_STRICT_RWLOCK_WRITER_PREFERENCE"), "1", StringComparison.Ordinal);
 
     private static readonly ConcurrentDictionary<ulong, ConcurrentDictionary<int, ulong>> _threadLocalSpecific = new();
 
@@ -87,23 +85,14 @@ public static class KernelPthreadExtendedCompatExports
         public PthreadAttrState Attributes { get; set; } = PthreadAttrState.Default;
     }
 
-    // On the outer class deliberately: a static on the nested state class gives it a type
-    // initializer that first runs on a guest thread and fail-fasts the CLR.
-    private static long _nextRwlockWakeId;
-
     private sealed class PthreadRwlockState
     {
         public object SyncRoot { get; } = new();
         public Dictionary<ulong, int> ReaderCounts { get; } = new();
-        public Dictionary<ulong, int> CompatWriterCounts { get; } = new();
         public int ReaderTotalCount { get; set; }
-        public int CompatWriterTotalCount { get; set; }
         public ulong WriterThreadId { get; set; }
         public int WaitingWriters { get; set; }
 
-        // See PthreadMutexState.WakeKey.
-        public string WakeKey { get; } = "pthread_rwlock#" + Interlocked.Increment(ref _nextRwlockWakeId).ToString("X");
-
         public int GetReaderCount(ulong threadId)
         {
             return ReaderCounts.TryGetValue(threadId, out var count) ? count : 0;
@@ -116,33 +105,6 @@ public static class KernelPthreadExtendedCompatExports
             ReaderTotalCount++;
         }
 
-        public void AddCompatWriter(ulong threadId)
-        {
-            CompatWriterCounts.TryGetValue(threadId, out var currentCount);
-            CompatWriterCounts[threadId] = currentCount + 1;
-            CompatWriterTotalCount++;
-        }
-
-        public bool RemoveCompatWriter(ulong threadId)
-        {
-            if (!CompatWriterCounts.TryGetValue(threadId, out var currentCount) || currentCount <= 0)
-            {
-                return false;
-            }
-
-            if (currentCount == 1)
-            {
-                CompatWriterCounts.Remove(threadId);
-            }
-            else
-            {
-                CompatWriterCounts[threadId] = currentCount - 1;
-            }
-
-            CompatWriterTotalCount = Math.Max(0, CompatWriterTotalCount - 1);
-            return true;
-        }
-
         public bool RemoveReader(ulong threadId)
         {
             if (!ReaderCounts.TryGetValue(threadId, out var currentCount) || currentCount <= 0)
@@ -973,7 +935,7 @@ public static class KernelPthreadExtendedCompatExports
 
         lock (state.SyncRoot)
         {
-            if (state.WriterThreadId != 0 || state.ReaderTotalCount != 0 || state.WaitingWriters != 0 || state.CompatWriterTotalCount != 0)
+            if (state.WriterThreadId != 0 || state.ReaderTotalCount != 0 || state.WaitingWriters != 0)
             {
                 return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_BUSY;
             }
@@ -1041,7 +1003,7 @@ public static class KernelPthreadExtendedCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryResolveRwlockState(ctx, rwlockAddress, createIfZero: false, out var resolvedAddress, out var rwlock))
+        if (!TryResolveRwlockState(ctx, rwlockAddress, createIfZero: false, out _, out var rwlock))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
@@ -1052,11 +1014,7 @@ public static class KernelPthreadExtendedCompatExports
         {
             lock (rwlock.SyncRoot)
             {
-                if (rwlock.RemoveCompatWriter(currentThreadId))
-                {
-                    Monitor.PulseAll(rwlock.SyncRoot);
-                }
-                else if (rwlock.WriterThreadId == currentThreadId)
+                if (rwlock.WriterThreadId == currentThreadId)
                 {
                     rwlock.WriterThreadId = 0;
                     Monitor.PulseAll(rwlock.SyncRoot);
@@ -1079,7 +1037,6 @@ public static class KernelPthreadExtendedCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED;
         }
 
-        _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(rwlock.WakeKey);
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
@@ -1270,7 +1227,7 @@ public static class KernelPthreadExtendedCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryResolveRwlockState(ctx, rwlockAddress, createIfZero: true, out var resolvedAddress, out var rwlock))
+        if (!TryResolveRwlockState(ctx, rwlockAddress, createIfZero: true, out _, out var rwlock))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
@@ -1285,60 +1242,20 @@ public static class KernelPthreadExtendedCompatExports
                     return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DEADLOCK;
                 }
 
-                if (rwlock.CompatWriterCounts.GetValueOrDefault(currentThreadId) > 0)
-                {
-                    rwlock.AddCompatWriter(currentThreadId);
-                    return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                }
-
-                if (GuestThreadExecution.IsGuestThread &&
-                    !_strictRwlockWriterPreference &&
-                    rwlock.WriterThreadId == 0 &&
-                    rwlock.ReaderTotalCount == 0 &&
-                    rwlock.CompatWriterTotalCount == 0)
-                {
-                    rwlock.AddCompatWriter(currentThreadId);
-                    return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                }
-
-                if (rwlock.WriterThreadId == 0 && rwlock.ReaderTotalCount == 0 && rwlock.CompatWriterTotalCount == 0)
-                {
-                    DetectRwlockWriterConflict(resolvedAddress, rwlock, currentThreadId, "wrlock");
-                    rwlock.WriterThreadId = currentThreadId;
-                    return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                }
-
                 rwlock.WaitingWriters++;
-                var transferredToScheduler = false;
                 try
                 {
-                    if (GuestThreadExecution.IsGuestThread &&
-                        GuestThreadExecution.TryGetCurrentImportCallFrame(out _) &&
-                        GuestThreadExecution.RequestCurrentThreadBlock(
-                            ctx,
-                            "pthread_rwlock_wrlock",
-                            rwlock.WakeKey,
-                            static () => (int)OrbisGen2Result.ORBIS_GEN2_OK,
-                            () => TryAcquireBlockedRwlock(rwlock, currentThreadId, write: true)))
-                    {
-                        transferredToScheduler = true;
-                        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                    }
-
-                    while (rwlock.WriterThreadId != 0 || rwlock.ReaderTotalCount != 0 || rwlock.CompatWriterTotalCount != 0)
+                    while (rwlock.WriterThreadId != 0 || rwlock.ReaderTotalCount != 0)
                     {
                         Monitor.Wait(rwlock.SyncRoot);
                     }
-
-                    rwlock.WriterThreadId = currentThreadId;
                 }
                 finally
                 {
-                    if (!transferredToScheduler)
-                    {
-                        rwlock.WaitingWriters = Math.Max(0, rwlock.WaitingWriters - 1);
-                    }
+                    rwlock.WaitingWriters--;
                 }
+
+                rwlock.WriterThreadId = currentThreadId;
             }
             else
             {
@@ -1347,30 +1264,12 @@ public static class KernelPthreadExtendedCompatExports
                     return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DEADLOCK;
                 }
 
-                while (ReaderMustWaitForRwlock(rwlock, currentThreadId))
+                while (rwlock.WriterThreadId != 0 ||
+                       (rwlock.WaitingWriters > 0 && rwlock.GetReaderCount(currentThreadId) == 0))
                 {
-                    if (GuestThreadExecution.IsGuestThread &&
-                        GuestThreadExecution.TryGetCurrentImportCallFrame(out _) &&
-                        GuestThreadExecution.RequestCurrentThreadBlock(
-                            ctx,
-                            "pthread_rwlock_rdlock",
-                            rwlock.WakeKey,
-                            static () => (int)OrbisGen2Result.ORBIS_GEN2_OK,
-                            () => TryAcquireBlockedRwlock(rwlock, currentThreadId, write: false)))
-                    {
-                        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-                    }
-
                     Monitor.Wait(rwlock.SyncRoot);
                 }
 
-                if (rwlock.WriterThreadId != 0 ||
-                    rwlock.CompatWriterTotalCount > rwlock.CompatWriterCounts.GetValueOrDefault(currentThreadId))
-                {
-                    Console.Error.WriteLine(
-                        $"[LOADER][ERROR] RWLOCK READER/WRITER COEXIST: resolved=0x{resolvedAddress:X} reader=0x{currentThreadId:X} " +
-                        $"writer=0x{rwlock.WriterThreadId:X} compat_total={rwlock.CompatWriterTotalCount} readers_total={rwlock.ReaderTotalCount}");
-                }
                 rwlock.AddReader(currentThreadId);
             }
         }
@@ -1378,86 +1277,6 @@ public static class KernelPthreadExtendedCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static bool TryAcquireBlockedRwlock(PthreadRwlockState rwlock, ulong currentThreadId, bool write)
-    {
-        lock (rwlock.SyncRoot)
-        {
-            if (write)
-            {
-                if (rwlock.WriterThreadId != 0 || rwlock.ReaderTotalCount != 0 || rwlock.CompatWriterTotalCount != 0)
-                {
-                    return false;
-                }
-
-                DetectRwlockWriterConflict(0, rwlock, currentThreadId, "wrlock-resume");
-                rwlock.WriterThreadId = currentThreadId;
-                rwlock.WaitingWriters = Math.Max(0, rwlock.WaitingWriters - 1);
-                return true;
-            }
-
-            if (ReaderMustWaitForRwlock(rwlock, currentThreadId))
-            {
-                return false;
-            }
-
-            rwlock.AddReader(currentThreadId);
-            return true;
-        }
-    }
-
-    // Call while holding lock(rwlock.SyncRoot): an existing reader/writer here means a
-    // writer would share the rwlock with another holder — a data race.
-    private static void DetectRwlockWriterConflict(ulong resolvedAddress, PthreadRwlockState rwlock, ulong currentThreadId, string site)
-    {
-        if (rwlock.WriterThreadId != 0 ||
-            rwlock.ReaderTotalCount != 0 ||
-            rwlock.CompatWriterTotalCount > rwlock.CompatWriterCounts.GetValueOrDefault(currentThreadId))
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][ERROR] RWLOCK WRITER CONFLICT at {site}: resolved=0x{resolvedAddress:X} writer=0x{currentThreadId:X} " +
-                $"existing_writer=0x{rwlock.WriterThreadId:X} readers_total={rwlock.ReaderTotalCount} compat_total={rwlock.CompatWriterTotalCount}");
-        }
-    }
-
-    private static bool ReaderMustWaitForRwlock(PthreadRwlockState rwlock, ulong currentThreadId)
-    {
-        if (rwlock.WriterThreadId != 0)
-        {
-            return true;
-        }
-
-        if (rwlock.CompatWriterTotalCount > rwlock.CompatWriterCounts.GetValueOrDefault(currentThreadId))
-        {
-            return true;
-        }
-
-        return rwlock.WaitingWriters > 0 &&
-               rwlock.GetReaderCount(currentThreadId) == 0;
-    }
-
-    private static string GetRwlockWakeKey(ulong rwlockAddress) => $"pthread_rwlock:0x{rwlockAddress:X16}";
-
-    public static string? DumpRwlockStateForStall(ulong rwlockAddress)
-    {
-        PthreadRwlockState? rwlock;
-        lock (_stateGate)
-        {
-            if (!_rwlockStates.TryGetValue(rwlockAddress, out rwlock))
-            {
-                return null;
-            }
-        }
-
-        lock (rwlock.SyncRoot)
-        {
-            var readers = string.Join(",", rwlock.ReaderCounts.Select(pair => $"0x{pair.Key:X}x{pair.Value}"));
-            var compatWriters = string.Join(",", rwlock.CompatWriterCounts.Select(pair => $"0x{pair.Key:X}x{pair.Value}"));
-            return $"rwlock=0x{rwlockAddress:X16} writer=0x{rwlock.WriterThreadId:X} waiting_writers={rwlock.WaitingWriters} " +
-                   $"readers_total={rwlock.ReaderTotalCount} readers=[{readers}] " +
-                   $"compat_writers_total={rwlock.CompatWriterTotalCount} compat_writers=[{compatWriters}]";
-        }
-    }
-
     private static ulong ResolveRwlockHandle(CpuContext ctx, ulong rwlockAddress)
     {
         if (rwlockAddress == 0)

src/SharpEmu.Libs/Kernel/KernelRuntimeCompatExports.cs

@@ -85,29 +85,22 @@ public static class KernelRuntimeCompatExports
         ExportName = "sceKernelNanosleep",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
-    public static int KernelNanosleep(CpuContext ctx) => NanosleepCore(ctx, posix: false);
-
-    [SysAbiExport(
-        Nid = "yS8U2TGCe1A",
-        ExportName = "nanosleep",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int PosixNanosleep(CpuContext ctx) => NanosleepCore(ctx, posix: true);
-
-    private static int NanosleepCore(CpuContext ctx, bool posix)
+    public static int KernelNanosleep(CpuContext ctx)
     {
         var requestAddress = ctx[CpuRegister.Rdi];
         var remainAddress = ctx[CpuRegister.Rsi];
 
         if (requestAddress == 0)
         {
-            return NanosleepFailure(ctx, posix, Einval, OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
+            ctx[CpuRegister.Rax] = Einval;
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
         Span<byte> timespecBuffer = stackalloc byte[16];
         if (!ctx.Memory.TryRead(requestAddress, timespecBuffer))
         {
-            return NanosleepFailure(ctx, posix, Efault, OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
+            ctx[CpuRegister.Rax] = Efault;
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
         var tvSec = BinaryPrimitives.ReadInt64LittleEndian(timespecBuffer);
@@ -115,7 +108,8 @@ public static class KernelRuntimeCompatExports
 
         if (tvSec < 0 || tvNsec < 0 || tvNsec >= 1_000_000_000L)
         {
-            return NanosleepFailure(ctx, posix, Einval, OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
+            ctx[CpuRegister.Rax] = Einval;
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
         if (tvSec == 0 && tvNsec == 0)
@@ -125,7 +119,7 @@ public static class KernelRuntimeCompatExports
             return (int)OrbisGen2Result.ORBIS_GEN2_OK;
         }
 
-        GuestThreadExecution.Scheduler?.Pump(ctx, posix ? "nanosleep" : "sceKernelNanosleep");
+        GuestThreadExecution.Scheduler?.Pump(ctx, "sceKernelNanosleep");
 
         // TimeSpan resolution is 100 ns ticks, so sub-100 ns requests round up to
         // a single tick rather than collapsing to a zero-length (no-op) sleep.
@@ -144,21 +138,6 @@ public static class KernelRuntimeCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static int NanosleepFailure(CpuContext ctx, bool posix, int errnoValue, OrbisGen2Result sceResult)
-    {
-        if (posix)
-        {
-            TrySetErrno(ctx, errnoValue);
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-        }
-        else
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)errnoValue);
-        }
-
-        return (int)sceResult;
-    }
-
     private static void WriteRemainingTime(CpuContext ctx, ulong remainAddress, long seconds, long nanoseconds)
     {
         if (remainAddress == 0)
@@ -213,13 +192,6 @@ public static class KernelRuntimeCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "QcteRwbsnV0",
-        ExportName = "usleep",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int PosixUsleep(CpuContext ctx) => KernelUsleep(ctx);
-
     private static void TraceUsleepSpin(CpuContext ctx, ulong micros)
     {
         if (!_traceUsleep)
@@ -431,18 +403,6 @@ public static class KernelRuntimeCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "HoLVWNanBBc",
-        ExportName = "getpid",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int GetProcessId(CpuContext ctx)
-    {
-        var processId = Environment.ProcessId;
-        ctx[CpuRegister.Rax] = unchecked((uint)processId);
-        return processId;
-    }
-
     [SysAbiExport(
         Nid = "fgxnMeTNUtY",
         ExportName = "sceKernelGetProcessTimeCounter",

src/SharpEmu.Libs/Kernel/KernelSemaphoreCompatExports.cs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using SharpEmu.HLE;
 
 namespace SharpEmu.Libs.Kernel;
@@ -13,9 +12,6 @@ public static class KernelSemaphoreCompatExports
     private static readonly ConcurrentDictionary<uint, KernelSemaphoreState> _semaphores = new();
     private static int _nextSemaphoreHandle = 1;
 
-    [ThreadStatic]
-    private static int _semaPollBackoffCount;
-
     private sealed class KernelSemaphoreState
     {
         public required string Name { get; init; }
@@ -32,7 +28,6 @@ public static class KernelSemaphoreCompatExports
     {
         public required int NeedCount { get; init; }
         public required int CancelEpochAtBlock { get; init; }
-        public bool Timed { get; init; }
 
         // Written and read only under the owning semaphore's Gate.
         public int? Result { get; set; }
@@ -125,7 +120,6 @@ public static class KernelSemaphoreCompatExports
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
         }
 
-        var pollTimedOut = false;
         lock (semaphore.Gate)
         {
             if (semaphore.Count >= needCount)
@@ -137,82 +131,36 @@ public static class KernelSemaphoreCompatExports
 
             if (timeoutAddress != 0)
             {
-                if (!ctx.TryReadUInt32(timeoutAddress, out var timeoutMicros))
+                if (!ctx.TryReadUInt32(timeoutAddress, out _))
                 {
                     return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
                 }
 
-                if (timeoutMicros == 0)
-                {
-                    _ = ctx.TryWriteUInt32(timeoutAddress, 0);
-                    TraceSemaphore($"wait-timeout handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count}");
-                    pollTimedOut = true;
-                }
-                else
-                {
-                    var deadline = GuestThreadExecution.ComputeDeadlineTimestamp(TimeSpan.FromTicks((long)timeoutMicros * 10L));
-                    var timedWaiter = new SemaphoreWaiter
-                    {
-                        NeedCount = needCount,
-                        CancelEpochAtBlock = semaphore.CancelEpoch,
-                        Timed = true,
-                    };
-                    if (GuestThreadExecution.RequestCurrentThreadBlock(
-                            ctx,
-                            "sceKernelWaitSema",
-                            GetSemaphoreWakeKey(handle),
-                            resumeHandler: () => CompleteBlockedTimedSemaWait(ctx, semaphore, timedWaiter, timeoutAddress, deadline),
-                            wakeHandler: () => TryConsumeBlockedSemaWait(semaphore, timedWaiter),
-                            blockDeadlineTimestamp: deadline))
-                    {
-                        semaphore.WaitingThreads++;
-                        TraceSemaphore($"wait-block-timed handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count} timeout_us={timeoutMicros} waiters={semaphore.WaitingThreads}");
-                        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-                    }
-
-                    // Host-owned threads cannot park in the guest scheduler; degrade to the
-                    // immediate-timeout poll the callers already tolerate.
-                    _ = ctx.TryWriteUInt32(timeoutAddress, 0);
-                    TraceSemaphore($"wait-timeout handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count}");
-                    pollTimedOut = true;
-                }
+                _ = ctx.TryWriteUInt32(timeoutAddress, 0);
+                TraceSemaphore($"wait-timeout handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count}");
+                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
             }
 
-            if (!pollTimedOut)
+            var waiter = new SemaphoreWaiter
             {
-                var waiter = new SemaphoreWaiter
-                {
-                    NeedCount = needCount,
-                    CancelEpochAtBlock = semaphore.CancelEpoch,
-                };
-                if (!GuestThreadExecution.RequestCurrentThreadBlock(
-                        ctx,
-                        "sceKernelWaitSema",
-                        GetSemaphoreWakeKey(handle),
-                        resumeHandler: () => CompleteBlockedSemaWait(semaphore, waiter),
-                        wakeHandler: () => TryConsumeBlockedSemaWait(semaphore, waiter)))
-                {
-                    TraceSemaphore($"wait-would-block handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count}");
-                    return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TRY_AGAIN);
-                }
-
-                semaphore.WaitingThreads++;
-                TraceSemaphore($"wait-block handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count} waiters={semaphore.WaitingThreads}");
-                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
+                NeedCount = needCount,
+                CancelEpochAtBlock = semaphore.CancelEpoch,
+            };
+            if (!GuestThreadExecution.RequestCurrentThreadBlock(
+                    ctx,
+                    "sceKernelWaitSema",
+                    GetSemaphoreWakeKey(handle),
+                    resumeHandler: () => CompleteBlockedSemaWait(semaphore, waiter),
+                    wakeHandler: () => TryConsumeBlockedSemaWait(semaphore, waiter)))
+            {
+                TraceSemaphore($"wait-would-block handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count}");
+                return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TRY_AGAIN);
             }
-        }
 
-        GuestThreadExecution.Scheduler?.Pump(ctx, "sceKernelWaitSema");
-        if ((++_semaPollBackoffCount & 255) == 0)
-        {
-            Thread.Sleep(0);
+            semaphore.WaitingThreads++;
+            TraceSemaphore($"wait-block handle=0x{handle:X8} name='{semaphore.Name}' need={needCount} count={semaphore.Count} waiters={semaphore.WaitingThreads}");
+            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
         }
-        else
-        {
-            Thread.Yield();
-        }
-
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
     }
 
     [SysAbiExport(
@@ -420,42 +368,6 @@ public static class KernelSemaphoreCompatExports
         }
     }
 
-    private static int CompleteBlockedTimedSemaWait(
-        CpuContext ctx,
-        KernelSemaphoreState semaphore,
-        SemaphoreWaiter waiter,
-        ulong timeoutAddress,
-        long deadlineTimestamp)
-    {
-        int result;
-        lock (semaphore.Gate)
-        {
-            if (waiter.Result is null && !TryConsumeBlockedSemaWaitLocked(semaphore, waiter))
-            {
-                waiter.Result = (int)OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT;
-                semaphore.WaitingThreads = Math.Max(0, semaphore.WaitingThreads - 1);
-                TraceSemaphore($"wake-timeout name='{semaphore.Name}' need={waiter.NeedCount} count={semaphore.Count} waiters={semaphore.WaitingThreads}");
-            }
-
-            result = waiter.Result!.Value;
-        }
-
-        if (result == (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            var remainingTicks = deadlineTimestamp - Stopwatch.GetTimestamp();
-            var remainingMicros = remainingTicks <= 0
-                ? 0u
-                : (uint)Math.Min(uint.MaxValue, remainingTicks / (double)Stopwatch.Frequency * 1_000_000d);
-            _ = ctx.TryWriteUInt32(timeoutAddress, remainingMicros);
-        }
-        else
-        {
-            _ = ctx.TryWriteUInt32(timeoutAddress, 0);
-        }
-
-        return result;
-    }
-
     private static void TraceSemaphore(string message)
     {
         if (string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_SEMA"), "1", StringComparison.Ordinal))

src/SharpEmu.Libs/Kernel/KernelSocketCompatExports.cs

@@ -1,558 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Buffers.Binary;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Kernel;
-
-internal static class KernelSocketCompatExports
-{
-    private sealed class EmulatedSocketState
-    {
-        public TcpClient? Client;
-        public NetworkStream? Stream;
-        public IPAddress BoundAddress = IPAddress.Any;
-        public int BoundPort;
-        public bool Bound;
-        public bool Connected;
-    }
-
-    private static readonly object Gate = new();
-    private static readonly Dictionary<int, EmulatedSocketState> Sockets = new();
-
-    internal static bool IsEmulatedSocketFd(int fd)
-    {
-        lock (Gate)
-        {
-            return Sockets.ContainsKey(fd);
-        }
-    }
-
-    internal static bool TryCloseSocketFd(int fd)
-    {
-        lock (Gate)
-        {
-            if (!Sockets.Remove(fd, out var state))
-            {
-                return false;
-            }
-
-            DisposeEmulatedSocket(state);
-            return true;
-        }
-    }
-
-    internal static bool TryReadSocketFd(
-        CpuContext ctx,
-        int fd,
-        ulong bufferAddress,
-        int requested,
-        out ulong bytesRead,
-        out OrbisGen2Result error)
-    {
-        bytesRead = 0;
-        error = OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
-
-        if (!TryGetEmulatedSocketState(fd, out var state) ||
-            state is null ||
-            !state.Connected ||
-            state.Stream is null)
-        {
-            return false;
-        }
-
-        var socketBuffer = GC.AllocateUninitializedArray<byte>(requested);
-        int socketRead;
-        try
-        {
-            socketRead = state.Stream.Read(socketBuffer, 0, requested);
-        }
-        catch (IOException)
-        {
-            return false;
-        }
-
-        if (socketRead > 0 && !ctx.Memory.TryWrite(bufferAddress, socketBuffer.AsSpan(0, socketRead)))
-        {
-            error = OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            return true;
-        }
-
-        bytesRead = unchecked((ulong)socketRead);
-        error = OrbisGen2Result.ORBIS_GEN2_OK;
-        return true;
-    }
-
-    internal static bool TryWriteSocketFd(
-        CpuContext ctx,
-        int fd,
-        byte[] payload,
-        out OrbisGen2Result error)
-    {
-        error = OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
-
-        if (!TryGetEmulatedSocketState(fd, out var state) ||
-            state is null ||
-            !state.Connected ||
-            state.Stream is null)
-        {
-            return false;
-        }
-
-        try
-        {
-            state.Stream.Write(payload, 0, payload.Length);
-            state.Stream.Flush();
-        }
-        catch (IOException)
-        {
-            return false;
-        }
-
-        if (string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_NET"), "1", StringComparison.Ordinal))
-        {
-            Console.Out.Write(Encoding.UTF8.GetString(payload));
-            Console.Out.Flush();
-        }
-
-        error = OrbisGen2Result.ORBIS_GEN2_OK;
-        return true;
-    }
-
-    [SysAbiExport(
-        Nid = "TU-d9PfIHPM",
-        ExportName = "socket",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Socket(CpuContext ctx)
-    {
-        var fd = KernelMemoryCompatExports.AllocateGuestFileDescriptor();
-        lock (Gate)
-        {
-            Sockets[fd] = new EmulatedSocketState();
-        }
-
-        ctx[CpuRegister.Rax] = unchecked((ulong)fd);
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "XVL8So3QJUk",
-        ExportName = "connect",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Connect(CpuContext ctx)
-    {
-        var fd = unchecked((int)ctx[CpuRegister.Rdi]);
-        var sockaddrAddress = ctx[CpuRegister.Rsi];
-        var addrlen = unchecked((int)ctx[CpuRegister.Rdx]);
-
-        if (!TryGetEmulatedSocketState(fd, out _))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        if (!TryParseGuestSockaddrIn(sockaddrAddress, addrlen, ctx, out var ipAddress, out var port))
-        {
-            LogNet($"connect sockaddr parse failed: fd={fd} addr=0x{sockaddrAddress:X} len={addrlen}");
-            RemoveEmulatedSocketFd(fd);
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        var redirectApplied = TryApplyNetRedirect(ref ipAddress);
-        if (redirectApplied)
-        {
-            LogNet($"connect redirect: fd={fd} ip={ipAddress} port={port}");
-        }
-
-        if (!IsGuestTcpOutboundAllowed(ipAddress, redirectApplied))
-        {
-            LogNet($"connect denied by outbound policy: fd={fd} ip={ipAddress} port={port}");
-            RemoveEmulatedSocketFd(fd);
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        if (!TryEstablishHostTcpConnection(ipAddress, port, out var client, out var stream))
-        {
-            LogNet($"connect failed: fd={fd} ip={ipAddress} port={port}");
-            RemoveEmulatedSocketFd(fd);
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        LogNet($"connect ok: fd={fd} ip={ipAddress} port={port}");
-
-        lock (Gate)
-        {
-            if (!Sockets.TryGetValue(fd, out var state) || state is null)
-            {
-                try { stream.Dispose(); } catch (IOException) { }
-                try { client.Dispose(); } catch (IOException) { }
-                ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-                return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-            }
-
-            DisposeEmulatedSocket(state);
-            state.Client = client;
-            state.Stream = stream;
-            state.Connected = true;
-            state.BoundAddress = ipAddress;
-            state.BoundPort = port;
-            state.Bound = true;
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "KuOmgKoqCdY",
-        ExportName = "bind",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Bind(CpuContext ctx)
-    {
-        var fd = unchecked((int)ctx[CpuRegister.Rdi]);
-        var sockaddrAddress = ctx[CpuRegister.Rsi];
-        var addrlen = unchecked((int)ctx[CpuRegister.Rdx]);
-
-        if (!TryGetEmulatedSocketState(fd, out var state) || state is null)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        if (!TryParseGuestSockaddrIn(sockaddrAddress, addrlen, ctx, out var ipAddress, out var port))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        state.BoundAddress = ipAddress;
-        state.BoundPort = port;
-        state.Bound = true;
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "RenI1lL1WFk",
-        ExportName = "getsockname",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Getsockname(CpuContext ctx)
-    {
-        var fd = unchecked((int)ctx[CpuRegister.Rdi]);
-        var sockaddrAddress = ctx[CpuRegister.Rsi];
-        var addrlenAddress = ctx[CpuRegister.Rdx];
-
-        if (!TryGetEmulatedSocketState(fd, out var state) || state is null || !state.Bound)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        Span<byte> addrlenBuffer = stackalloc byte[4];
-        if (!ctx.Memory.TryRead(addrlenAddress, addrlenBuffer))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var addrlen = BinaryPrimitives.ReadInt32LittleEndian(addrlenBuffer);
-        if (addrlen < 8)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        Span<byte> sockaddr = stackalloc byte[16];
-        sockaddr[0] = 16;
-        sockaddr[1] = 2;
-        BinaryPrimitives.WriteUInt16BigEndian(sockaddr.Slice(2, 2), (ushort)state.BoundPort);
-        var addressBytes = state.BoundAddress.GetAddressBytes();
-        if (addressBytes.Length == 4)
-        {
-            addressBytes.CopyTo(sockaddr.Slice(4, 4));
-        }
-
-        var writeLength = Math.Min(addrlen, 16);
-        if (!ctx.Memory.TryWrite(sockaddrAddress, sockaddr.Slice(0, writeLength)))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        BinaryPrimitives.WriteInt32LittleEndian(addrlenBuffer, writeLength);
-        if (!ctx.Memory.TryWrite(addrlenAddress, addrlenBuffer))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "9oiX1kyeedA",
-        ExportName = "bzero",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Bzero(CpuContext ctx)
-    {
-        var address = ctx[CpuRegister.Rdi];
-        var length = unchecked((int)ctx[CpuRegister.Rsi]);
-        if (length > 0 && address != 0)
-        {
-            var zeros = new byte[length];
-            if (!ctx.Memory.TryWrite(address, zeros))
-            {
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "4n51s0zEf0c",
-        ExportName = "inet_pton",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int InetPton(CpuContext ctx)
-    {
-        var af = unchecked((int)ctx[CpuRegister.Rdi]);
-        var srcAddress = ctx[CpuRegister.Rsi];
-        var dstAddress = ctx[CpuRegister.Rdx];
-        if (af != 2 || srcAddress == 0 || dstAddress == 0)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)0xFFFFFFFFFFFFFFFF);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (!TryReadCString(srcAddress, ctx, out var text) ||
-            !TryParseIpv4Address(text, out var octets))
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        Span<byte> packed = stackalloc byte[4];
-        packed[0] = octets[0];
-        packed[1] = octets[1];
-        packed[2] = octets[2];
-        packed[3] = octets[3];
-        if (!ctx.Memory.TryWrite(dstAddress, packed))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ctx[CpuRegister.Rax] = 1;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "jogUIsOV3-U",
-        ExportName = "htons",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int Htons(CpuContext ctx)
-    {
-        var value = unchecked((ushort)ctx[CpuRegister.Rdi]);
-        var swapped = (ushort)(((value & 0x00FF) << 8) | ((value >> 8) & 0x00FF));
-        ctx[CpuRegister.Rax] = swapped;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static bool TryGetEmulatedSocketState(int fd, out EmulatedSocketState? state)
-    {
-        lock (Gate)
-        {
-            return Sockets.TryGetValue(fd, out state);
-        }
-    }
-
-    private static bool TryParseGuestSockaddrIn(
-        ulong address,
-        int addrlen,
-        CpuContext ctx,
-        out IPAddress ipAddress,
-        out int port)
-    {
-        ipAddress = IPAddress.None;
-        port = 0;
-        if (address == 0 || addrlen < 8)
-        {
-            return false;
-        }
-
-        Span<byte> buffer = stackalloc byte[16];
-        var readLength = Math.Min(addrlen, buffer.Length);
-        if (!ctx.Memory.TryRead(address, buffer.Slice(0, readLength)))
-        {
-            return false;
-        }
-
-        if (buffer[1] != 2)
-        {
-            return false;
-        }
-
-        port = BinaryPrimitives.ReadUInt16BigEndian(buffer.Slice(2, 2));
-        ipAddress = new IPAddress(buffer.Slice(4, 4).ToArray());
-        return true;
-    }
-
-    private static void DisposeEmulatedSocket(EmulatedSocketState state)
-    {
-        try { state.Stream?.Dispose(); } catch (IOException) { }
-        try { state.Client?.Dispose(); } catch (IOException) { }
-        state.Stream = null;
-        state.Client = null;
-        state.Connected = false;
-    }
-
-    private static void RemoveEmulatedSocketFd(int fd)
-    {
-        lock (Gate)
-        {
-            if (Sockets.Remove(fd, out var socketState))
-            {
-                DisposeEmulatedSocket(socketState);
-            }
-        }
-    }
-
-    private static void LogNet(string message)
-    {
-        if (string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_NET"), "1", StringComparison.Ordinal))
-        {
-            Console.Error.WriteLine($"[LOADER][DEBUG] {message}");
-        }
-    }
-
-    private static bool TryApplyNetRedirect(ref IPAddress ipAddress)
-    {
-        var redirect = Environment.GetEnvironmentVariable("SHARPEMU_NET_REDIRECT");
-        if (string.IsNullOrWhiteSpace(redirect))
-        {
-            return false;
-        }
-
-        if (!IPAddress.TryParse(redirect.Trim(), out var redirectAddress))
-        {
-            return false;
-        }
-
-        ipAddress = redirectAddress;
-        return true;
-    }
-
-    private static bool IsNetRedirectConfigured()
-    {
-        var redirect = Environment.GetEnvironmentVariable("SHARPEMU_NET_REDIRECT");
-        return !string.IsNullOrWhiteSpace(redirect);
-    }
-
-    private static bool IsGuestTcpOutboundAllowed(IPAddress ipAddress, bool redirectApplied)
-    {
-        return redirectApplied || IsNetRedirectConfigured() || IPAddress.IsLoopback(ipAddress);
-    }
-
-    private static bool TryEstablishHostTcpConnection(
-        IPAddress ipAddress,
-        int port,
-        out TcpClient client,
-        out NetworkStream stream)
-    {
-        client = null!;
-        stream = null!;
-        if (!TryConnectTcpClient(ipAddress, port, out client))
-        {
-            return false;
-        }
-
-        stream = client.GetStream();
-        return true;
-    }
-
-    private static bool TryConnectTcpClient(IPAddress ipAddress, int port, out TcpClient client)
-    {
-        client = new TcpClient();
-        try
-        {
-            var connectTask = client.ConnectAsync(ipAddress, port);
-            if (!connectTask.Wait(TimeSpan.FromMilliseconds(500)))
-            {
-                client.Dispose();
-                client = null!;
-                return false;
-            }
-
-            return true;
-        }
-        catch (SocketException)
-        {
-            client.Dispose();
-            client = null!;
-            return false;
-        }
-        catch (IOException)
-        {
-            client.Dispose();
-            client = null!;
-            return false;
-        }
-    }
-
-    private static bool TryReadCString(ulong address, CpuContext ctx, out string text)
-    {
-        const int maxLength = 64;
-        var buffer = new byte[maxLength];
-        var length = 0;
-        for (; length < maxLength; length++)
-        {
-            if (!ctx.Memory.TryRead(address + (ulong)length, buffer.AsSpan(length, 1)))
-            {
-                text = string.Empty;
-                return false;
-            }
-
-            if (buffer[length] == 0)
-            {
-                break;
-            }
-        }
-
-        text = Encoding.ASCII.GetString(buffer, 0, length);
-        return true;
-    }
-
-    private static bool TryParseIpv4Address(string text, out byte[] octets)
-    {
-        octets = Array.Empty<byte>();
-        var parts = text.Split('.', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (parts.Length != 4)
-        {
-            return false;
-        }
-
-        var parsed = new byte[4];
-        for (var i = 0; i < 4; i++)
-        {
-            if (!byte.TryParse(parts[i], out parsed[i]))
-            {
-                return false;
-            }
-        }
-
-        octets = parsed;
-        return true;
-    }
-}

src/SharpEmu.Libs/LibcInternalExports.cs

@@ -19,7 +19,7 @@ public static class LibcInternalExports
 
     [SysAbiExport(
         Nid = "NWtTN10cJzE",
-        ExportName = "sceLibcHeapGetTraceInfo",
+        ExportName = "LibcHeapGetTraceInfo",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "LibcInternalExt")]
     public static int LibcHeapGetTraceInfo(CpuContext ctx)

src/SharpEmu.Libs/LibcStdioExports.cs

@@ -338,359 +338,6 @@ public static class LibcStdioExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "8Q60JLJ6Rv4",
-        ExportName = "getc",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Getc(CpuContext ctx) => FgetcCore(ctx);
-
-    [SysAbiExport(
-        Nid = "AEuF3F2f8TA",
-        ExportName = "fgetc",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fgetc(CpuContext ctx) => FgetcCore(ctx);
-
-    private static int FgetcCore(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        if (!_fileHandles.TryGetValue(handle, out var stream))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        try
-        {
-            var value = stream.ReadByte();
-            ctx[CpuRegister.Rax] = value < 0 ? unchecked((ulong)(-1L)) : (ulong)value;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-    }
-
-    [SysAbiExport(
-        Nid = "LxcEU+ICu8U",
-        ExportName = "feof",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Feof(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        var atEnd = _fileHandles.TryGetValue(handle, out var stream) &&
-            stream.CanRead && stream.Position >= stream.Length;
-        ctx[CpuRegister.Rax] = atEnd ? 1UL : 0UL;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "AHxyhN96dy4",
-        ExportName = "ferror",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Ferror(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "3QIPIh-GDjw",
-        ExportName = "rewind",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Rewind(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        if (_fileHandles.TryGetValue(handle, out var stream))
-        {
-            try
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-            }
-            catch (IOException)
-            {
-            }
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "aZK8lNei-Qw",
-        ExportName = "fputc",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fputc(CpuContext ctx)
-    {
-        var character = unchecked((byte)ctx[CpuRegister.Rdi]);
-        var handle = ctx[CpuRegister.Rsi];
-
-        if (_fileHandles.TryGetValue(handle, out var stream))
-        {
-            try
-            {
-                stream.WriteByte(character);
-            }
-            catch (IOException)
-            {
-                ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-            }
-        }
-        else
-        {
-            // Unknown streams are the bundled libc's real stdout/stderr FILE objects;
-            // mirror the fputs HLE and forward them to the host console.
-            Console.Out.Write((char)character);
-        }
-
-        ctx[CpuRegister.Rax] = character;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "MpxhMh8QFro",
-        ExportName = "fwrite",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fwrite(CpuContext ctx)
-    {
-        var source = ctx[CpuRegister.Rdi];
-        var elementSize = ctx[CpuRegister.Rsi];
-        var elementCount = ctx[CpuRegister.Rdx];
-        var handle = ctx[CpuRegister.Rcx];
-
-        if (elementSize == 0 || elementCount == 0)
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        var knownHandle = _fileHandles.TryGetValue(handle, out var stream);
-        if (source == 0)
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        var totalRequested = elementSize * elementCount;
-        var buffer = ArrayPool<byte>.Shared.Rent((int)Math.Min((ulong)ReadChunkSize, totalRequested));
-        ulong totalWritten = 0;
-
-        try
-        {
-            while (totalWritten < totalRequested)
-            {
-                var request = (int)Math.Min((ulong)buffer.Length, totalRequested - totalWritten);
-                if (!ctx.Memory.TryRead(source + totalWritten, buffer.AsSpan(0, request)))
-                {
-                    ctx[CpuRegister.Rax] = totalWritten / elementSize;
-                    return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-                }
-
-                if (knownHandle)
-                {
-                    stream!.Write(buffer, 0, request);
-                }
-                else
-                {
-                    Console.Out.Write(System.Text.Encoding.UTF8.GetString(buffer, 0, request));
-                }
-
-                totalWritten += (ulong)request;
-            }
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = totalWritten / elementSize;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-
-        ctx[CpuRegister.Rax] = totalWritten / elementSize;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "MUjC4lbHrK4",
-        ExportName = "fflush",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fflush(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-
-        try
-        {
-            if (handle == 0)
-            {
-                foreach (var stream in _fileHandles.Values)
-                {
-                    stream.Flush();
-                }
-            }
-            else if (_fileHandles.TryGetValue(handle, out var stream))
-            {
-                stream.Flush();
-            }
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "fffwELXNVFA",
-        ExportName = "fprintf",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fprintf(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        var formatAddress = ctx[CpuRegister.Rsi];
-
-        if (!KernelMemoryCompatExports.TryReadNullTerminatedUtf8(ctx, formatAddress, MaxPathLength, out var format))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var rendered = KernelMemoryCompatExports.FormatStringFromVarArgs(ctx, format, firstGpArgIndex: 2);
-        return WriteRenderedText(ctx, handle, rendered);
-    }
-
-    [SysAbiExport(
-        Nid = "pDBDcY6uLSA",
-        ExportName = "vfprintf",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Vfprintf(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        var formatAddress = ctx[CpuRegister.Rsi];
-        var vaListAddress = ctx[CpuRegister.Rdx];
-
-        if (!KernelMemoryCompatExports.TryReadNullTerminatedUtf8(ctx, formatAddress, MaxPathLength, out var format))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        KernelMemoryCompatExports.TryFormatStringFromVaList(ctx, format, vaListAddress, out var rendered);
-        return WriteRenderedText(ctx, handle, rendered);
-    }
-
-    private static int WriteRenderedText(CpuContext ctx, ulong handle, string rendered)
-    {
-        var payload = System.Text.Encoding.UTF8.GetBytes(rendered);
-
-        if (_fileHandles.TryGetValue(handle, out var stream))
-        {
-            try
-            {
-                stream.Write(payload, 0, payload.Length);
-            }
-            catch (IOException)
-            {
-                ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-            }
-        }
-        else
-        {
-            Console.Out.Write(rendered);
-        }
-
-        ctx[CpuRegister.Rax] = (ulong)payload.Length;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "gkWgn0p1AfU",
-        ExportName = "freopen",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Freopen(CpuContext ctx)
-    {
-        var pathAddress = ctx[CpuRegister.Rdi];
-        var modeAddress = ctx[CpuRegister.Rsi];
-        var handle = ctx[CpuRegister.Rdx];
-
-        if (pathAddress == 0 || modeAddress == 0 || handle == 0 ||
-            !KernelMemoryCompatExports.TryReadNullTerminatedUtf8(ctx, pathAddress, MaxPathLength, out var guestPath) ||
-            !KernelMemoryCompatExports.TryReadNullTerminatedUtf8(ctx, modeAddress, MaxModeLength, out var mode) ||
-            !TryParseFopenMode(mode, out var fileMode, out var fileAccess))
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (_fileHandles.TryRemove(handle, out var previousStream))
-        {
-            previousStream.Dispose();
-        }
-
-        var hostPath = KernelMemoryCompatExports.ResolveGuestPath(guestPath);
-        if (fileAccess != FileAccess.Read && KernelMemoryCompatExports.IsReadOnlyGuestMutationPath(guestPath))
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED;
-        }
-
-        try
-        {
-            if (fileAccess != FileAccess.Read)
-            {
-                var parentDirectory = Path.GetDirectoryName(hostPath);
-                if (!string.IsNullOrWhiteSpace(parentDirectory))
-                {
-                    Directory.CreateDirectory(parentDirectory);
-                }
-            }
-
-            var stream = new FileStream(hostPath, fileMode, fileAccess, FileShare.ReadWrite);
-            // freopen keeps the caller's FILE* identity, so rebind the same handle value.
-            _fileHandles[handle] = stream;
-
-            if (_traceStdio)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][TRACE] freopen: guest='{guestPath}' host='{hostPath}' mode='{mode}' -> OK handle=0x{handle:X}");
-            }
-
-            ctx[CpuRegister.Rax] = handle;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
-        {
-            if (_traceStdio)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][TRACE] freopen: guest='{guestPath}' host='{hostPath}' mode='{mode}' -> FAILED {ex.GetType().Name}: {ex.Message}");
-            }
-
-            ctx[CpuRegister.Rax] = 0;
-            return ex is UnauthorizedAccessException
-                ? (int)OrbisGen2Result.ORBIS_GEN2_ERROR_PERMISSION_DENIED
-                : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
-        }
-    }
-
     [SysAbiExport(
         Nid = "sUP1hBaouOw",
         ExportName = "_Getpctype",

src/SharpEmu.Libs/Network/NetExports.cs

@@ -95,54 +95,6 @@ public static class NetExports
         return ctx.SetReturn(0);
     }
 
-    [SysAbiExport(
-        Nid = "9T2pDF2Ryqg",
-        ExportName = "sceNetHtonl",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNet")]
-    public static int NetHtonl(CpuContext ctx)
-    {
-        var value = unchecked((uint)ctx[CpuRegister.Rdi]);
-        ctx[CpuRegister.Rax] = BinaryPrimitives.ReverseEndianness(value);
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "iWQWrwiSt8A",
-        ExportName = "sceNetHtons",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNet")]
-    public static int NetHtons(CpuContext ctx)
-    {
-        var value = unchecked((ushort)ctx[CpuRegister.Rdi]);
-        ctx[CpuRegister.Rax] = BinaryPrimitives.ReverseEndianness(value);
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "pQGpHYopAIY",
-        ExportName = "sceNetNtohl",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNet")]
-    public static int NetNtohl(CpuContext ctx)
-    {
-        var value = unchecked((uint)ctx[CpuRegister.Rdi]);
-        ctx[CpuRegister.Rax] = BinaryPrimitives.ReverseEndianness(value);
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "Rbvt+5Y2iEw",
-        ExportName = "sceNetNtohs",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNet")]
-    public static int NetNtohs(CpuContext ctx)
-    {
-        var value = unchecked((ushort)ctx[CpuRegister.Rdi]);
-        ctx[CpuRegister.Rax] = BinaryPrimitives.ReverseEndianness(value);
-        return ctx.SetReturn(0);
-    }
-
     [SysAbiExport(
         Nid = "C4UgDHHPvdw",
         ExportName = "sceNetResolverCreate",

src/SharpEmu.Libs/Np/NpManagerExports.cs

@@ -22,17 +22,6 @@ public static class NpManagerExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "S7QTn72PrDw",
-        ExportName = "sceNpDeleteRequest",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpManager")]
-    public static int NpDeleteRequest(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "JELHf4xPufo",
         ExportName = "sceNpCheckCallbackForLib",
@@ -53,19 +42,8 @@ public static class NpManagerExports
         LibraryName = "libSceNpManager")]
     public static int NpGetOnlineId(CpuContext ctx)
     {
-        // Gen5 ABI: user ID, then output structure.
-        return WriteOfflineOnlineId(ctx, ctx[CpuRegister.Rsi]);
-    }
-
-    [SysAbiExport(
-        Nid = "rbknaUjpqWo",
-        ExportName = "sceNpGetOnlineIdA",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpManager")]
-    public static int NpGetOnlineIdA(CpuContext ctx)
-    {
-        // The A variant takes a user ID before OnlineId.
-        return WriteOfflineOnlineId(ctx, ctx[CpuRegister.Rsi]);
+        ctx[CpuRegister.Rax] = 0;
+        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
     [SysAbiExport(
@@ -180,19 +158,4 @@ public static class NpManagerExports
 
         Console.Error.WriteLine($"[LOADER][TRACE] np.{message}");
     }
-
-    private static int WriteOfflineOnlineId(CpuContext ctx, ulong address)
-    {
-        if (address == 0)
-        {
-            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        // SceNpOnlineId is a 16-byte handle plus four trailing bytes.
-        Span<byte> onlineId = stackalloc byte[20];
-        "Player"u8.CopyTo(onlineId);
-        return ctx.Memory.TryWrite(address, onlineId)
-            ? ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK)
-            : ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-    }
 }

src/SharpEmu.Libs/Np/NpWebApi2Exports.cs

@@ -31,18 +31,6 @@ public static class NpWebApi2Exports
         return ctx.SetReturn(0);
     }
 
-    [SysAbiExport(
-        Nid = "WV1GwM32NgY",
-        ExportName = "sceNpWebApi2InitializeForToolkit",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpWebApi2")]
-    public static int NpWebApi2InitializeAlt(CpuContext ctx)
-    {
-        Interlocked.Exchange(ref _initialized, 1);
-        TraceNpWebApi2("init-alt", unchecked((int)ctx[CpuRegister.Rdi]), ctx[CpuRegister.Rsi]);
-        return ctx.SetReturn(0);
-    }
-
     [SysAbiExport(
         Nid = "bEvXpcEk200",
         ExportName = "sceNpWebApi2Terminate",

src/SharpEmu.Libs/Pad/PadExports.cs

@@ -14,18 +14,11 @@ public static class PadExports
     private const int OrbisPadErrorNotInitialized = unchecked((int)0x80920005);
     private const int OrbisPadErrorDeviceNotConnected = unchecked((int)0x80920007);
     private const int OrbisPadErrorDeviceNoHandle = unchecked((int)0x80920008);
-    private const int PrimaryUserId = 1000;
+    private const int PrimaryUserId = 1;
     private const int StandardPortType = 0;
     private const int PrimaryPadHandle = 1;
     private const int ControllerInformationSize = 0x1C;
     private const int PadDataSize = 0x78;
-    private static readonly long InputSampleIntervalTicks = Math.Max(1, Stopwatch.Frequency / 1000);
-
-    [ThreadStatic]
-    private static long _lastInputSampleTicks;
-
-    [ThreadStatic]
-    private static PadState _cachedInputState;
 
     private static bool _initialized;
 
@@ -185,50 +178,6 @@ public static class PadExports
         return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
-    [SysAbiExport(
-        Nid = "2JgFB2n9oUM",
-        ExportName = "scePadSetTriggerEffect",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libScePad")]
-    public static int PadSetTriggerEffect(CpuContext ctx)
-    {
-        var handle = unchecked((int)ctx[CpuRegister.Rdi]);
-        var parameterAddress = ctx[CpuRegister.Rsi];
-        if (handle != PrimaryPadHandle)
-        {
-            return ctx.SetReturn(OrbisPadErrorInvalidHandle);
-        }
-
-        if (parameterAddress == 0)
-        {
-            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        Span<byte> parameter = stackalloc byte[120];
-        if (!ctx.Memory.TryRead(parameterAddress, parameter))
-        {
-            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
-
-        var triggerMask = parameter[0];
-        XInputReader.SetTriggerRumble(
-            (triggerMask & 0x01) != 0 ? DecodeTriggerVibration(parameter[8..64]) : null,
-            (triggerMask & 0x02) != 0 ? DecodeTriggerVibration(parameter[64..120]) : null);
-        return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    private static byte DecodeTriggerVibration(ReadOnlySpan<byte> command)
-    {
-        var mode = BinaryPrimitives.ReadUInt32LittleEndian(command);
-        var amplitude = mode switch
-        {
-            3 when command[10] != 0 => command[9],
-            6 when command[8] != 0 => command[9..19].ToArray().Max(),
-            _ => (byte)0,
-        };
-        return (byte)(Math.Min(amplitude, (byte)8) * 255 / 8);
-    }
-
     [SysAbiExport(
         Nid = "yFVnOdGxvZY",
         ExportName = "scePadSetVibration",
@@ -311,44 +260,6 @@ public static class PadExports
     {
         Span<byte> data = stackalloc byte[PadDataSize];
         data.Clear();
-        var input = ReadHostInputState();
-        var buttons = input.Buttons;
-        var leftX = input.LeftX;
-        var leftY = input.LeftY;
-        var rightX = input.RightX;
-        var rightY = input.RightY;
-        var l2 = input.L2;
-        var r2 = input.R2;
-
-        BinaryPrimitives.WriteUInt32LittleEndian(data[0x00..], buttons);
-        data[0x04] = leftX;
-        data[0x05] = leftY;
-        data[0x06] = rightX;
-        data[0x07] = rightY;
-        data[0x08] = l2;
-        data[0x09] = r2;
-        BinaryPrimitives.WriteSingleLittleEndian(data[0x18..], 1.0f);
-        data[0x4C] = 1;
-        var timestampTicks = Stopwatch.GetTimestamp();
-        var timestampMicroseconds =
-            ((ulong)(timestampTicks / Stopwatch.Frequency) * 1_000_000UL) +
-            ((ulong)(timestampTicks % Stopwatch.Frequency) * 1_000_000UL / (ulong)Stopwatch.Frequency);
-        BinaryPrimitives.WriteUInt64LittleEndian(
-            data[0x50..],
-            timestampMicroseconds);
-        data[0x68] = 1;
-
-        return ctx.Memory.TryWrite(dataAddress, data);
-    }
-
-    private static PadState ReadHostInputState()
-    {
-        var now = Stopwatch.GetTimestamp();
-        if (_lastInputSampleTicks != 0 && now - _lastInputSampleTicks < InputSampleIntervalTicks)
-        {
-            return _cachedInputState;
-        }
-
         var acceptsKeyboardInput = IsEmulatorWindowFocused();
         var buttons = acceptsKeyboardInput ? ReadKeyboardButtons() : 0;
         var leftX = acceptsKeyboardInput ? ReadAnalogStick(IsKeyDown(0x41), IsKeyDown(0x44)) : (byte)128;
@@ -382,17 +293,25 @@ public static class PadExports
             r2 = Math.Max(r2, xpad.R2);
         }
 
-        _cachedInputState = new PadState(
-            Connected: true,
-            Buttons: buttons,
-            LeftX: leftX,
-            LeftY: leftY,
-            RightX: rightX,
-            RightY: rightY,
-            L2: l2,
-            R2: r2);
-        _lastInputSampleTicks = now;
-        return _cachedInputState;
+        BinaryPrimitives.WriteUInt32LittleEndian(data[0x00..], buttons);
+        data[0x04] = leftX;
+        data[0x05] = leftY;
+        data[0x06] = rightX;
+        data[0x07] = rightY;
+        data[0x08] = l2;
+        data[0x09] = r2;
+        BinaryPrimitives.WriteSingleLittleEndian(data[0x18..], 1.0f);
+        data[0x4C] = 1;
+        var timestampTicks = Stopwatch.GetTimestamp();
+        var timestampMicroseconds =
+            ((ulong)(timestampTicks / Stopwatch.Frequency) * 1_000_000UL) +
+            ((ulong)(timestampTicks % Stopwatch.Frequency) * 1_000_000UL / (ulong)Stopwatch.Frequency);
+        BinaryPrimitives.WriteUInt64LittleEndian(
+            data[0x50..],
+            timestampMicroseconds);
+        data[0x68] = 1;
+
+        return ctx.Memory.TryWrite(dataAddress, data);
     }
 
     [DllImport("user32.dll")]

src/SharpEmu.Libs/Pad/XInputReader.cs

@@ -39,8 +39,6 @@ internal static class XInputReader
     private static int _slot = -1; // connected XInput user index, -1 when none
     private static byte _motorLeft;
     private static byte _motorRight;
-    private static byte _triggerLeft;
-    private static byte _triggerRight;
 
     /// <summary>Starts the background reader once; safe to call repeatedly.</summary>
     internal static void EnsureStarted()
@@ -101,31 +99,6 @@ internal static class XInputReader
         }
     }
 
-    /// <summary>Approximates per-trigger vibration on the two XInput body motors.</summary>
-    internal static void SetTriggerRumble(byte? leftTrigger, byte? rightTrigger)
-    {
-        lock (Gate)
-        {
-            var changed = false;
-            if (leftTrigger is { } left)
-            {
-                changed |= _triggerLeft != left;
-                _triggerLeft = left;
-            }
-
-            if (rightTrigger is { } right)
-            {
-                changed |= _triggerRight != right;
-                _triggerRight = right;
-            }
-
-            if (changed)
-            {
-                SendRumbleLocked();
-            }
-        }
-    }
-
     private static void SendRumbleLocked()
     {
         if (_slot < 0)
@@ -135,8 +108,8 @@ internal static class XInputReader
 
         var vibration = new XInputVibration
         {
-            LeftMotorSpeed = (ushort)(Math.Max(_motorLeft, _triggerLeft) * 257),
-            RightMotorSpeed = (ushort)(Math.Max(_motorRight, _triggerRight) * 257),
+            LeftMotorSpeed = (ushort)(_motorLeft * 257),   // 0..255 -> 0..65535
+            RightMotorSpeed = (ushort)(_motorRight * 257),
         };
         _ = XInputSetState((uint)_slot, ref vibration);
     }
@@ -174,8 +147,6 @@ internal static class XInputReader
                     _slot = -1;
                     _motorLeft = 0;
                     _motorRight = 0;
-                    _triggerLeft = 0;
-                    _triggerRight = 0;
                     _state = default;
                 }
 

src/SharpEmu.Libs/PlayGo/PlayGoExports.cs

@@ -682,9 +682,7 @@ public static class PlayGoExports
         var hasMetadata = File.Exists(playGoDat) || File.Exists(scenarioJson) || File.Exists(chunkDefsXml);
         if (!hasMetadata)
         {
-            // Full installs may omit PlayGo sidecar metadata.
-            TracePlayGo("metadata_missing; using fully-installed default chunk");
-            return new PlayGoMetadata(true, [(ushort)0]);
+            return PlayGoMetadata.Empty;
         }
 
         var chunkIds = LoadChunkIds(chunkDefsXml);

src/SharpEmu.Libs/Rtc/RtcExports.cs

@@ -9,189 +9,6 @@ namespace SharpEmu.Libs.Rtc;
 public static class RtcExports
 {
     private const long DateTimeTicksPerMicrosecond = 10;
-    private const ulong MicrosecondsPerSecond = 1_000_000UL;
-    private const ulong MicrosecondsPerMinute = 60_000_000UL;
-    private const ulong MicrosecondsPerHour = 3_600_000_000UL;
-    private const ulong MicrosecondsPerDay = 86_400_000_000UL;
-    private const ulong MicrosecondsPerWeek = 604_800_000_000UL;
-    private const ulong UnixEpochTicks = 62_135_596_800_000_000UL;
-    private const ulong Win32FileTimeEpochTicks = 50_491_123_200_000_000UL;
-
-    [SysAbiExport(
-        Nid = "lPEBYdVX0XQ",
-        ExportName = "sceRtcCheckValid",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcCheckValid(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        if (timeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!TryReadRtcDateTime(ctx, timeAddress, out var time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return ValidateRtcDateTime(time);
-    }
-
-    [SysAbiExport(
-        Nid = "fNaZ4DbzHAE",
-        ExportName = "sceRtcCompareTick",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcCompareTick(CpuContext ctx)
-    {
-        var tick1Address = ctx[CpuRegister.Rdi];
-        var tick2Address = ctx[CpuRegister.Rsi];
-        if (tick1Address == 0 || tick2Address == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!ctx.TryReadUInt64(tick1Address, out var tick1) || !ctx.TryReadUInt64(tick2Address, out var tick2))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return tick1 < tick2 ? -1 : tick1 > tick2 ? 1 : 0;
-    }
-
-    [SysAbiExport(
-        Nid = "8Yr143yEnRo",
-        ExportName = "sceRtcConvertLocalTimeToUtc",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcConvertLocalTimeToUtc(CpuContext ctx)
-    {
-        var tickLocalAddress = ctx[CpuRegister.Rdi];
-        var tickUtcAddress = ctx[CpuRegister.Rsi];
-        if (tickLocalAddress == 0 || tickUtcAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!ctx.TryReadUInt64(tickLocalAddress, out var tickLocal))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryConvertTickToDateTime(tickLocal, out var localDateTime))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        DateTime utcDateTime;
-        try
-        {
-            utcDateTime = TimeZoneInfo.ConvertTimeToUtc(localDateTime, TimeZoneInfo.Local);
-        }
-        catch (ArgumentException)
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (!TryWriteTickFromDateTime(ctx, tickUtcAddress, utcDateTime))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "M1TvFst-jrM",
-        ExportName = "sceRtcConvertUtcToLocalTime",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcConvertUtcToLocalTime(CpuContext ctx)
-    {
-        var tickUtcAddress = ctx[CpuRegister.Rdi];
-        var tickLocalAddress = ctx[CpuRegister.Rsi];
-        if (tickUtcAddress == 0 || tickLocalAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!ctx.TryReadUInt64(tickUtcAddress, out var tickUtc))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryConvertTickToDateTime(tickUtc, out var utcDateTime))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        DateTime localDateTime;
-        try
-        {
-            localDateTime = TimeZoneInfo.ConvertTimeFromUtc(utcDateTime, TimeZoneInfo.Local);
-        }
-        catch (ArgumentException)
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (!TryWriteTickFromDateTime(ctx, tickLocalAddress, localDateTime))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "8SljQx6pDP8",
-        ExportName = "sceRtcEnd",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcEnd(CpuContext ctx)
-    {
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "LN3Zcb72Q0c",
-        ExportName = "sceRtcGetCurrentAdNetworkTick",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetCurrentAdNetworkTick(CpuContext ctx) => RtcGetCurrentTick(ctx);
-
-    [SysAbiExport(
-        Nid = "8lfvnRMqwEM",
-        ExportName = "sceRtcGetCurrentClock",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetCurrentClock(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        if (timeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        var timeZoneMinutes = unchecked((int)ctx[CpuRegister.Rsi]);
-        DateTimeOffset currentTime;
-        try
-        {
-            currentTime = DateTimeOffset.UtcNow.ToOffset(TimeSpan.FromMinutes(timeZoneMinutes));
-        }
-        catch (ArgumentOutOfRangeException)
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (!TryWriteRtcDateTime(ctx, timeAddress, ToRtcDateTime(currentTime.DateTime)))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
 
     [SysAbiExport(
         Nid = "ZPD1YOKI+Kw",
@@ -203,38 +20,30 @@ public static class RtcExports
         var timeAddress = ctx[CpuRegister.Rdi];
         if (timeAddress == 0)
         {
-            return unchecked((int)0x80B50002);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryWriteRtcDateTime(ctx, timeAddress, ToRtcDateTime(DateTimeOffset.Now.DateTime)))
+        var now = DateTimeOffset.Now;
+        Span<byte> rtcDateTime = stackalloc byte[16];
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[0..2], checked((ushort)now.Year));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[2..4], checked((ushort)now.Month));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[4..6], checked((ushort)now.Day));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[6..8], checked((ushort)now.Hour));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[8..10], checked((ushort)now.Minute));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[10..12], checked((ushort)now.Second));
+        BinaryPrimitives.WriteUInt32LittleEndian(
+            rtcDateTime[12..16],
+            checked((uint)((now.Ticks % TimeSpan.TicksPerSecond) / 10)));
+
+        if (!ctx.Memory.TryWrite(timeAddress, rtcDateTime))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
+        ctx[CpuRegister.Rax] = 0;
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "Ot1DE3gif84",
-        ExportName = "sceRtcGetCurrentDebugNetworkTick",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetCurrentDebugNetworkTick(CpuContext ctx) => RtcGetCurrentTick(ctx);
-
-    [SysAbiExport(
-        Nid = "zO9UL3qIINQ",
-        ExportName = "sceRtcGetCurrentNetworkTick",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetCurrentNetworkTick(CpuContext ctx) => RtcGetCurrentTick(ctx);
-
-    [SysAbiExport(
-        Nid = "HWxHOdbM-Pg",
-        ExportName = "sceRtcGetCurrentRawNetworkTick",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetCurrentRawNetworkTick(CpuContext ctx) => RtcGetCurrentTick(ctx);
-
     [SysAbiExport(
         Nid = "18B2NS1y9UU",
         ExportName = "sceRtcGetCurrentTick",
@@ -245,7 +54,7 @@ public static class RtcExports
         var tickAddress = ctx[CpuRegister.Rdi];
         if (tickAddress == 0)
         {
-            return unchecked((int)0x80B50002);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
         var tickValue = unchecked((ulong)(DateTime.UtcNow.Ticks / DateTimeTicksPerMicrosecond));
@@ -254,87 +63,7 @@ public static class RtcExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "CyIK-i4XdgQ",
-        ExportName = "sceRtcGetDayOfWeek",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetDayOfWeek(CpuContext ctx)
-    {
-        var year = unchecked((int)ctx[CpuRegister.Rdi]);
-        var month = unchecked((int)ctx[CpuRegister.Rsi]);
-        var day = unchecked((int)ctx[CpuRegister.Rdx]);
-        if (!IsValidCalendarDate(year, month, day))
-        {
-            return unchecked((int)0x80B50004);
-        }
-
-        return (int)new DateTime(year, month, day).DayOfWeek;
-    }
-
-    [SysAbiExport(
-        Nid = "3O7Ln8AqJ1o",
-        ExportName = "sceRtcGetDaysInMonth",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetDaysInMonth(CpuContext ctx)
-    {
-        var year = unchecked((int)ctx[CpuRegister.Rdi]);
-        var month = unchecked((int)ctx[CpuRegister.Rsi]);
-        if (year < 1 || year > 9999)
-        {
-            return unchecked((int)0x80B50008);
-        }
-
-        if (month < 1 || month > 12)
-        {
-            return unchecked((int)0x80B50009);
-        }
-
-        return DateTime.DaysInMonth(year, month);
-    }
-
-    [SysAbiExport(
-        Nid = "E7AR4o7Ny7E",
-        ExportName = "sceRtcGetDosTime",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetDosTime(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        var dosTimeAddress = ctx[CpuRegister.Rsi];
-        if (timeAddress == 0 || dosTimeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!TryReadRtcDateTime(ctx, timeAddress, out var time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var validationResult = ValidateRtcDateTime(time);
-        if (validationResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return validationResult;
-        }
-
-        uint dosTime = 0;
-        dosTime |= (uint)((time.Second / 2) & 0x1F);
-        dosTime |= (uint)(time.Minute & 0x3F) << 5;
-        dosTime |= (uint)(time.Hour & 0x1F) << 11;
-        dosTime |= (uint)(time.Day & 0x1F) << 16;
-        dosTime |= (uint)(time.Month & 0x0F) << 21;
-        dosTime |= (uint)((time.Year - 1980) & 0x7F) << 25;
-
-        if (!ctx.TryWriteUInt32(dosTimeAddress, dosTime))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
+        ctx[CpuRegister.Rax] = 0;
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
@@ -345,220 +74,45 @@ public static class RtcExports
         LibraryName = "libSceRtc")]
     public static int RtcGetTick(CpuContext ctx)
     {
-        var timeAddress = ctx[CpuRegister.Rdi];
+        var dateTimeAddress = ctx[CpuRegister.Rdi];
         var tickAddress = ctx[CpuRegister.Rsi];
-        if (timeAddress == 0 || tickAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!TryReadRtcDateTime(ctx, timeAddress, out var time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var validationResult = ValidateRtcDateTime(time);
-        if (validationResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return validationResult;
-        }
-
-        if (!TryConvertRtcDateTimeToTick(time, out var tick))
+        if (dateTimeAddress == 0 || tickAddress == 0)
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!ctx.TryWriteUInt64(tickAddress, tick))
+        if (!TryReadRtcDateTime(ctx, dateTimeAddress, out var rtcDateTime))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "jMNwqYr4R-k",
-        ExportName = "sceRtcGetTickResolution",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetTickResolution(CpuContext ctx)
-    {
-        return (int)MicrosecondsPerSecond;
-    }
-
-    [SysAbiExport(
-        Nid = "BtqmpTRXHgk",
-        ExportName = "sceRtcGetTime_t",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetTimeT(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        var timeTAddress = ctx[CpuRegister.Rsi];
-        if (timeAddress == 0 || timeTAddress == 0)
+        ulong tickValue;
+        try
         {
-            return unchecked((int)0x80B50002);
+            var baseDateTime = new DateTime(
+                rtcDateTime.Year,
+                rtcDateTime.Month,
+                rtcDateTime.Day,
+                rtcDateTime.Hour,
+                rtcDateTime.Minute,
+                rtcDateTime.Second,
+                DateTimeKind.Utc);
+            tickValue = checked((ulong)((baseDateTime.Ticks / DateTimeTicksPerMicrosecond) + rtcDateTime.Microsecond));
         }
-
-        if (!TryReadRtcDateTime(ctx, timeAddress, out var time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var validationResult = ValidateRtcDateTime(time);
-        if (validationResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return validationResult;
-        }
-
-        if (!TryConvertRtcDateTimeToTick(time, out var tick))
+        catch (Exception ex) when (ex is ArgumentOutOfRangeException or OverflowException)
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        var unixSeconds = tick < UnixEpochTicks ? 0UL : (tick - UnixEpochTicks) / MicrosecondsPerSecond;
-        if (!ctx.TryWriteUInt64(timeTAddress, unixSeconds))
+        if (!ctx.TryWriteUInt64(tickAddress, tickValue))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
+        ctx[CpuRegister.Rax] = 0;
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    [SysAbiExport(
-        Nid = "jfRO0uTjtzA",
-        ExportName = "sceRtcGetWin32FileTime",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcGetWin32FileTime(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        var fileTimeAddress = ctx[CpuRegister.Rsi];
-        if (timeAddress == 0 || fileTimeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!TryReadRtcDateTime(ctx, timeAddress, out var time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        var validationResult = ValidateRtcDateTime(time);
-        if (validationResult != (int)OrbisGen2Result.ORBIS_GEN2_OK)
-        {
-            return validationResult;
-        }
-
-        if (!TryConvertRtcDateTimeToTick(time, out var tick))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        var win32Time = tick < Win32FileTimeEpochTicks ? 0UL : (tick - Win32FileTimeEpochTicks) * 10UL;
-        if (!ctx.TryWriteUInt64(fileTimeAddress, win32Time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "LlodCMDbk3o",
-        ExportName = "sceRtcInit",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcInit(CpuContext ctx)
-    {
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "Ug8pCwQvh0c",
-        ExportName = "sceRtcIsLeapYear",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcIsLeapYear(CpuContext ctx)
-    {
-        var year = unchecked((int)ctx[CpuRegister.Rdi]);
-        if (year < 1 || year > 9999)
-        {
-            return unchecked((int)0x80B50008);
-        }
-
-        return DateTime.IsLeapYear(year) ? 1 : 0;
-    }
-
-    [SysAbiExport(
-        Nid = "NR1J0N7L2xY",
-        ExportName = "sceRtcTickAddDays",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddDays(CpuContext ctx) => AddTickDelta(ctx, MicrosecondsPerDay);
-
-    [SysAbiExport(
-        Nid = "MDc5cd8HfCA",
-        ExportName = "sceRtcTickAddHours",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddHours(CpuContext ctx) => AddTickDelta(ctx, MicrosecondsPerHour);
-
-    [SysAbiExport(
-        Nid = "XPIiw58C+GM",
-        ExportName = "sceRtcTickAddMicroseconds",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddMicroseconds(CpuContext ctx) => AddTickDelta(ctx, 1UL);
-
-    [SysAbiExport(
-        Nid = "mn-tf4QiFzk",
-        ExportName = "sceRtcTickAddMinutes",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddMinutes(CpuContext ctx) => AddTickDelta(ctx, MicrosecondsPerMinute);
-
-    [SysAbiExport(
-        Nid = "CL6y9q-XbuQ",
-        ExportName = "sceRtcTickAddMonths",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddMonths(CpuContext ctx)
-    {
-        return AddCalendarDelta(ctx, dateTime => dateTime.AddMonths(unchecked((int)ctx[CpuRegister.Rdx])));
-    }
-
-    [SysAbiExport(
-        Nid = "07O525HgICs",
-        ExportName = "sceRtcTickAddSeconds",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddSeconds(CpuContext ctx) => AddTickDelta(ctx, MicrosecondsPerSecond);
-
-    [SysAbiExport(
-        Nid = "AqVMssr52Rc",
-        ExportName = "sceRtcTickAddTicks",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddTicks(CpuContext ctx) => AddTickDelta(ctx, 1UL);
-
-    [SysAbiExport(
-        Nid = "gI4t194c2W8",
-        ExportName = "sceRtcTickAddWeeks",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddWeeks(CpuContext ctx) => AddTickDelta(ctx, MicrosecondsPerWeek);
-
-    [SysAbiExport(
-        Nid = "-5y2uJ62qS8",
-        ExportName = "sceRtcTickAddYears",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcTickAddYears(CpuContext ctx)
-    {
-        return AddCalendarDelta(ctx, dateTime => dateTime.AddYears(unchecked((int)ctx[CpuRegister.Rdx])));
-    }
-
     [SysAbiExport(
         Nid = "ueega6v3GUw",
         ExportName = "sceRtcSetTick",
@@ -566,11 +120,11 @@ public static class RtcExports
         LibraryName = "libSceRtc")]
     public static int RtcSetTick(CpuContext ctx)
     {
-        var timeAddress = ctx[CpuRegister.Rdi];
+        var dateTimeAddress = ctx[CpuRegister.Rdi];
         var tickAddress = ctx[CpuRegister.Rsi];
-        if (timeAddress == 0 || tickAddress == 0)
+        if (dateTimeAddress == 0 || tickAddress == 0)
         {
-            return unchecked((int)0x80B50002);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
         if (!ctx.TryReadUInt64(tickAddress, out var tickValue))
@@ -578,249 +132,40 @@ public static class RtcExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
-        if (!TryConvertTickToRtcDateTime(tickValue, out var time))
+        if (tickValue > long.MaxValue / DateTimeTicksPerMicrosecond)
         {
-            return unchecked((int)0x80B50004);
-        }
-
-        if (!TryWriteRtcDateTime(ctx, timeAddress, time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "aYPCd1cChyg",
-        ExportName = "sceRtcSetDosTime",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcSetDosTime(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        if (timeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        var dosTime = unchecked((uint)ctx[CpuRegister.Rsi]);
-        var time = new RtcDateTime(
-            (ushort)(1980 + ((dosTime >> 25) & 0x7F)),
-            (ushort)((dosTime >> 21) & 0x0F),
-            (ushort)((dosTime >> 16) & 0x1F),
-            (ushort)((dosTime >> 11) & 0x1F),
-            (ushort)((dosTime >> 5) & 0x3F),
-            (ushort)((dosTime << 1) & 0x3E),
-            0);
-
-        if (!TryWriteRtcDateTime(ctx, timeAddress, time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "bDEVVP4bTjQ",
-        ExportName = "sceRtcSetTime_t",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcSetTimeT(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        if (timeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        var timeSeconds = unchecked((long)ctx[CpuRegister.Rsi]);
-        if (timeSeconds < 0)
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        var tick = UnixEpochTicks + unchecked((ulong)timeSeconds) * MicrosecondsPerSecond;
-        if (!TryConvertTickToRtcDateTime(tick, out var time))
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        if (!TryWriteRtcDateTime(ctx, timeAddress, time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "n5JiAJXsbcs",
-        ExportName = "sceRtcSetWin32FileTime",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceRtc")]
-    public static int RtcSetWin32FileTime(CpuContext ctx)
-    {
-        var timeAddress = ctx[CpuRegister.Rdi];
-        if (timeAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        var fileTime = unchecked((long)ctx[CpuRegister.Rsi]);
-        if (fileTime < 0)
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        var tick = Win32FileTimeEpochTicks + unchecked((ulong)fileTime / 10UL);
-        if (!TryConvertTickToRtcDateTime(tick, out var time))
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        if (!TryWriteRtcDateTime(ctx, timeAddress, time))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static int AddTickDelta(CpuContext ctx, ulong microsecondsPerUnit)
-    {
-        var destinationAddress = ctx[CpuRegister.Rdi];
-        var sourceAddress = ctx[CpuRegister.Rsi];
-        var delta = unchecked((long)ctx[CpuRegister.Rdx]);
-        if (destinationAddress == 0 || sourceAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!ctx.TryReadUInt64(sourceAddress, out var sourceTick))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
+        DateTime dateTime;
         try
         {
-            var resultTick = checked((long)sourceTick + checked(delta * (long)microsecondsPerUnit));
-            if (resultTick < 0)
-            {
-                return unchecked((int)0x80B50003);
-            }
-
-            if (!ctx.TryWriteUInt64(destinationAddress, unchecked((ulong)resultTick)))
-            {
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-        }
-        catch (OverflowException)
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static int AddCalendarDelta(CpuContext ctx, Func<DateTime, DateTime> transform)
-    {
-        var destinationAddress = ctx[CpuRegister.Rdi];
-        var sourceAddress = ctx[CpuRegister.Rsi];
-        if (destinationAddress == 0 || sourceAddress == 0)
-        {
-            return unchecked((int)0x80B50002);
-        }
-
-        if (!ctx.TryReadUInt64(sourceAddress, out var sourceTick))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        if (!TryConvertTickToDateTime(sourceTick, out var sourceDateTime))
-        {
-            return unchecked((int)0x80B50003);
-        }
-
-        DateTime resultDateTime;
-        try
-        {
-            resultDateTime = transform(sourceDateTime);
+            dateTime = new DateTime(checked((long)tickValue * DateTimeTicksPerMicrosecond), DateTimeKind.Utc);
         }
         catch (ArgumentOutOfRangeException)
         {
-            return unchecked((int)0x80B50003);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
         }
 
-        if (!TryWriteTickFromDateTime(ctx, destinationAddress, resultDateTime))
+        if (!TryWriteRtcDateTime(ctx, dateTimeAddress, dateTime))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
+        ctx[CpuRegister.Rax] = 0;
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    private static int ValidateRtcDateTime(RtcDateTime time)
-    {
-        if (time.Year < 1 || time.Year > 9999)
-        {
-            return unchecked((int)0x80B50008);
-        }
-
-        if (time.Month < 1 || time.Month > 12)
-        {
-            return unchecked((int)0x80B50009);
-        }
-
-        if (time.Day < 1 || time.Day > DateTime.DaysInMonth(time.Year, time.Month))
-        {
-            return unchecked((int)0x80B5000A);
-        }
-
-        if (time.Hour > 23)
-        {
-            return unchecked((int)0x80B5000B);
-        }
-
-        if (time.Minute > 59)
-        {
-            return unchecked((int)0x80B5000C);
-        }
-
-        if (time.Second > 59)
-        {
-            return unchecked((int)0x80B5000D);
-        }
-
-        if (time.Microsecond > 999_999)
-        {
-            return unchecked((int)0x80B5000E);
-        }
-
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static bool IsValidCalendarDate(int year, int month, int day)
-    {
-        if (year < 1 || year > 9999 || month < 1 || month > 12)
-        {
-            return false;
-        }
-
-        return day >= 1 && day <= DateTime.DaysInMonth(year, month);
-    }
-
-    private static bool TryReadRtcDateTime(CpuContext ctx, ulong address, out RtcDateTime time)
+    private static bool TryReadRtcDateTime(CpuContext ctx, ulong address, out RtcDateTime rtcDateTime)
     {
         Span<byte> buffer = stackalloc byte[16];
         if (!ctx.Memory.TryRead(address, buffer))
         {
-            time = default;
+            rtcDateTime = default;
             return false;
         }
 
-        time = new RtcDateTime(
+        rtcDateTime = new RtcDateTime(
             BinaryPrimitives.ReadUInt16LittleEndian(buffer[0..2]),
             BinaryPrimitives.ReadUInt16LittleEndian(buffer[2..4]),
             BinaryPrimitives.ReadUInt16LittleEndian(buffer[4..6]),
@@ -831,117 +176,19 @@ public static class RtcExports
         return true;
     }
 
-    private static bool TryWriteRtcDateTime(CpuContext ctx, ulong address, RtcDateTime dateTime)
+    private static bool TryWriteRtcDateTime(CpuContext ctx, ulong address, DateTime dateTime)
     {
-        Span<byte> buffer = stackalloc byte[16];
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[0..2], dateTime.Year);
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[2..4], dateTime.Month);
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[4..6], dateTime.Day);
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[6..8], dateTime.Hour);
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[8..10], dateTime.Minute);
-        BinaryPrimitives.WriteUInt16LittleEndian(buffer[10..12], dateTime.Second);
-        BinaryPrimitives.WriteUInt32LittleEndian(buffer[12..16], dateTime.Microsecond);
-        return ctx.Memory.TryWrite(address, buffer);
-    }
-
-    private static RtcDateTime ToRtcDateTime(DateTime dateTime)
-    {
-        return new RtcDateTime(
-            (ushort)dateTime.Year,
-            (ushort)dateTime.Month,
-            (ushort)dateTime.Day,
-            (ushort)dateTime.Hour,
-            (ushort)dateTime.Minute,
-            (ushort)dateTime.Second,
-            (uint)(dateTime.Ticks % TimeSpan.TicksPerSecond / DateTimeTicksPerMicrosecond));
-    }
-
-    private static RtcDateTime ToRtcDateTime(DateTimeOffset dateTimeOffset)
-    {
-        return ToRtcDateTime(dateTimeOffset.DateTime);
-    }
-
-    private static bool TryWriteTickFromDateTime(CpuContext ctx, ulong address, DateTime dateTime)
-    {
-        return ctx.TryWriteUInt64(address, unchecked((ulong)(dateTime.Ticks / DateTimeTicksPerMicrosecond)));
-    }
-
-    private static bool TryConvertTickToDateTime(ulong tick, out DateTime dateTime)
-    {
-        var maxSupportedTick = unchecked((ulong)(DateTime.MaxValue.Ticks / DateTimeTicksPerMicrosecond));
-        if (tick > maxSupportedTick)
-        {
-            dateTime = default;
-            return false;
-        }
-
-        try
-        {
-            dateTime = new DateTime(checked((long)(tick * (ulong)DateTimeTicksPerMicrosecond)), DateTimeKind.Utc);
-            return true;
-        }
-        catch (ArgumentOutOfRangeException)
-        {
-            dateTime = default;
-            return false;
-        }
-    }
-
-    private static bool TryConvertRtcDateTimeToTick(RtcDateTime time, out ulong tick)
-    {
-        try
-        {
-            var year = time.Year;
-            var month = time.Month;
-            var day = time.Day;
-            if (month > 2)
-            {
-                month -= 3;
-            }
-            else
-            {
-                month += 9;
-                year -= 1;
-            }
-
-            var century = year / 100;
-            var yearOfCentury = year - (100 * century);
-
-            ulong days = ((146097UL * (ulong)century) >> 2)
-                + ((1461UL * (ulong)yearOfCentury) >> 2)
-                + ((153UL * (ulong)month + 2UL) / 5UL)
-                + day;
-            days -= 307UL;
-            days *= MicrosecondsPerDay;
-
-            var timeOfDay = (ulong)time.Hour * MicrosecondsPerHour
-                + (ulong)time.Minute * MicrosecondsPerMinute
-                + (ulong)time.Second * MicrosecondsPerSecond
-                + time.Microsecond;
-
-            tick = days + timeOfDay;
-            return true;
-        }
-        catch (OverflowException)
-        {
-            tick = 0;
-            return false;
-        }
-    }
-
-    private static bool TryConvertTickToRtcDateTime(ulong tick, out RtcDateTime time)
-    {
-        try
-        {
-            var dateTime = new DateTime(checked((long)(tick * DateTimeTicksPerMicrosecond)), DateTimeKind.Utc);
-            time = ToRtcDateTime(dateTime);
-            return true;
-        }
-        catch (ArgumentOutOfRangeException)
-        {
-            time = default;
-            return false;
-        }
+        Span<byte> rtcDateTime = stackalloc byte[16];
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[0..2], checked((ushort)dateTime.Year));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[2..4], checked((ushort)dateTime.Month));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[4..6], checked((ushort)dateTime.Day));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[6..8], checked((ushort)dateTime.Hour));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[8..10], checked((ushort)dateTime.Minute));
+        BinaryPrimitives.WriteUInt16LittleEndian(rtcDateTime[10..12], checked((ushort)dateTime.Second));
+        BinaryPrimitives.WriteUInt32LittleEndian(
+            rtcDateTime[12..16],
+            checked((uint)((dateTime.Ticks % TimeSpan.TicksPerSecond) / DateTimeTicksPerMicrosecond)));
+        return ctx.Memory.TryWrite(address, rtcDateTime);
     }
 
     private readonly record struct RtcDateTime(

src/SharpEmu.Libs/SaveData/SaveDataExports.cs

@@ -30,17 +30,13 @@ public static class SaveDataExports
     private const uint MountModeCreate2 = 1u << 5;
     private const int MountResultSize = 0x40;
     private static readonly object _stateGate = new();
-    private static readonly HashSet<int> _transactionResources = [];
     private static string? _titleId;
-    private static int _nextTransactionResource;
 
     public static void ConfigureApplicationInfo(string? titleId)
     {
         lock (_stateGate)
         {
             _titleId = string.IsNullOrWhiteSpace(titleId) ? null : SanitizePathSegment(titleId.Trim());
-            _transactionResources.Clear();
-            _nextTransactionResource = 0;
         }
     }
 
@@ -248,6 +244,7 @@ public static class SaveDataExports
         }
     }
 
+    private static int _nextTransactionResource;
     [SysAbiExport(
         Nid = "gjRZNnw0JPE",
         ExportName = "sceSaveDataCreateTransactionResource",
@@ -255,32 +252,25 @@ public static class SaveDataExports
         LibraryName = "libSceSaveData")]
     public static int SaveDataCreateTransactionResource(CpuContext ctx)
     {
-        var memorySize = ctx[CpuRegister.Rdi];
-        int resource;
-        lock (_stateGate)
+        var userId = unchecked((int)ctx[CpuRegister.Rdi]);
+        var reserved = ctx[CpuRegister.Rsi];
+        var resourceAddress = ctx[CpuRegister.Rdx];
+
+        if (resourceAddress == 0)
         {
-            resource = ++_nextTransactionResource;
-            _transactionResources.Add(resource);
+            return ctx.SetReturn(OrbisSaveDataErrorParameter);
         }
 
-        TraceSaveData($"create_transaction_resource memory_size=0x{memorySize:X} resource={resource}");
-        return ctx.SetReturn(resource);
-    }
+        var id = (uint)Interlocked.Increment(ref _nextTransactionResource);
 
-    [SysAbiExport(
-        Nid = "lJUQuaKqoKY",
-        ExportName = "sceSaveDataDeleteTransactionResource",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceSaveData")]
-    public static int SaveDataDeleteTransactionResource(CpuContext ctx)
-    {
-        var resource = unchecked((int)ctx[CpuRegister.Rdi]);
-        lock (_stateGate)
+        if (!ctx.TryWriteUInt32(resourceAddress, id))
         {
-            _transactionResources.Remove(resource);
+            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
         }
 
-        TraceSaveData($"delete_transaction_resource resource={resource}");
+        TraceSaveData(
+            $"create_transaction_resource user={userId} reserved=0x{reserved:X} resource_addr=0x{resourceAddress:X} id={id}");
+
         return ctx.SetReturn(0);
     }
 

src/SharpEmu.Libs/UserService/UserServiceExports.cs

@@ -13,8 +13,7 @@ public static class UserServiceExports
     private const int OrbisUserServiceErrorNoEvent = unchecked((int)0x80960007);
     private const int OrbisUserServiceErrorInvalidParameter = unchecked((int)0x80960009);
     private const int OrbisUserServiceErrorBufferTooShort = unchecked((int)0x8096000A);
-    // Retail user-service IDs begin at 0x3E8.
-    private const int PrimaryUserId = 1000;
+    private const int PrimaryUserId = 1;
     private const int InvalidUserId = -1;
     private const string PrimaryUserName = "SharpEmu";
     private static int _loginEventDelivered;
@@ -112,8 +111,7 @@ public static class UserServiceExports
         var userId = unchecked((int)ctx[CpuRegister.Rdi]);
         var nameAddress = ctx[CpuRegister.Rsi];
         var capacity = ctx[CpuRegister.Rdx];
-        // Zero selects the current user.
-        if (userId != 0 && userId != PrimaryUserId)
+        if (userId != PrimaryUserId)
         {
             return ctx.SetReturn(OrbisUserServiceErrorInvalidParameter);
         }
@@ -139,28 +137,6 @@ public static class UserServiceExports
         return ctx.SetReturn(result);
     }
 
-    [SysAbiExport(
-        Nid = "-sD02mFDBh4",
-        ExportName = "sceUserServiceGetGamePresets",
-        Target = Generation.Gen5,
-        LibraryName = "libSceUserService")]
-    public static int UserServiceGetGamePresets(CpuContext ctx)
-    {
-        // Return deterministic defaults for the offline profile.
-        var userId = unchecked((int)ctx[CpuRegister.Rdi]);
-        var resultAddress = ctx[CpuRegister.Rcx];
-        Span<byte> defaults = stackalloc byte[0x18];
-        if (resultAddress == 0 || !ctx.Memory.TryWrite(resultAddress, defaults))
-        {
-            return ctx.SetReturn(OrbisUserServiceErrorInvalidArgument);
-        }
-
-        TraceUserService(
-            $"get_game_presets user={userId} title=0x{ctx[CpuRegister.Rsi]:X16} " +
-            $"key=0x{ctx[CpuRegister.R9]:X} out=0x{resultAddress:X16} result=0x00000000");
-        return ctx.SetReturn(0);
-    }
-
     [SysAbiExport(
         Nid = "D-CzAxQL0XI",
         ExportName = "sceUserServiceGetPlatformPrivacySetting",

src/SharpEmu.Libs/VideoOut/PngSplashLoader.cs

@@ -14,17 +14,6 @@ internal static class PngSplashLoader
     ];
 
     public static bool TryLoad(out byte[] pixels, out uint width, out uint height)
-        => TryLoad("pic0.png", requestRgba: false, out pixels, out width, out height);
-
-    public static bool TryLoadIcon(out byte[] pixels, out uint width, out uint height)
-        => TryLoad("icon0.png", requestRgba: true, out pixels, out width, out height);
-
-    private static bool TryLoad(
-        string fileName,
-        bool requestRgba,
-        out byte[] pixels,
-        out uint width,
-        out uint height)
     {
         pixels = [];
         width = 0;
@@ -38,18 +27,13 @@ internal static class PngSplashLoader
                 return false;
             }
 
-            var path = Path.Combine(app0Root, "sce_sys", fileName);
+            var path = Path.Combine(app0Root, "sce_sys", "pic0.png");
             if (!File.Exists(path))
             {
                 return false;
             }
 
-            return TryDecode(
-                File.ReadAllBytes(path),
-                out pixels,
-                out width,
-                out height,
-                requestRgba);
+            return TryDecode(File.ReadAllBytes(path), out pixels, out width, out height);
         }
         catch
         {
@@ -64,8 +48,7 @@ internal static class PngSplashLoader
         ReadOnlySpan<byte> png,
         out byte[] pixels,
         out uint width,
-        out uint height,
-        bool requestRgba)
+        out uint height)
     {
         pixels = [];
         width = 0;
@@ -171,13 +154,9 @@ internal static class PngSplashLoader
              sourceOffset < reconstructed.Length;
              sourceOffset += sourceBytesPerPixel, targetOffset += 4)
         {
-            pixels[targetOffset] = requestRgba
-                ? reconstructed[sourceOffset]
-                : reconstructed[sourceOffset + 2];
+            pixels[targetOffset] = reconstructed[sourceOffset + 2];
             pixels[targetOffset + 1] = reconstructed[sourceOffset + 1];
-            pixels[targetOffset + 2] = requestRgba
-                ? reconstructed[sourceOffset + 2]
-                : reconstructed[sourceOffset];
+            pixels[targetOffset + 2] = reconstructed[sourceOffset];
             pixels[targetOffset + 3] = sourceBytesPerPixel == 4
                 ? reconstructed[sourceOffset + 3]
                 : (byte)0xFF;

src/SharpEmu.Libs/VideoOut/VideoOutExports.cs

@@ -3,7 +3,6 @@
 
 using SharpEmu.HLE;
 using SharpEmu.Libs.Kernel;
-using SharpEmu.Logging;
 using System.Buffers.Binary;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -46,116 +45,10 @@ public static class VideoOutExports
     private static readonly object _stateGate = new();
     private static readonly object _frameDumpGate = new();
     private static readonly Dictionary<int, VideoOutPortState> _ports = new();
-
-    // Hardware raises vblank autonomously; UE blocks its frame loop on it.
-    private const double VblankHz = 60.0;
-    private const int VblankWaitTimeoutMilliseconds = 100;
-    private static Thread? _vblankPumpThread;
-    private static int _vblankPumpStarted;
-
-    private static readonly object _vblankEdgeGate = new();
-    private static ulong _vblankEdgeSequence;
-    private static long _vblankMissedEdges;
-
-    private static void EnsureVblankPumpStarted()
-    {
-        if (Interlocked.Exchange(ref _vblankPumpStarted, 1) != 0)
-        {
-            return;
-        }
-
-        HostTimerResolution.Request();
-
-        _vblankPumpThread = new Thread(VblankPumpLoop)
-        {
-            IsBackground = true,
-            Name = "SharpEmu VideoOut vblank",
-            Priority = ThreadPriority.AboveNormal,
-        };
-        _vblankPumpThread.Start();
-    }
-
-    private static void VblankPumpLoop()
-    {
-        var intervalTicks = Math.Max(1L, (long)(Stopwatch.Frequency / VblankHz));
-        var nextEdge = Stopwatch.GetTimestamp() + intervalTicks;
-
-        while (true)
-        {
-            WaitUntilTimestamp(nextEdge);
-            PumpVblanks();
-
-            nextEdge += intervalTicks;
-
-            var now = Stopwatch.GetTimestamp();
-            if (nextEdge < now)
-            {
-                var missed = (now - nextEdge) / intervalTicks + 1;
-                Interlocked.Add(ref _vblankMissedEdges, missed);
-                nextEdge = now + intervalTicks;
-            }
-        }
-    }
-
-    private static void WaitUntilTimestamp(long deadlineTicks)
-    {
-        var spinThresholdTicks = Stopwatch.Frequency * 2L / 1000L;
-
-        while (true)
-        {
-            var remaining = deadlineTicks - Stopwatch.GetTimestamp();
-            if (remaining <= 0)
-            {
-                return;
-            }
-
-            if (remaining > spinThresholdTicks)
-            {
-                var sleepMilliseconds =
-                    (int)((remaining - spinThresholdTicks) * 1000L / Stopwatch.Frequency);
-                if (sleepMilliseconds > 0)
-                {
-                    Thread.Sleep(sleepMilliseconds);
-                    continue;
-                }
-            }
-
-            Thread.SpinWait(64);
-        }
-    }
-
-    private static void PumpVblanks()
-    {
-        lock (_vblankEdgeGate)
-        {
-            _vblankEdgeSequence++;
-            Monitor.PulseAll(_vblankEdgeGate);
-        }
-
-        VideoOutPortState[] ports;
-        lock (_stateGate)
-        {
-            if (_ports.Count == 0)
-            {
-                return;
-            }
-
-            // Signalling reaches WakeBlockedThreads -> Pump(), which serialises on one global
-            // flag. Waking an unwatched queue would hold it 60x/sec and starve guest threads.
-            ports = _ports.Values.Where(static port => port.VblankEvents.Count != 0).ToArray();
-        }
-
-        foreach (var port in ports)
-        {
-            SignalVblank(port);
-        }
-    }
-
     private static readonly Dictionary<(int Handle, int BufferIndex, ulong Address), ulong> _lastFrameFingerprints = new();
     private static int _nextHandle = 1;
     private static int _frameDumpCount;
     private static long _nextFrameDumpIndex;
-    private static string _windowTitleBase = "SharpEmu VideoOut";
     private static string _windowTitle = "SharpEmu VideoOut";
     private static readonly bool _logFrameRate = string.Equals(
         Environment.GetEnvironmentVariable("SHARPEMU_LOG_VIDEOOUT_FPS"),
@@ -165,10 +58,6 @@ public static class VideoOutExports
         Environment.GetEnvironmentVariable("SHARPEMU_LOG_VIDEOOUT_SYNC"),
         "1",
         StringComparison.Ordinal);
-    private static readonly bool _dumpVideoOut = string.Equals(
-        Environment.GetEnvironmentVariable("SHARPEMU_DUMP_VIDEOOUT"),
-        "1",
-        StringComparison.Ordinal);
     private static long _frameRateWindowStart = Stopwatch.GetTimestamp();
     private static long _submittedFrameCount;
     private static long _presentedFrameCount;
@@ -191,24 +80,9 @@ public static class VideoOutExports
         var application = parts.Count == 0 ? "VideoOut" : string.Join(' ', parts);
         var versionSuffix = string.IsNullOrWhiteSpace(version) ? string.Empty : $" v{version.Trim()}";
         var commitSuffix = string.IsNullOrWhiteSpace(emulatorCommitSha) ? string.Empty : $" \u00b7 {emulatorCommitSha.Trim()}";
-        var hardwareSuffix = $" \u00b7 {HostSystemInfo.CpuName}";
         lock (_stateGate)
         {
-            _windowTitleBase = $"SharpEmu{commitSuffix} - {application}{versionSuffix}{hardwareSuffix}";
-            _windowTitle = $"{_windowTitleBase} \u00b7 {HostSystemInfo.GpuName}";
-        }
-    }
-
-    internal static void SetSelectedGpuName(string gpuName)
-    {
-        if (string.IsNullOrWhiteSpace(gpuName))
-        {
-            return;
-        }
-
-        lock (_stateGate)
-        {
-            _windowTitle = $"{_windowTitleBase} \u00b7 {gpuName.Trim()}";
+            _windowTitle = $"SharpEmu{commitSuffix} - {application}{versionSuffix}";
         }
     }
 
@@ -303,7 +177,6 @@ public static class VideoOutExports
             {
                 Handle = handle,
             };
-            EnsureVblankPumpStarted();
             return handle;
         }
     }
@@ -447,20 +320,7 @@ public static class VideoOutExports
             return OrbisVideoOutErrorInvalidHandle;
         }
 
-        EnsureVblankPumpStarted();
-
-        lock (_vblankEdgeGate)
-        {
-            var entryEdge = _vblankEdgeSequence;
-            while (_vblankEdgeSequence == entryEdge)
-            {
-                if (!Monitor.Wait(_vblankEdgeGate, VblankWaitTimeoutMilliseconds))
-                {
-                    break;
-                }
-            }
-        }
-
+        Thread.Sleep(1);
         SignalVblank(port);
 
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
@@ -1071,7 +931,10 @@ public static class VideoOutExports
                 displayBuffer.PitchInPixel);
         }
 
-        if (_dumpVideoOut)
+        if (string.Equals(
+                Environment.GetEnvironmentVariable("SHARPEMU_DUMP_VIDEOOUT"),
+                "1",
+                StringComparison.Ordinal))
         {
             _ = TryDumpFrame(ctx, port, bufferIndex, flipMode, flipArg);
         }
@@ -1131,11 +994,9 @@ public static class VideoOutExports
         var elapsedSeconds = (double)elapsedTicks / Stopwatch.Frequency;
         var submitted = Interlocked.Exchange(ref _submittedFrameCount, 0);
         var presentedCount = Interlocked.Exchange(ref _presentedFrameCount, 0);
-        var missedEdges = Interlocked.Exchange(ref _vblankMissedEdges, 0);
         Console.Error.WriteLine(
             $"[LOADER][PERF] videoout submitted_fps={submitted / elapsedSeconds:F1} " +
-            $"presented_fps={presentedCount / elapsedSeconds:F1} " +
-            $"vblank_missed={missedEdges}");
+            $"presented_fps={presentedCount / elapsedSeconds:F1}");
     }
 
     private static int RegisterBufferRange(VideoOutPortState port, int startIndex, ReadOnlySpan<ulong> addresses, BufferAttribute attribute, int requestedGroupIndex = -1)

src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.cs

@@ -11,7 +11,6 @@ using Silk.NET.Vulkan.Extensions.EXT;
 using Silk.NET.Windowing;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using VkBuffer = Silk.NET.Vulkan.Buffer;
@@ -179,7 +178,6 @@ internal static unsafe class VulkanVideoPresenter
     private static uint _windowHeight;
     private static bool _closed;
     private const string DebugUtilsExtensionName = "VK_EXT_debug_utils";
-    private const uint NvidiaVendorId = 0x10DE;
     private static bool _splashHidden;
     private static long _enqueuedGuestWorkSequence;
     private static long _completedGuestWorkSequence;
@@ -601,8 +599,7 @@ internal static unsafe class VulkanVideoPresenter
         var traceSubmission = false;
         lock (_gate)
         {
-            // VideoOut registration does not imply a rendered Vulkan image.
-            var known = _gpuGuestImages.ContainsKey(address);
+            var known = _availableGuestImages.ContainsKey(address);
             if (ShouldTracePresentedGuestImageContentsForDiagnostics())
             {
                 Console.Error.WriteLine(
@@ -624,7 +621,7 @@ internal static unsafe class VulkanVideoPresenter
                 {
                     Console.Error.WriteLine(
                         $"[LOADER][WARN] vk.submit_guest_image_unknown addr=0x{address:X16} " +
-                        $"{width}x{height} - flip target has no completed GPU render output");
+                        $"{width}x{height} - flip target was never registered as a render output");
                 }
 
                 return false;
@@ -935,8 +932,6 @@ internal static unsafe class VulkanVideoPresenter
         private ExtDebugUtils? _debugUtils;
         private PhysicalDevice _physicalDevice;
         private Device _device;
-        private PipelineCache _pipelineCache;
-        private string? _pipelineCachePath;
         private Queue _queue;
         private uint _queueFamilyIndex;
         private SwapchainKHR _swapchain;
@@ -954,9 +949,6 @@ internal static unsafe class VulkanVideoPresenter
         private CommandBuffer _presentationCommandBuffer;
         private VkSemaphore _imageAvailable;
         private VkSemaphore _renderFinished;
-        private Fence _presentationFence;
-        private bool _presentationInFlight;
-        private TranslatedDrawResources? _pendingPresentationResources;
         private VkBuffer _stagingBuffer;
         private DeviceMemory _stagingMemory;
         private ulong _stagingSize;
@@ -973,10 +965,6 @@ internal static unsafe class VulkanVideoPresenter
         private int _directPresentationCount;
         private readonly Dictionary<ulong, GuestImageResource> _guestImages = new();
         private readonly HashSet<(ulong Address, uint Width, uint Height, Format Format)> _tracedTextureCacheHits = new();
-        private static readonly bool _dumpTextures = string.Equals(
-            Environment.GetEnvironmentVariable("SHARPEMU_DUMP_TEXTURES"),
-            "1",
-            StringComparison.Ordinal);
         private readonly HashSet<(ulong Address, uint Width, uint Height, Format Format)> _tracedTextureUploads = new();
         private readonly HashSet<(ulong Address, uint Width, uint Height, uint Format)> _dumpedTextures = new();
         private readonly HashSet<(ulong Address, int Size)> _tracedGlobalBuffers = new();
@@ -999,7 +987,7 @@ internal static unsafe class VulkanVideoPresenter
         private readonly record struct GraphicsPipelineKey(
             string VertexShader,
             string FragmentShader,
-            Format RenderTargetFormat,
+            ulong RenderPass,
             PrimitiveTopology Topology,
             VulkanGuestBlendState Blend,
             string ResourceLayout,
@@ -1149,19 +1137,12 @@ internal static unsafe class VulkanVideoPresenter
 
         private void Initialize()
         {
-            if (PngSplashLoader.TryLoadIcon(out var iconPixels, out var iconWidth, out var iconHeight))
-            {
-                var icon = new RawImage((int)iconWidth, (int)iconHeight, iconPixels);
-                _window.SetWindowIcon(ref icon);
-            }
-
             WaitForRenderDocAttachIfRequested();
             _vk = Vk.GetApi();
             CreateInstance();
             CreateSurface();
             SelectPhysicalDevice();
             CreateDevice();
-            CreatePipelineCache();
             CreateSwapchain();
             CreateCommandResources();
             CreateGuestDrawResources();
@@ -1521,13 +1502,6 @@ internal static unsafe class VulkanVideoPresenter
                 Check(_vk.EnumeratePhysicalDevices(_instance, &deviceCount, devicePointer), "vkEnumeratePhysicalDevices");
             }
 
-            // Hybrid laptops enumerate the iGPU first, and AMD's integrated driver
-            // segfaults compiling some translated shaders, so rank rather than take
-            // the first hit. SHARPEMU_VK_DEVICE=<substring> pins an adapter by name.
-            var deviceOverride = Environment.GetEnvironmentVariable("SHARPEMU_VK_DEVICE");
-            var bestScore = int.MinValue;
-            var found = false;
-
             foreach (var device in devices)
             {
                 uint queueCount = 0;
@@ -1547,63 +1521,13 @@ internal static unsafe class VulkanVideoPresenter
                         continue;
                     }
 
-                    _vk.GetPhysicalDeviceProperties(device, out var properties);
-                    var name = SilkMarshal.PtrToString((nint)properties.DeviceName) ?? string.Empty;
-                    var score = ScorePhysicalDevice(properties, name, deviceOverride);
-                    Console.Error.WriteLine(
-                        $"[LOADER][INFO] Vulkan candidate: {name} ({properties.DeviceType}) score={score}");
-
-                    if (score > bestScore)
-                    {
-                        bestScore = score;
-                        _physicalDevice = device;
-                        _queueFamilyIndex = index;
-                        found = true;
-                    }
-
-                    break;
+                    _physicalDevice = device;
+                    _queueFamilyIndex = index;
+                    return;
                 }
             }
 
-            if (!found)
-            {
-                throw new InvalidOperationException("No Vulkan graphics/present queue was found.");
-            }
-
-            _vk.GetPhysicalDeviceProperties(_physicalDevice, out var selected);
-            var selectedName = SilkMarshal.PtrToString((nint)selected.DeviceName) ?? "unknown";
-            Console.Error.WriteLine(
-                $"[LOADER][INFO] Vulkan device: {selectedName} ({selected.DeviceType})");
-            VideoOutExports.SetSelectedGpuName(selectedName);
-            _window.Title = VideoOutExports.GetWindowTitle();
-        }
-
-        private static int ScorePhysicalDevice(
-            PhysicalDeviceProperties properties,
-            string name,
-            string? deviceOverride)
-        {
-            if (!string.IsNullOrWhiteSpace(deviceOverride))
-            {
-                return name.Contains(deviceOverride, StringComparison.OrdinalIgnoreCase) ? 1000 : -1000;
-            }
-
-            var score = properties.DeviceType switch
-            {
-                PhysicalDeviceType.DiscreteGpu => 300,
-                PhysicalDeviceType.VirtualGpu => 100,
-                PhysicalDeviceType.Cpu => 50,
-                // Last resort: only picked when nothing else can present.
-                PhysicalDeviceType.IntegratedGpu => -100,
-                _ => 10,
-            };
-
-            if (properties.VendorID == NvidiaVendorId)
-            {
-                score += 500;
-            }
-
-            return score;
+            throw new InvalidOperationException("No Vulkan graphics/present queue was found.");
         }
 
         private void CreateDevice()
@@ -1758,110 +1682,6 @@ internal static unsafe class VulkanVideoPresenter
             }
         }
 
-        private void CreatePipelineCache()
-        {
-            _vk.GetPhysicalDeviceProperties(_physicalDevice, out var properties);
-            var directory = Path.Combine(AppContext.BaseDirectory, "pipeline-cache");
-            _pipelineCachePath = Path.Combine(
-                directory,
-                $"vulkan-{properties.VendorID:X4}-{properties.DeviceID:X4}-{properties.DriverVersion:X8}.bin");
-
-            byte[] initialData = [];
-            try
-            {
-                if (File.Exists(_pipelineCachePath))
-                {
-                    initialData = File.ReadAllBytes(_pipelineCachePath);
-                }
-            }
-            catch (IOException exception)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][WARN] Vulkan pipeline cache could not be read: {exception.Message}");
-            }
-
-            fixed (byte* initialDataPointer = initialData)
-            {
-                var createInfo = new PipelineCacheCreateInfo
-                {
-                    SType = StructureType.PipelineCacheCreateInfo,
-                    InitialDataSize = (nuint)initialData.Length,
-                    PInitialData = initialData.Length == 0 ? null : initialDataPointer,
-                };
-                var result = _vk.CreatePipelineCache(
-                    _device,
-                    &createInfo,
-                    null,
-                    out _pipelineCache);
-                if (result != Result.Success && initialData.Length != 0)
-                {
-                    createInfo.InitialDataSize = 0;
-                    createInfo.PInitialData = null;
-                    Check(
-                        _vk.CreatePipelineCache(
-                            _device,
-                            &createInfo,
-                            null,
-                            out _pipelineCache),
-                        "vkCreatePipelineCache(empty)");
-                    initialData = [];
-                }
-                else
-                {
-                    Check(result, "vkCreatePipelineCache");
-                }
-            }
-
-            Console.Error.WriteLine(
-                $"[LOADER][INFO] Vulkan pipeline cache: " +
-                $"{(initialData.Length == 0 ? "new" : $"loaded {initialData.Length} bytes")}");
-        }
-
-        private void SavePipelineCache()
-        {
-            if (_pipelineCache.Handle == 0 || string.IsNullOrWhiteSpace(_pipelineCachePath))
-            {
-                return;
-            }
-
-            try
-            {
-                nuint size = 0;
-                Check(
-                    _vk.GetPipelineCacheData(_device, _pipelineCache, &size, null),
-                    "vkGetPipelineCacheData(size)");
-                if (size == 0 || size > int.MaxValue)
-                {
-                    return;
-                }
-
-                var data = new byte[(int)size];
-                fixed (byte* dataPointer = data)
-                {
-                    Check(
-                        _vk.GetPipelineCacheData(
-                            _device,
-                            _pipelineCache,
-                            &size,
-                            dataPointer),
-                        "vkGetPipelineCacheData");
-                }
-
-                var directory = Path.GetDirectoryName(_pipelineCachePath);
-                if (!string.IsNullOrWhiteSpace(directory))
-                {
-                    Directory.CreateDirectory(directory);
-                }
-                File.WriteAllBytes(_pipelineCachePath, data.AsSpan(0, (int)size).ToArray());
-            }
-            catch (Exception exception) when (
-                exception is IOException or UnauthorizedAccessException or InvalidOperationException)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][WARN] Vulkan pipeline cache could not be saved: {exception.Message}");
-            }
-        }
-
         private void CreateSwapchain()
         {
             Check(
@@ -1954,44 +1774,9 @@ internal static unsafe class VulkanVideoPresenter
             Check(_vk.CreateSemaphore(_device, &semaphoreInfo, null, out _imageAvailable), "vkCreateSemaphore");
             Check(_vk.CreateSemaphore(_device, &semaphoreInfo, null, out _renderFinished), "vkCreateSemaphore");
 
-            var fenceInfo = new FenceCreateInfo
-            {
-                SType = StructureType.FenceCreateInfo,
-            };
-            Check(
-                _vk.CreateFence(_device, &fenceInfo, null, out _presentationFence),
-                "vkCreateFence(presentation)");
-
             CreateStagingBuffer((ulong)_extent.Width * _extent.Height * 4);
         }
 
-        private void CompletePendingPresentation(bool wait)
-        {
-            if (!_presentationInFlight)
-            {
-                return;
-            }
-
-            var fence = _presentationFence;
-            var result = wait
-                ? _vk.WaitForFences(_device, 1, &fence, true, ulong.MaxValue)
-                : _vk.GetFenceStatus(_device, fence);
-            if (!wait && result == Result.NotReady)
-            {
-                return;
-            }
-
-            Check(result, "vkWaitForFences(presentation)");
-            _presentationInFlight = false;
-            if (_pendingPresentationResources is not null)
-            {
-                MarkSampledImagesInitialized(_pendingPresentationResources);
-                MarkStorageImagesInitialized(_pendingPresentationResources);
-                DestroyTranslatedDrawResources(_pendingPresentationResources);
-                _pendingPresentationResources = null;
-            }
-        }
-
         private CommandBuffer AllocateGuestCommandBuffer()
         {
             var allocateInfo = new CommandBufferAllocateInfo
@@ -2338,7 +2123,7 @@ internal static unsafe class VulkanVideoPresenter
                 Check(
                     _vk.CreateGraphicsPipelines(
                         _device,
-                        _pipelineCache,
+                        default,
                         1,
                         &pipelineInfo,
                         null,
@@ -2373,7 +2158,6 @@ internal static unsafe class VulkanVideoPresenter
         private TranslatedDrawResources CreateTranslatedDrawResources(
             VulkanTranslatedGuestDraw draw,
             RenderPass renderPass,
-            Format renderTargetFormat,
             Extent2D extent)
         {
             var vertexSpirv = draw.VertexSpirv;
@@ -2440,13 +2224,7 @@ internal static unsafe class VulkanVideoPresenter
                 CreateTranslatedDescriptorResources(
                     resources,
                     ShaderStageFlags.VertexBit | ShaderStageFlags.FragmentBit);
-                CreateTranslatedPipeline(
-                    resources,
-                    vertexSpirv,
-                    draw.PixelSpirv,
-                    renderPass,
-                    renderTargetFormat,
-                    extent);
+                CreateTranslatedPipeline(resources, vertexSpirv, draw.PixelSpirv, renderPass, extent);
                 return resources;
             }
             catch
@@ -2742,13 +2520,12 @@ internal static unsafe class VulkanVideoPresenter
             byte[] vertexSpirv,
             byte[] fragmentSpirv,
             RenderPass renderPass,
-            Format renderTargetFormat,
             Extent2D extent)
         {
             var pipelineKey = new GraphicsPipelineKey(
                 GetShaderDigest(vertexSpirv),
                 GetShaderDigest(fragmentSpirv),
-                renderTargetFormat,
+                renderPass.Handle,
                 resources.Topology,
                 resources.Blend,
                 GetResourceLayoutKey(resources),
@@ -2904,7 +2681,7 @@ internal static unsafe class VulkanVideoPresenter
                     Check(
                         _vk.CreateGraphicsPipelines(
                             _device,
-                            _pipelineCache,
+                            default,
                             1,
                             &pipelineInfo,
                             null,
@@ -3084,7 +2861,7 @@ internal static unsafe class VulkanVideoPresenter
                 Check(
                     _vk.CreateComputePipelines(
                         _device,
-                        _pipelineCache,
+                        default,
                         1,
                         &pipelineInfo,
                         null,
@@ -3610,36 +3387,11 @@ internal static unsafe class VulkanVideoPresenter
         {
             const ulong offsetBasis = 14695981039346656037;
             const ulong prime = 1099511628211;
-
-            var h0 = offsetBasis ^ (ulong)pixels.Length;
-            var h1 = offsetBasis;
-            var h2 = offsetBasis;
-            var h3 = offsetBasis;
-
-            var words = MemoryMarshal.Cast<byte, ulong>(pixels);
-            var index = 0;
-            var blockEnd = words.Length - (words.Length & 3);
-            for (; index < blockEnd; index += 4)
+            var hash = offsetBasis;
+            foreach (var value in pixels)
             {
-                h0 = (h0 ^ words[index]) * prime;
-                h1 = (h1 ^ words[index + 1]) * prime;
-                h2 = (h2 ^ words[index + 2]) * prime;
-                h3 = (h3 ^ words[index + 3]) * prime;
-            }
-
-            for (; index < words.Length; index++)
-            {
-                h0 = (h0 ^ words[index]) * prime;
-            }
-
-            var hash = h0;
-            hash = (hash ^ h1) * prime;
-            hash = (hash ^ h2) * prime;
-            hash = (hash ^ h3) * prime;
-
-            foreach (var value in pixels[(words.Length * sizeof(ulong))..])
-            {
-                hash = (hash ^ value) * prime;
+                hash ^= value;
+                hash *= prime;
             }
 
             return hash;
@@ -3652,7 +3404,10 @@ internal static unsafe class VulkanVideoPresenter
             uint width,
             uint height)
         {
-            if (!_dumpTextures ||
+            if (!string.Equals(
+                    Environment.GetEnvironmentVariable("SHARPEMU_DUMP_TEXTURES"),
+                    "1",
+                    StringComparison.Ordinal) ||
                 texture.IsFallback ||
                 texture.IsStorage ||
                 GetTextureBytesPerPixel(texture.Format) != 4 ||
@@ -4673,7 +4428,6 @@ internal static unsafe class VulkanVideoPresenter
                 resources = CreateTranslatedDrawResources(
                     work.Draw,
                     target.RenderPass,
-                    target.Format,
                     extent);
                 resources.DebugName =
                     $"SharpEmu offscreen rt=0x{work.Target.Address:X16} " +
@@ -5310,8 +5064,6 @@ internal static unsafe class VulkanVideoPresenter
                 return;
             }
 
-            CompletePendingPresentation(wait: true);
-
             byte[]? pixels = null;
             if (presentation.Pixels is { } sourcePixels)
             {
@@ -5359,7 +5111,6 @@ internal static unsafe class VulkanVideoPresenter
                     translatedResources = CreateTranslatedDrawResources(
                         translatedDraw,
                         _renderPass,
-                        _swapchainFormat,
                         _extent);
                     if (ShouldTracePresentedGuestImageContentsForDiagnostics() &&
                         !_firstGuestDrawPresented)
@@ -5491,16 +5242,7 @@ internal static unsafe class VulkanVideoPresenter
                 SignalSemaphoreCount = 1,
                 PSignalSemaphores = &renderFinished,
             };
-            var presentationFence = _presentationFence;
-            Check(
-                _vk.ResetFences(_device, 1, &presentationFence),
-                "vkResetFences(presentation)");
-            Check(
-                _vk.QueueSubmit(_queue, 1, &submitInfo, presentationFence),
-                "vkQueueSubmit");
-            _presentationInFlight = true;
-            _pendingPresentationResources = translatedResources;
-            translatedResources = null;
+            Check(_vk.QueueSubmit(_queue, 1, &submitInfo, default), "vkQueueSubmit");
 
             var swapchain = _swapchain;
             var presentInfo = new PresentInfoKHR
@@ -5516,7 +5258,6 @@ internal static unsafe class VulkanVideoPresenter
             if (presentResult == Result.ErrorOutOfDateKhr)
             {
                 Check(_vk.QueueWaitIdle(_queue), "vkQueueWaitIdle");
-                CompletePendingPresentation(wait: false);
                 CollectCompletedGuestSubmissions(waitForOldest: false);
                 if (translatedResources is not null)
                 {
@@ -5529,13 +5270,19 @@ internal static unsafe class VulkanVideoPresenter
 
             CheckSwapchainResult(presentResult, "vkQueuePresentKHR");
             recreateAfterPresent |= presentResult == Result.SuboptimalKhr;
+            Check(_vk.QueueWaitIdle(_queue), "vkQueueWaitIdle");
             VideoOutExports.ReportPresentedFrame();
             if (_swapchainReadbackPending)
             {
-                CompletePendingPresentation(wait: true);
                 TraceSwapchainReadback();
             }
             CollectCompletedGuestSubmissions(waitForOldest: false);
+            if (translatedResources is not null)
+            {
+                MarkSampledImagesInitialized(translatedResources);
+                MarkStorageImagesInitialized(translatedResources);
+                DestroyTranslatedDrawResources(translatedResources);
+            }
 
             _imageInitialized[imageIndex] = true;
             _presentedSequence = presentation.Sequence;
@@ -6789,9 +6536,7 @@ internal static unsafe class VulkanVideoPresenter
             }
             _vulkanReady = false;
             _vk.DeviceWaitIdle(_device);
-            CompletePendingPresentation(wait: false);
             CollectCompletedGuestSubmissions(waitForOldest: false);
-            SavePipelineCache();
             foreach (var pipeline in _computePipelines.Values)
             {
                 _vk.DestroyPipeline(_device, pipeline, null);
@@ -6802,11 +6547,6 @@ internal static unsafe class VulkanVideoPresenter
                 _vk.DestroyPipeline(_device, pipeline, null);
             }
             _graphicsPipelines.Clear();
-            if (_pipelineCache.Handle != 0)
-            {
-                _vk.DestroyPipelineCache(_device, _pipelineCache, null);
-                _pipelineCache = default;
-            }
             foreach (var layout in _descriptorLayouts.Values)
             {
                 _vk.DestroyPipelineLayout(_device, layout.PipelineLayout, null);
@@ -6898,7 +6638,6 @@ internal static unsafe class VulkanVideoPresenter
             Console.Error.WriteLine(
                 $"[LOADER][INFO] Vulkan VideoOut recreating swapchain after {operation}: {result}");
             _vk.DeviceWaitIdle(_device);
-            CompletePendingPresentation(wait: false);
             CollectCompletedGuestSubmissions(waitForOldest: false);
             DestroySwapchainResources();
             CreateSwapchain();
@@ -6932,11 +6671,6 @@ internal static unsafe class VulkanVideoPresenter
                 _vk.DestroySemaphore(_device, _renderFinished, null);
                 _renderFinished = default;
             }
-            if (_presentationFence.Handle != 0)
-            {
-                _vk.DestroyFence(_device, _presentationFence, null);
-                _presentationFence = default;
-            }
             if (_barycentricPipeline.Handle != 0)
             {
                 _vk.DestroyPipeline(_device, _barycentricPipeline, null);

src/SharpEmu.Libs/Voice/VoiceQoSExports.cs

@@ -1,19 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Voice;
-
-public static class VoiceQoSExports
-{
-    [SysAbiExport(
-        Nid = "U8IfNl6-Css",
-        ExportName = "sceVoiceQoSInit",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceVoiceQoS")]
-    public static int VoiceQoSInit(CpuContext ctx)
-    {
-        return ctx.SetReturn(0);
-    }
-}

src/SharpEmu.Logging/FileLogSink.cs

@@ -6,15 +6,19 @@ using System.Text;
 
 namespace SharpEmu.Logging;
 
+/// <summary>
+/// Writes log entries to a file. Thread-safe via an internal lock.
+/// <see cref="StreamWriter.AutoFlush"/> is enabled so entries survive a crash.
+/// </summary>
 public sealed class FileLogSink : ISharpEmuLogSink, IDisposable
 {
-    private static readonly TimeSpan FlushInterval = TimeSpan.FromMilliseconds(500);
-
     private readonly object _sync = new();
     private readonly StreamWriter _writer;
-    private readonly Timer _flushTimer;
     private bool _disposed;
 
+    /// <param name="path">Absolute or relative file path. Parent directories are created if missing.</param>
+    /// <param name="append"><see langword="true"/> to append to an existing file; <see langword="false"/> to overwrite.</param>
+    /// <param name="includeTimestamp">Always recommended for file logs — entries include a full date-time prefix.</param>
     public FileLogSink(string path, bool append = true, bool includeTimestamp = true)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(path);
@@ -30,20 +34,14 @@ public sealed class FileLogSink : ISharpEmuLogSink, IDisposable
             append ? FileMode.Append : FileMode.Create,
             FileAccess.Write,
             FileShare.Read,
-            bufferSize: 65536,
+            bufferSize: 4096,
             FileOptions.SequentialScan);
-        _writer = new StreamWriter(fileStream, Encoding.UTF8, bufferSize: 65536)
+        _writer = new StreamWriter(fileStream, Encoding.UTF8)
         {
-            AutoFlush = false
+            AutoFlush = true
         };
 
         IncludeTimestamp = includeTimestamp;
-
-        _flushTimer = new Timer(
-            static state => ((FileLogSink)state!).FlushBuffered(),
-            this,
-            FlushInterval,
-            FlushInterval);
     }
 
     public bool IncludeTimestamp { get; set; }
@@ -86,31 +84,11 @@ public sealed class FileLogSink : ISharpEmuLogSink, IDisposable
             {
                 _writer.WriteLine(entry.Exception);
             }
-
-            if (entry.Level >= LogLevel.Error)
-            {
-                _writer.Flush();
-            }
-        }
-    }
-
-    private void FlushBuffered()
-    {
-        lock (_sync)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _writer.Flush();
         }
     }
 
     public void Dispose()
     {
-        _flushTimer.Dispose();
-
         lock (_sync)
         {
             if (_disposed)

src/SharpEmu.Logging/HostSystemInfo.cs

@@ -1,187 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using Microsoft.Win32;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-
-namespace SharpEmu.Logging;
-
-/// <summary>Provides best-effort information about the host system.</summary>
-public static class HostSystemInfo
-{
-    private static readonly Lazy<string> CpuNameValue = new(GetCpuName);
-    private static readonly Lazy<string> GpuNameValue = new(GetPreferredGpuName);
-    private static readonly Lazy<string> MemoryDescriptionValue = new(GetMemoryDescription);
-
-    /// <summary>Host CPU name, or a safe fallback when it cannot be determined.</summary>
-    public static string CpuName => CpuNameValue.Value;
-
-    /// <summary>Preferred physical GPU name, or a safe fallback when it cannot be determined.</summary>
-    public static string GpuName => GpuNameValue.Value;
-
-    /// <summary>Returns a concise description of the host hardware for diagnostic logs.</summary>
-    public static string Summary =>
-        $"Host hardware: CPU: {CpuName}; GPU: {GpuName}; RAM: {MemoryDescriptionValue.Value}.";
-
-    private static string GetCpuName()
-    {
-        if (!OperatingSystem.IsWindows())
-        {
-            return $"{Environment.ProcessorCount} logical processors";
-        }
-
-        try
-        {
-            using var key = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0");
-            if (key?.GetValue("ProcessorNameString") is string name && !string.IsNullOrWhiteSpace(name))
-            {
-                name = Regex.Replace(
-                    name.Trim(),
-                    @"\s+\d+-Core Processor$",
-                    string.Empty,
-                    RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-                return Regex.Replace(
-                    name,
-                    @"\s+with Radeon Graphics$",
-                    string.Empty,
-                    RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-            }
-        }
-        catch (Exception)
-        {
-            // Hardware information is diagnostic only.
-        }
-
-        return $"{Environment.ProcessorCount} logical processors";
-    }
-
-    private static string GetPreferredGpuName()
-    {
-        if (!OperatingSystem.IsWindows())
-        {
-            return "unknown";
-        }
-
-        try
-        {
-            var preferredName = "unknown";
-            var preferredScore = int.MinValue;
-            for (uint index = 0; ; index++)
-            {
-                var device = new DisplayDevice
-                {
-                    cb = Marshal.SizeOf<DisplayDevice>(),
-                };
-
-                if (!EnumDisplayDevices(null, index, ref device, 0))
-                {
-                    break;
-                }
-
-                var name = device.DeviceString?.Trim();
-                var score = ScoreGpu(name);
-                if (score > preferredScore)
-                {
-                    preferredName = name!;
-                    preferredScore = score;
-                }
-            }
-
-            return preferredScore > 0 ? preferredName : "unknown";
-        }
-        catch (Exception)
-        {
-            // Hardware information is diagnostic only.
-            return "unknown";
-        }
-    }
-
-    private static int ScoreGpu(string? name)
-    {
-        if (string.IsNullOrWhiteSpace(name) ||
-            name.Contains("virtual", StringComparison.OrdinalIgnoreCase) ||
-            name.Contains("remote", StringComparison.OrdinalIgnoreCase) ||
-            name.Contains("basic display", StringComparison.OrdinalIgnoreCase))
-        {
-            return -1;
-        }
-
-        if (name.Contains("nvidia", StringComparison.OrdinalIgnoreCase) ||
-            name.Contains("geforce", StringComparison.OrdinalIgnoreCase))
-        {
-            return 3;
-        }
-
-        if (name.Contains("amd", StringComparison.OrdinalIgnoreCase) ||
-            name.Contains("radeon", StringComparison.OrdinalIgnoreCase))
-        {
-            return 2;
-        }
-
-        return 1;
-    }
-
-    private static string GetMemoryDescription()
-    {
-        if (OperatingSystem.IsWindows())
-        {
-            try
-            {
-                var status = new MemoryStatusEx
-                {
-                    dwLength = (uint)Marshal.SizeOf<MemoryStatusEx>(),
-                };
-                if (GlobalMemoryStatusEx(ref status))
-                {
-                    var megabytes = status.ullTotalPhys / (1024 * 1024);
-                    var gigabytes = status.ullTotalPhys / (1024d * 1024 * 1024);
-                    return $"{megabytes:N0} MB ({gigabytes:N1} GB)";
-                }
-            }
-            catch (Exception)
-            {
-                // Hardware information is diagnostic only.
-            }
-        }
-
-        return "unknown";
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    private struct DisplayDevice
-    {
-        public int cb;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-        public string? DeviceName;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string? DeviceString;
-        public int StateFlags;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string? DeviceId;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string? DeviceKey;
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-    private struct MemoryStatusEx
-    {
-        public uint dwLength;
-        public uint dwMemoryLoad;
-        public ulong ullTotalPhys;
-        public ulong ullAvailPhys;
-        public ulong ullTotalPageFile;
-        public ulong ullAvailPageFile;
-        public ulong ullTotalVirtual;
-        public ulong ullAvailVirtual;
-        public ulong ullAvailExtendedVirtual;
-    }
-
-    [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool EnumDisplayDevices(string? deviceName, uint deviceNum, ref DisplayDevice displayDevice, uint flags);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool GlobalMemoryStatusEx(ref MemoryStatusEx buffer);
-}

tools/SharpEmu.Tools.ShaderDump/Program.cs

@@ -1,275 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// Synthetic-shader conformance dumper.
-//
-// Feeds hand-assembled Gen5 (gfx10) instruction words through the real
-// decode -> SPIR-V pipeline (Gen5ShaderTranslator / Gen5SpirvTranslator, via
-// reflection so no emulator source changes are required) and writes the
-// resulting vertex and compute SPIR-V blobs to disk. The blobs can then be
-// checked with spirv-val / spirv-dis.
-//
-// Programs that contain buffer_store_dword automatically get a single
-// global-memory binding covering every store, which the emitter exposes as
-// guestBuffers[0] (descriptor set 0, binding 0).
-//
-// Each program carries an expectation: ExpectTranslate=true programs must
-// decode and emit both stages; ExpectTranslate=false programs pin a decode
-// failure that must stay loud. Any unexpected outcome makes the tool exit
-// non-zero, so it can gate scripts/CI.
-//
-// Usage: SharpEmu.Tools.ShaderDump [output-directory]
-
-using System.Buffers.Binary;
-using System.Reflection;
-using SharpEmu.HLE;
-using SharpEmu.Libs.CxxAbi;
-
-const ulong ProgramAddress = 0x100000;
-
-(string Name, bool ExpectTranslate, uint[] Words)[] testPrograms =
-[
-    ("fmac", true, [
-        0x560A0501,             // v_fmac_f32 v5, v1, v2
-        0x580A0501, 0x42280000, // v_fmamk_f32 v5, v1, 42.0, v2
-        0x5A0A0501, 0x42280000, // v_fmaak_f32 v5, v1, v2, 42.0
-        0xD52B0005, 0x00020501, // v_fmac_f32_e64 v5, v1, v2
-        0xBF810000,             // s_endpgm
-    ]),
-    ("muls", true, [
-        0xD5690005, 0x00020501, // v_mul_lo_u32 v5, v1, v2
-        0xD56A0005, 0x00020501, // v_mul_hi_u32 v5, v1, v2
-        0xD56B0005, 0x00020501, // v_mul_lo_i32 v5, v1, v2
-        0xD56C0005, 0x00020501, // v_mul_hi_i32 v5, v1, v2
-        0xBF810000,             // s_endpgm
-    ]),
-    ("sopp-hints", true, [
-        0xBFA10001,             // s_clause 0x1
-        0xBFA30000,             // s_waitcnt_depctr 0x0
-        0xBF810000,             // s_endpgm
-    ]),
-    // s_round_mode / s_denorm_mode write the FP MODE state and must keep
-    // failing decode loudly until their semantics are modeled (see #108);
-    // this program pins that behavior.
-    ("sopp-mode", false, [
-        0xBFA40000,             // s_round_mode 0x0
-        0xBFA50000,             // s_denorm_mode 0x0
-        0xBF810000,             // s_endpgm
-    ]),
-    // Executable end-to-end test: compute with real ALU instructions, then
-    // buffer_store_dword results to guestBuffers[0] at offsets 0/4/8, prove
-    // that a store with EXEC=0 does not land (offset 12 stays sentinel), and
-    // that stores work again after EXEC is restored (offset 16).
-    ("exec", true, [
-        0xBFA10001,             // s_clause 0x1 (hint no-op in an executed program, needs #108)
-        0x7E0002FF, 0x3FC00000, // v_mov_b32 v0, 1.5f
-        0x7E0202FF, 0x40100000, // v_mov_b32 v1, 2.25f
-        0x7E0402FF, 0x41200000, // v_mov_b32 v2, 10.0f
-        0x56040300,             // v_fmac_f32 v2, v0, v1      -> v2 = fma(1.5, 2.25, 10.0)
-        0x7E0602FF, 0x7FFFFFFF, // v_mov_b32 v3, 0x7FFFFFFF
-        0x7E0802FF, 0x00010003, // v_mov_b32 v4, 0x00010003
-        0xD56C0005, 0x00020903, // v_mul_hi_i32 v5, v3, v4
-        0xD56B0006, 0x00020903, // v_mul_lo_i32 v6, v3, v4
-        0xE0700000, 0x80020200, // buffer_store_dword v2, off, s[8:11], 0
-        0xE0700004, 0x80020500, // buffer_store_dword v5, off, s[8:11], 0 offset:4
-        0xE0700008, 0x80020600, // buffer_store_dword v6, off, s[8:11], 0 offset:8
-        0xBEFE0380,             // s_mov_b32 exec_lo, 0       -> lane inactive
-        0xE070000C, 0x80020200, // buffer_store_dword v2, off, s[8:11], 0 offset:12 (masked, must not land)
-        0xBEFE03C1,             // s_mov_b32 exec_lo, -1      -> lane active again
-        0xE0700010, 0x80020000, // buffer_store_dword v0, off, s[8:11], 0 offset:16
-        0xBF810000,             // s_endpgm
-    ]),
-];
-
-var assembly = typeof(CxaGuardExports).Assembly;
-var shaderTranslator = assembly.GetType("SharpEmu.Libs.Agc.Gen5ShaderTranslator")
-    ?? throw new InvalidOperationException("Gen5ShaderTranslator not found");
-var spirvTranslator = assembly.GetType("SharpEmu.Libs.Agc.Gen5SpirvTranslator")
-    ?? throw new InvalidOperationException("Gen5SpirvTranslator not found");
-var describe = shaderTranslator.GetMethod(
-    "Describe",
-    BindingFlags.Public | BindingFlags.Static)
-    ?? throw new InvalidOperationException("Gen5ShaderTranslator.Describe not found");
-var tryDecode = shaderTranslator.GetMethod(
-    "TryDecodeProgram",
-    BindingFlags.NonPublic | BindingFlags.Static)
-    ?? throw new InvalidOperationException("Gen5ShaderTranslator.TryDecodeProgram not found");
-var stateType = assembly.GetType("SharpEmu.Libs.Agc.Gen5ShaderState")
-    ?? throw new InvalidOperationException("Gen5ShaderState not found");
-var evaluationType = assembly.GetType("SharpEmu.Libs.Agc.Gen5ShaderEvaluation")
-    ?? throw new InvalidOperationException("Gen5ShaderEvaluation not found");
-var imageBindingType = assembly.GetType("SharpEmu.Libs.Agc.Gen5ImageBinding")
-    ?? throw new InvalidOperationException("Gen5ImageBinding not found");
-var globalBindingType = assembly.GetType("SharpEmu.Libs.Agc.Gen5GlobalMemoryBinding")
-    ?? throw new InvalidOperationException("Gen5GlobalMemoryBinding not found");
-var tryCompile = spirvTranslator.GetMethod(
-    "TryCompileVertexShader",
-    BindingFlags.Public | BindingFlags.Static)
-    ?? throw new InvalidOperationException("Gen5SpirvTranslator.TryCompileVertexShader not found");
-var tryCompileCompute = spirvTranslator.GetMethod(
-    "TryCompileComputeShader",
-    BindingFlags.Public | BindingFlags.Static)
-    ?? throw new InvalidOperationException("Gen5SpirvTranslator.TryCompileComputeShader not found");
-
-var outputDirectory = args.Length > 0
-    ? args[0]
-    : Path.Combine(AppContext.BaseDirectory, "spv");
-Directory.CreateDirectory(outputDirectory);
-
-var failures = 0;
-foreach (var (name, expectTranslate, words) in testPrograms)
-{
-    var memory = new FakeMemory();
-    memory.AddRegion(ProgramAddress, words);
-    var ctx = new CpuContext(memory, Generation.Gen5);
-
-    Console.WriteLine(
-        $"[{name}] decode: " +
-        (string)describe.Invoke(null, [ctx, ProgramAddress, ProgramAddress])!);
-
-    object?[] decodeArgs = [ctx, ProgramAddress, null, null];
-    if (!(bool)tryDecode.Invoke(null, decodeArgs)!)
-    {
-        if (expectTranslate)
-        {
-            failures++;
-            Console.WriteLine($"[{name}] FAILED: decode error ({decodeArgs[3]})");
-        }
-        else
-        {
-            Console.WriteLine($"[{name}] decode failed as expected ({decodeArgs[3]})");
-        }
-
-        continue;
-    }
-
-    if (!expectTranslate)
-    {
-        failures++;
-        Console.WriteLine(
-            $"[{name}] FAILED: decoded successfully but is pinned as a decode failure — " +
-            "if the new decode support is intentional, its semantics need verifying here first");
-        continue;
-    }
-
-    // Buffer stores need a global-memory binding; the emitter resolves them by
-    // instruction PC, so collect store PCs from the decoded program itself.
-    var programObj = decodeArgs[2]!;
-    var instructions = (System.Collections.IEnumerable)programObj
-        .GetType().GetProperty("Instructions")!.GetValue(programObj)!;
-    var storePcs = new List<uint>();
-    foreach (var instruction in instructions)
-    {
-        var op = (string)instruction.GetType().GetProperty("Opcode")!.GetValue(instruction)!;
-        if (op.StartsWith("BufferStore", StringComparison.Ordinal))
-        {
-            storePcs.Add((uint)instruction.GetType().GetProperty("Pc")!.GetValue(instruction)!);
-        }
-    }
-
-    // The binding's scalar base (8 -> s[8:11]) must match the srsrc field of
-    // the hand-assembled buffer_store words, and the 64-byte backing store
-    // must cover every hand-assembled store offset.
-    var globalBindings = Array.CreateInstance(globalBindingType, storePcs.Count > 0 ? 1 : 0);
-    if (storePcs.Count > 0)
-    {
-        globalBindings.SetValue(
-            Activator.CreateInstance(
-                globalBindingType,
-                8u,
-                0UL,
-                (IReadOnlyList<uint>)storePcs,
-                new byte[64]),
-            0);
-    }
-
-    var state = Activator.CreateInstance(
-        stateType,
-        programObj,
-        new uint[16],
-        null,
-        null,
-        0u)!;
-    var evaluation = Activator.CreateInstance(
-        evaluationType,
-        new uint[256],
-        new uint[256],
-        new Dictionary<uint, IReadOnlyList<uint>>(),
-        Array.CreateInstance(imageBindingType, 0),
-        globalBindings,
-        null,
-        null,
-        null)!;
-
-    object?[] compileArgs = [state, evaluation, null, null, 0, -1, 0];
-    if ((bool)tryCompile.Invoke(null, compileArgs)!)
-    {
-        var shader = compileArgs[2]!;
-        var spirv = (byte[])shader.GetType().GetProperty("Spirv")!.GetValue(shader)!;
-        var path = Path.Combine(outputDirectory, $"{name}.spv");
-        File.WriteAllBytes(path, spirv);
-        Console.WriteLine($"[{name}] emit: success, {spirv.Length} bytes -> {path}");
-    }
-    else
-    {
-        failures++;
-        Console.WriteLine($"[{name}] emit: FAILED ({compileArgs[3]})");
-    }
-
-    object?[] computeArgs = [state, evaluation, 1u, 1u, 1u, null, null];
-    if ((bool)tryCompileCompute.Invoke(null, computeArgs)!)
-    {
-        var shader = computeArgs[5]!;
-        var spirv = (byte[])shader.GetType().GetProperty("Spirv")!.GetValue(shader)!;
-        var path = Path.Combine(outputDirectory, $"{name}-cs.spv");
-        File.WriteAllBytes(path, spirv);
-        Console.WriteLine($"[{name}] compute emit: success, {spirv.Length} bytes -> {path}");
-    }
-    else
-    {
-        failures++;
-        Console.WriteLine($"[{name}] compute emit: FAILED ({computeArgs[6]})");
-    }
-}
-
-Console.WriteLine(failures == 0
-    ? "RESULT: all programs behaved as expected"
-    : $"RESULT: {failures} unexpected outcome(s)");
-Environment.ExitCode = failures == 0 ? 0 : 1;
-
-internal sealed class FakeMemory : ICpuMemory
-{
-    private readonly List<(ulong Base, byte[] Data)> _regions = [];
-
-    public void AddRegion(ulong baseAddress, uint[] words)
-    {
-        var bytes = new byte[words.Length * sizeof(uint)];
-        for (var index = 0; index < words.Length; index++)
-        {
-            BinaryPrimitives.WriteUInt32LittleEndian(
-                bytes.AsSpan(index * sizeof(uint)),
-                words[index]);
-        }
-
-        _regions.Add((baseAddress, bytes));
-    }
-
-    public bool TryRead(ulong virtualAddress, Span<byte> destination)
-    {
-        foreach (var (baseAddress, data) in _regions)
-        {
-            if (virtualAddress >= baseAddress &&
-                virtualAddress + (ulong)destination.Length <= baseAddress + (ulong)data.Length)
-            {
-                data.AsSpan(
-                    (int)(virtualAddress - baseAddress),
-                    destination.Length).CopyTo(destination);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public bool TryWrite(ulong virtualAddress, ReadOnlySpan<byte> source) => false;
-}

tools/SharpEmu.Tools.ShaderDump/SharpEmu.Tools.ShaderDump.csproj

@@ -1,19 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <!-- Standalone dev tool: opt out of the repo-wide lock-file requirement
-         so no packages.lock.json is generated or committed for it. -->
-    <RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SharpEmu.Libs\SharpEmu.Libs.csproj" />
-  </ItemGroup>
-
-</Project>