rollForward: "disable"

.github/ISSUE_TEMPLATE/game-compatibility.yml

@@ -16,11 +16,6 @@ body:
         Example title:
         Demon’s Souls (PPSA01341)
 
-        **Before reporting:**
-        - Test the game on a **fresh build from `main`**, not an old release.
-        - Copy the **exact commit SHA** shown at the top of the log.
-        - `DEBUG` and `TRACE` lines are diagnostic context, not errors by themselves; report the last milestone or the first `WARNING`, `ERROR`, or `CRITICAL` line connected to the stop.
-
   - type: input
     id: game_name
     attributes:
@@ -78,20 +73,11 @@ body:
     id: logs
     attributes:
       label: Log File
-      description: Attach the **full** log file (`.log`, `.txt`, or `.zip`). Do not paste only a fragment — the maintainer needs the complete log from launch to crash.
+      description: Drag and drop your log file here, or click to browse
     validations:
-      required: true
+      required: false
       accept: ".log,.txt,.zip"
 
-  - type: input
-    id: last_milestone_first_error
-    attributes:
-      label: Last Milestone / First Error
-      description: Paste the **last useful milestone line** or the **first `WARNING`, `ERROR`, or `CRITICAL` line connected to the stop** from the log. `DEBUG`/`TRACE` lines do not count unless a real error follows them.
-      placeholder: "e.g. CpuEngine: native-only  OR  [ERROR] Native backend FAILED: ..."
-    validations:
-      required: true
-
   - type: dropdown
     id: operating_system
     attributes:
@@ -133,8 +119,7 @@ body:
     id: emulator_version
     attributes:
       label: Emulator Version / Commit
-      description: Copy the **exact short SHA** from the top of the log. Do not enter just `0.0.1` without a commit hash.
-      placeholder: e.g. a1b2c3d
+      placeholder: e.g. v0.0.1 / a1b2c3d
     validations:
       required: true
 

.github/workflows/workflow.yml

@@ -100,9 +100,6 @@ jobs:
       - name: Build solution
         run: dotnet build SharpEmu.slnx -c Release --no-restore
 
-      - name: Validate synthetic shaders
-        run: dotnet run --project tools/SharpEmu.Tools.ShaderDump/SharpEmu.Tools.ShaderDump.csproj -c Release -- artifacts/shader-dump
-
       - name: Publish win-x64 CLI
         run: dotnet publish src/SharpEmu.CLI/SharpEmu.CLI.csproj -c Release -r win-x64 --self-contained true --no-restore -p:PublishDir="${env:PUBLISH_DIR}"
 

.gitignore

@@ -39,4 +39,3 @@ Desktop.ini
 ehthumbs.db
 
 .vs/
-.idea/

CONTRIBUTING.md

@@ -1,70 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-# Contributing
-
-Contributions are always welcome!
-
-Before opening a pull request, please keep the following in mind:
-
-- Keep PRs small and focused on a single topic.
-- Discuss large architectural changes before implementing them.
-- Follow the project's existing coding style.
-- Do not submit generated code unless you fully understand and can maintain it.
-- Do not introduce Sony proprietary code, firmware, keys, decrypted assets, or other copyrighted PlayStation materials.
-- All reverse engineering should be based on publicly available information, clean-room techniques, or your own original research.
-- Game-specific hacks should be avoided whenever possible. Prefer generic implementations that improve overall compatibility.
-- New features should not break existing behavior.
-- Ensure the project builds successfully before submitting a PR.
-
-If you're unsure about a design decision, feel free to open a discussion or draft PR first.
-
-## AI-Assisted Contributions
-
-AI-assisted development is welcome and may be used for research, reverse engineering, code generation, or documentation.
-
-However, contributors are expected to fully understand every line of code they submit. By opening a pull request, you confirm that you are able to explain, modify, debug, and maintain the submitted code without relying on the AI that generated it.
-
-When submitting an AI-assisted PR:
-
-- Clearly explain **what the change does**, **why it is needed**, and **what problem it solves**, using your own words.
-- Describe **how you verified the change**, including the games, applications, or test cases used.
-- Avoid excessive product-level logging. Use logging only when it provides meaningful diagnostic value.
-- Comments should document design decisions or implementation details in your own words. Avoid generic AI-generated comments that merely restate what the code already does.
-- Be prepared to answer review questions about the implementation. "The AI generated it" is not considered a sufficient explanation.
-- Large AI-generated changes without a clear understanding of the implementation are unlikely to be accepted.
-- If the implementation cannot be reasonably explained during code review, the pull request may be rejected regardless of whether it works.
-
-The quality, correctness, maintainability, and long-term ownership of the submitted code remain the responsibility of the contributor.
-
-## Coding Style
-
-SharpEmu follows a consistent coding style across the project. Please ensure your contributions match the existing style.
-
-- Use **4 spaces** for indentation (no tabs).
-- Use **2 spaces** for XML-based files (e.g. `.csproj`, `.props`, `.targets`, `.xml`, `yml`, GitHub workflow files where applicable).
-- Respect the project's `.editorconfig`.
-- Ensure every text file ends with a **single trailing newline**
-- Avoid formatting-only commits unless they are the purpose of the PR.
-- Keep naming, formatting, and file organization consistent with the surrounding code.
-- Prefer small, focused changes over large refactors.
-
-### REUSE Compliance
-
-This repository follows the REUSE Specification.
-
-Every new file must contain the appropriate SPDX license header. Pull requests that do not comply with the project's REUSE requirements will fail CI and will not be merged.
-
-### Recommended Development Environment
-
-The repository includes an `.editorconfig` and Visual Studio solution files.
-
-For the best experience, we recommend using:
-
-- Visual Studio Code with;
-  - C#
-  - C# Dev Kit
-
-Most editors that support `.editorconfig` will automatically apply the project's formatting rules.

Directory.Packages.props

@@ -12,14 +12,11 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.18" />
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.18" />
     <PackageVersion Include="Iced" Version="1.21.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Windowing" Version="2.23.0" />
     <!-- Transitive of Avalonia.Desktop; pinned to fix GHSA-xrw6-gwf8-vvr9 -->
     <PackageVersion Include="Tmds.DBus.Protocol" Version="0.21.3" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
   </ItemGroup>
 </Project>

README.md

@@ -122,16 +122,3 @@ Provided valuable references for filesystem handling and low-level C# implementa
 # License
 
 - [**GPL-2.0 license**](https://github.com/par274/sharpemu/blob/main/LICENSE)
-
-## Contributing
-
-Before opening an issue or pull request, please read our contribution guidelines:
-
-**[CONTRIBUTING.md](./CONTRIBUTING.md)**
-
-The guide covers:
-- Coding style and formatting
-- AI-assisted contributions
-- Pull request expectations
-- Testing guidelines
-- Legal and reverse engineering policy

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/**"

SharpEmu.slnx

@@ -12,7 +12,4 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <Project Path="src/SharpEmu.Libs/SharpEmu.Libs.csproj" />
     <Project Path="src/SharpEmu.Logging/SharpEmu.Logging.csproj" />
   </Folder>
-  <Folder Name="/tests/">
-    <Project Path="tests/SharpEmu.Libs.Tests/SharpEmu.Libs.Tests.csproj" />
-  </Folder>
 </Solution>

scripts/check_sysabi_aerolib.py

@@ -1,172 +0,0 @@
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-#!/usr/bin/env python3
-
-"""Offline check: SysAbiExport ExportName must hash to its Nid (name2nid).
-
-NIDs absent from aerolib.bin are skipped (unknown/unresolved symbols).
-Known historic mislabels may be allowlisted with a one-line reason.
-
-Run from the repository root:
-  python scripts/check_sysabi_aerolib.py
-  python scripts/check_sysabi_aerolib.py --strict
-"""
-
-from __future__ import annotations
-
-import argparse
-import hashlib
-import re
-import struct
-import sys
-from base64 import b64encode as base64enc
-from binascii import unhexlify as uhx
-from pathlib import Path
-
-SRC_ROOT = Path("src")
-AEROLIB_BIN = Path("src/SharpEmu.HLE/Aerolib/aerolib.bin")
-SYSABI_EXPORT_RE = re.compile(r"\[SysAbiExport\((.*?)\)\]", re.DOTALL)
-NID_RE = re.compile(r'Nid\s*=\s*"([^"]+)"')
-EXPORT_NAME_RE = re.compile(r'ExportName\s*=\s*"([^"]+)"')
-
-# NID -> reason. Keep minimal; fix ExportName when safe instead of growing this list.
-ALLOWLISTED_NIDS: dict[str, str] = {
-    "KMcEa+rHsIo": "Historic kernel MapMemory stub bound to sceAvPlayerAddSource NID; API rewrite deferred.",
-    "WV1GwM32NgY": "Historic WebApi2 init alias for PushEventCreateHandle NID; ABI rewrite deferred.",
-}
-
-
-def name2nid(name: str) -> str:
-    symbol = hashlib.sha1(name.encode() + uhx("518D64A635DED8C1E6B039B1C3E55230")).digest()
-    id_val = struct.unpack("<Q", symbol[:8])[0]
-    nid = base64enc(uhx("%016x" % id_val), b"+-").rstrip(b"=")
-    return nid.decode("utf-8")
-
-
-def find_repo_root() -> Path:
-    cwd = Path.cwd()
-    if (cwd / SRC_ROOT).is_dir() and (cwd / "scripts").is_dir():
-        return cwd
-    script_root = Path(__file__).resolve().parent.parent
-    if (script_root / SRC_ROOT).is_dir():
-        return script_root
-    raise SystemExit("Run from the repository root (src/ and scripts/ expected).")
-
-
-def load_aerolib_nids(aerolib_path: Path) -> set[str]:
-    data = aerolib_path.read_bytes()
-    if len(data) < 4:
-        raise SystemExit(f"Aerolib binary too small: {aerolib_path}")
-
-    count = struct.unpack_from("<I", data, 0)[0]
-    offset = 4
-    nids: set[str] = set()
-    for _ in range(count):
-        if offset >= len(data):
-            raise SystemExit(f"Truncated aerolib.bin while reading NIDs: {aerolib_path}")
-        nid_len = data[offset]
-        offset += 1
-        nid = data[offset : offset + nid_len].decode("utf-8")
-        offset += nid_len
-        if offset + 2 > len(data):
-            raise SystemExit(f"Truncated aerolib.bin name length: {aerolib_path}")
-        name_len = struct.unpack_from("<H", data, offset)[0]
-        offset += 2 + name_len
-        nids.add(nid)
-    return nids
-
-
-def iter_sysabi_exports(cs_path: Path, text: str):
-    for match in SYSABI_EXPORT_RE.finditer(text):
-        block = match.group(1)
-        nid_match = NID_RE.search(block)
-        export_match = EXPORT_NAME_RE.search(block)
-        if nid_match is None or export_match is None:
-            continue
-
-        nid = nid_match.group(1)
-        export_name = export_match.group(1)
-        nid_attr = f'Nid = "{nid}"'
-        abs_pos = text.find(nid_attr, match.start(), match.end())
-        if abs_pos < 0:
-            abs_pos = match.start()
-        line = text.count("\n", 0, abs_pos) + 1
-        yield cs_path, line, nid, export_name
-
-
-def scan(src_root: Path, catalog_nids: set[str]):
-    checked = 0
-    mismatches = []
-    skipped_no_catalog = 0
-    allowlisted = 0
-
-    for cs_path in sorted(src_root.rglob("*.cs")):
-        text = cs_path.read_text(encoding="utf-8")
-        for path, line, nid, export_name in iter_sysabi_exports(cs_path, text):
-            checked += 1
-            computed = name2nid(export_name)
-            if computed == nid:
-                continue
-
-            if nid not in catalog_nids:
-                skipped_no_catalog += 1
-                continue
-
-            if nid in ALLOWLISTED_NIDS:
-                allowlisted += 1
-                continue
-
-            mismatches.append((path, line, nid, export_name, computed))
-
-    return checked, mismatches, skipped_no_catalog, allowlisted
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(
-        description="Check that SysAbiExport ExportName values hash to their Nid via name2nid."
-    )
-    parser.add_argument(
-        "--strict",
-        action="store_true",
-        help="Exit 1 when any non-skipped/non-allowlisted ExportName does not hash to its Nid.",
-    )
-    parser.add_argument(
-        "--quiet",
-        action="store_true",
-        help="Print only the summary line.",
-    )
-    args = parser.parse_args()
-
-    repo_root = find_repo_root()
-    aerolib_path = repo_root / AEROLIB_BIN
-    if not aerolib_path.is_file():
-        raise SystemExit(f"Missing Aerolib catalog: {aerolib_path.as_posix()}")
-
-    catalog_nids = load_aerolib_nids(aerolib_path)
-    checked, mismatches, skipped_no_catalog, allowlisted = scan(
-        repo_root / SRC_ROOT, catalog_nids
-    )
-    ok = checked - len(mismatches) - skipped_no_catalog - allowlisted
-
-    if not args.quiet:
-        for path, line, nid, export_name, computed in mismatches:
-            rel = path.relative_to(repo_root).as_posix()
-            print(
-                f"{rel}:{line}: NID={nid} ExportName={export_name!r} "
-                f"computed={computed}"
-            )
-
-    print(
-        f"checked={checked} ok={ok} fail={len(mismatches)} "
-        f"skipped_no_catalog={skipped_no_catalog} allowlisted={allowlisted} "
-        f"allowlist_size={len(ALLOWLISTED_NIDS)}"
-    )
-
-    if args.strict and mismatches:
-        return 1
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

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

@@ -5,19 +5,15 @@ using SharpEmu.Core.Runtime;
 using SharpEmu.Core.Cpu;
 using SharpEmu.GUI;
 using SharpEmu.HLE;
-using SharpEmu.Libs.VideoOut;
 using SharpEmu.Logging;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.Json;
 
 namespace SharpEmu.CLI;
 
 internal static partial class Program
 {
     private static readonly SharpEmuLogger Log = SharpEmuLog.For("SharpEmu.CLI");
-    private static readonly object ConsoleMirrorSync = new();
-    private static StreamWriter? _consoleMirrorFile;
     private const int DefaultImportTraceLimit = 32;
     private const string MitigatedChildFlag = "--sharpemu-mitigated-child";
     private const uint EXTENDED_STARTUPINFO_PRESENT = 0x00080000;
@@ -25,15 +21,11 @@ internal static partial class Program
     private const int PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY = 0x00020007;
     private const uint JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE = 0x00002000;
     private const int JobObjectExtendedLimitInformation = 9;
-    private const int STARTF_USESTDHANDLES = 0x00000100;
-    private const uint HANDLE_FLAG_INHERIT = 0x00000001;
-    private const string MitigatedChildEnvironment = "SHARPEMU_MITIGATED_CHILD";
     private const ulong PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF = 0x00000002UL << 40;
     private const ulong PROCESS_CREATION_MITIGATION_POLICY2_CET_USER_SHADOW_STACKS_ALWAYS_OFF = 0x00000002UL << 28;
     private const ulong PROCESS_CREATION_MITIGATION_POLICY2_USER_CET_SET_CONTEXT_IP_VALIDATION_ALWAYS_OFF = 0x00000002UL << 32;
     private const ulong PROCESS_CREATION_MITIGATION_POLICY2_XTENDED_CONTROL_FLOW_GUARD_ALWAYS_OFF = 0x00000002UL << 40;
     private const int ATTACH_PARENT_PROCESS = -1;
-    private const int STD_INPUT_HANDLE = -10;
     private const int STD_OUTPUT_HANDLE = -11;
     private const int STD_ERROR_HANDLE = -12;
     private const uint GENERIC_READ = 0x80000000;
@@ -51,7 +43,6 @@ internal static partial class Program
         }
         finally
         {
-            DropConsoleFileMirror();
             SharpEmuLog.Shutdown();
         }
     }
@@ -70,10 +61,6 @@ internal static partial class Program
         // itself to a console before the first write.
         EnsureCliConsole();
         UseUtf8ConsoleOutput();
-        if (isMitigatedChild && TryGetLogFileArgument(args, out var earlyLogFilePath))
-        {
-            TryEnableConsoleFileMirror(earlyLogFilePath);
-        }
 
         Console.Error.WriteLine($"[DEBUG] SharpEmu starting with {args.Length} args");
 
@@ -82,21 +69,15 @@ internal static partial class Program
             return childExitCode;
         }
 
-        if (!TryParseArguments(args, out var ebootPath, out var runtimeOptions, out var logLevel, out var logFilePath))
+        if (!TryParseArguments(args, out var ebootPath, out var runtimeOptions, out var logLevel))
         {
             PrintUsage();
             return 1;
         }
 
-        if (!isMitigatedChild && !string.IsNullOrWhiteSpace(logFilePath))
-        {
-            TryEnableConsoleFileMirror(logFilePath);
-        }
-
         SharpEmuLog.MinimumLevel = logLevel;
 
         Log.Info(BuildInfo.Banner);
-        Log.Info(HostSystemInfo.Summary);
 
         ebootPath = Path.GetFullPath(ebootPath);
         Console.Error.WriteLine($"[DEBUG] Full path: {ebootPath}");
@@ -112,16 +93,8 @@ internal static partial class Program
         using var runtime = SharpEmuRuntime.CreateDefault(runtimeOptions);
 
         OrbisGen2Result result;
-        ConsoleCancelEventHandler? cancelHandler = null;
         try
         {
-            cancelHandler = (_, eventArgs) =>
-            {
-                eventArgs.Cancel = true;
-                VideoOutExports.NotifyHostInterrupt();
-            };
-            Console.CancelKeyPress += cancelHandler;
-
             Console.Error.WriteLine($"[DEBUG] Running: {ebootPath}");
             result = runtime.Run(ebootPath);
             Console.Error.WriteLine($"[DEBUG] Result: {result}");
@@ -132,13 +105,6 @@ internal static partial class Program
             Log.Error("SharpEmu failed to run.", ex);
             return 3;
         }
-        finally
-        {
-            if (cancelHandler is not null)
-            {
-                Console.CancelKeyPress -= cancelHandler;
-            }
-        }
 
         Log.Info($"SharpEmu execution completed. Result={result} (0x{(int)result:X8})");
         if (!string.IsNullOrWhiteSpace(runtime.LastSessionSummary))
@@ -268,10 +234,6 @@ internal static partial class Program
     private static string[] NormalizeInternalArguments(string[] args, out bool isMitigatedChild)
     {
         isMitigatedChild = false;
-        var trustedMitigatedChild = string.Equals(
-            Environment.GetEnvironmentVariable(MitigatedChildEnvironment),
-            "1",
-            StringComparison.Ordinal);
         if (args.Length == 0)
         {
             return args;
@@ -282,7 +244,7 @@ internal static partial class Program
         {
             if (string.Equals(arg, MitigatedChildFlag, StringComparison.Ordinal))
             {
-                isMitigatedChild = trustedMitigatedChild;
+                isMitigatedChild = true;
                 continue;
             }
 
@@ -321,11 +283,9 @@ internal static partial class Program
         var commandLine = BuildCommandLine(processPath, childArgs);
         var startupInfoEx = new STARTUPINFOEX();
         startupInfoEx.StartupInfo.cb = Marshal.SizeOf<STARTUPINFOEX>();
-        ConfigureInheritedStdHandles(ref startupInfoEx.StartupInfo);
 
         nint attributeList = 0;
         nint mitigationPolicies = 0;
-        var previousChildEnvironment = Environment.GetEnvironmentVariable(MitigatedChildEnvironment);
         try
         {
             nuint attributeListSize = 0;
@@ -333,9 +293,7 @@ internal static partial class Program
             attributeList = Marshal.AllocHGlobal((nint)attributeListSize);
             if (!InitializeProcThreadAttributeList(attributeList, 1, 0, ref attributeListSize))
             {
-                childExitCode = 5;
-                Console.Error.WriteLine($"[ERROR] Failed to initialize mitigation attributes: {Marshal.GetLastWin32Error()}");
-                return true;
+                return false;
             }
 
             startupInfoEx.lpAttributeList = attributeList;
@@ -343,7 +301,8 @@ internal static partial class Program
             var policy1 = PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
             var policy2 =
                 PROCESS_CREATION_MITIGATION_POLICY2_CET_USER_SHADOW_STACKS_ALWAYS_OFF |
-                PROCESS_CREATION_MITIGATION_POLICY2_USER_CET_SET_CONTEXT_IP_VALIDATION_ALWAYS_OFF;
+                PROCESS_CREATION_MITIGATION_POLICY2_USER_CET_SET_CONTEXT_IP_VALIDATION_ALWAYS_OFF |
+                PROCESS_CREATION_MITIGATION_POLICY2_XTENDED_CONTROL_FLOW_GUARD_ALWAYS_OFF;
 
             mitigationPolicies = Marshal.AllocHGlobal(sizeof(ulong) * 2);
             Marshal.WriteInt64(mitigationPolicies, unchecked((long)policy1));
@@ -358,31 +317,24 @@ internal static partial class Program
                 0,
                 0))
             {
-                childExitCode = 5;
-                Console.Error.WriteLine($"[ERROR] Failed to apply mitigation attributes: {Marshal.GetLastWin32Error()}");
-                return true;
+                return false;
             }
 
             var cmdLineBuilder = new StringBuilder(commandLine);
             nint jobHandle = 0;
-            Environment.SetEnvironmentVariable(MitigatedChildEnvironment, "1");
-            var created = CreateProcessW(
+            if (!CreateProcessW(
                 processPath,
                 cmdLineBuilder,
                 0,
                 0,
-                true,
+                false,
                 EXTENDED_STARTUPINFO_PRESENT,
                 0,
                 Environment.CurrentDirectory,
                 ref startupInfoEx,
-                out var processInfo);
-            Environment.SetEnvironmentVariable(MitigatedChildEnvironment, previousChildEnvironment);
-            if (!created)
+                out var processInfo))
             {
-                childExitCode = 5;
-                Console.Error.WriteLine($"[ERROR] Failed to launch mitigated child process: {Marshal.GetLastWin32Error()}");
-                return true;
+                return false;
             }
 
             try
@@ -436,8 +388,6 @@ internal static partial class Program
         }
         finally
         {
-            Environment.SetEnvironmentVariable(MitigatedChildEnvironment, previousChildEnvironment);
-
             if (attributeList != 0)
             {
                 DeleteProcThreadAttributeList(attributeList);
@@ -451,238 +401,6 @@ internal static partial class Program
         }
     }
 
-    private static bool TryGetLogFileArgument(IReadOnlyList<string> args, out string path)
-    {
-        for (var i = 0; i < args.Count; i++)
-        {
-            var argument = args[i];
-            if (string.Equals(argument, "--log-file", StringComparison.OrdinalIgnoreCase))
-            {
-                if (i + 1 < args.Count &&
-                    !string.IsNullOrWhiteSpace(args[i + 1]) &&
-                    !args[i + 1].StartsWith("--", StringComparison.Ordinal) &&
-                    ShouldConsumeLogFilePath(args, i + 1))
-                {
-                    path = args[i + 1];
-                    return true;
-                }
-
-                path = BuildDefaultLogFilePath(TryFindEbootPathToken(args));
-                return true;
-            }
-
-            const string logFilePrefix = "--log-file=";
-            if (argument.StartsWith(logFilePrefix, StringComparison.OrdinalIgnoreCase) &&
-                !string.IsNullOrWhiteSpace(argument[logFilePrefix.Length..]))
-            {
-                path = argument[logFilePrefix.Length..];
-                return true;
-            }
-        }
-
-        path = string.Empty;
-        return false;
-    }
-
-    private static string BuildDefaultLogFilePath(string? ebootPath)
-    {
-        var baseDirectory = AppContext.BaseDirectory;
-        var logsDirectory = Path.Combine(baseDirectory, "user", "logs");
-        var name = TryReadTitleId(ebootPath) ?? "UNKNOWN";
-
-        foreach (var invalid in Path.GetInvalidFileNameChars())
-        {
-            name = name.Replace(invalid, '_');
-        }
-
-        return Path.Combine(logsDirectory, $"{name}-{DateTime.Now:yyyyMMdd-HHmmss}.log");
-    }
-
-    private static string? TryReadTitleId(string? ebootPath)
-    {
-        if (string.IsNullOrWhiteSpace(ebootPath))
-        {
-            return null;
-        }
-
-        try
-        {
-            var directory = Path.GetDirectoryName(Path.GetFullPath(ebootPath));
-            if (string.IsNullOrEmpty(directory))
-            {
-                return null;
-            }
-
-            foreach (var paramPath in new[]
-            {
-                Path.Combine(directory, "sce_sys", "param.json"),
-                Path.Combine(directory, "param.json"),
-            })
-            {
-                if (!File.Exists(paramPath))
-                {
-                    continue;
-                }
-
-                using var stream = File.OpenRead(paramPath);
-                using var document = JsonDocument.Parse(stream);
-                if (document.RootElement.TryGetProperty("titleId", out var titleIdElement) &&
-                    titleIdElement.ValueKind == JsonValueKind.String)
-                {
-                    var titleId = titleIdElement.GetString();
-                    if (!string.IsNullOrWhiteSpace(titleId))
-                    {
-                        return titleId.Trim();
-                    }
-                }
-            }
-        }
-        catch
-        {
-            // Logging should never block launch; unknown title ids use a stable fallback.
-        }
-
-        return null;
-    }
-
-    private static string? TryFindEbootPathToken(IReadOnlyList<string> args)
-    {
-        for (var i = args.Count - 1; i >= 0; i--)
-        {
-            var argument = args[i];
-            if (string.IsNullOrWhiteSpace(argument) ||
-                argument.StartsWith("--", StringComparison.Ordinal))
-            {
-                continue;
-            }
-
-            return argument;
-        }
-
-        return null;
-    }
-
-    private static bool ShouldConsumeLogFilePath(IReadOnlyList<string> args, int candidateIndex)
-    {
-        var candidate = args[candidateIndex];
-        if (LooksLikeLogFilePath(candidate))
-        {
-            return true;
-        }
-
-        for (var i = candidateIndex + 1; i < args.Count; i++)
-        {
-            var argument = args[i];
-            if (!string.IsNullOrWhiteSpace(argument) &&
-                !argument.StartsWith("--", StringComparison.Ordinal))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static bool LooksLikeLogFilePath(string path)
-    {
-        var extension = Path.GetExtension(path);
-        return string.Equals(extension, ".log", StringComparison.OrdinalIgnoreCase) ||
-            string.Equals(extension, ".txt", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private static void TryEnableConsoleFileMirror(string path)
-    {
-        lock (ConsoleMirrorSync)
-        {
-            if (_consoleMirrorFile is not null)
-            {
-                return;
-            }
-
-            try
-            {
-                var directory = Path.GetDirectoryName(path);
-                if (!string.IsNullOrEmpty(directory))
-                {
-                    Directory.CreateDirectory(directory);
-                }
-
-                var stream = new FileStream(
-                    path,
-                    FileMode.Create,
-                    FileAccess.Write,
-                    FileShare.ReadWrite,
-                    bufferSize: 4096,
-                    FileOptions.SequentialScan);
-                _consoleMirrorFile = new StreamWriter(stream, new UTF8Encoding(encoderShouldEmitUTF8Identifier: false))
-                {
-                    AutoFlush = true,
-                };
-
-                Console.SetOut(new TeeTextWriter(Console.Out, _consoleMirrorFile));
-                Console.SetError(new TeeTextWriter(Console.Error, _consoleMirrorFile));
-                Console.Error.WriteLine($"[DEBUG] Log file: {Path.GetFullPath(path)}");
-            }
-            catch (Exception ex)
-            {
-                Console.Error.WriteLine($"[WARN] Could not open log file '{path}': {ex.Message}");
-            }
-        }
-    }
-
-    private static void DropConsoleFileMirror()
-    {
-        lock (ConsoleMirrorSync)
-        {
-            try
-            {
-                _consoleMirrorFile?.Flush();
-                _consoleMirrorFile?.Dispose();
-            }
-            catch
-            {
-            }
-
-            _consoleMirrorFile = null;
-        }
-    }
-
-    private static void ConfigureInheritedStdHandles(ref STARTUPINFO startupInfo)
-    {
-        if (!OperatingSystem.IsWindows())
-        {
-            return;
-        }
-
-        var input = GetStdHandle(STD_INPUT_HANDLE);
-        var output = GetStdHandle(STD_OUTPUT_HANDLE);
-        var error = GetStdHandle(STD_ERROR_HANDLE);
-        if (!IsHandleValid(output) && !IsHandleValid(error))
-        {
-            return;
-        }
-
-        if (IsHandleValid(input))
-        {
-            _ = SetHandleInformation(input, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
-            startupInfo.hStdInput = input;
-        }
-
-        if (IsHandleValid(output))
-        {
-            _ = SetHandleInformation(output, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
-            startupInfo.hStdOutput = output;
-        }
-
-        if (IsHandleValid(error))
-        {
-            _ = SetHandleInformation(error, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
-            startupInfo.hStdError = error;
-        }
-
-        startupInfo.dwFlags |= STARTF_USESTDHANDLES;
-    }
-
     private static string BuildCommandLine(string processPath, IReadOnlyList<string> args)
     {
         var builder = new StringBuilder();
@@ -785,30 +503,27 @@ internal static partial class Program
 
     private static void PrintUsage()
     {
-        Log.Info("Usage: SharpEmu.CLI [--strict] [--trace-imports[=N]] [--cpu-engine=<native>] [--log-level=<level>] [--log-file[=<path>]] <path-to-eboot.bin>");
-        Log.Info(@"Example: SharpEmu.CLI --cpu-engine=native --trace-imports=64 --log-level=debug --log-file ""E:\Games\...\eboot.bin""");
+        Log.Info("Usage: SharpEmu.CLI [--strict] [--trace-imports[=N]] [--cpu-engine=<native>] [--log-level=<level>] <path-to-eboot.bin>");
+        Log.Info(@"Example: SharpEmu.CLI --cpu-engine=native --trace-imports=64 --log-level=debug ""E:\Games\...\eboot.bin""");
     }
 
     private static bool TryParseArguments(
         string[] args,
         out string ebootPath,
         out SharpEmuRuntimeOptions runtimeOptions,
-        out LogLevel logLevel,
-        out string? logFilePath)
+        out LogLevel logLevel)
     {
         if (args.Length == 0)
         {
             ebootPath = string.Empty;
             runtimeOptions = default;
             logLevel = SharpEmuLog.MinimumLevel;
-            logFilePath = null;
             return false;
         }
 
         var strictDynlibResolution = false;
         var importTraceLimit = 0;
         var cpuEngine = CpuExecutionEngine.NativeOnly;
-        logFilePath = null;
         logLevel = SharpEmuLog.MinimumLevel;
         var pathTokens = new List<string>(args.Length);
         for (var i = 0; i < args.Length; i++)
@@ -838,7 +553,6 @@ internal static partial class Program
                 {
                     ebootPath = string.Empty;
                     runtimeOptions = default;
-                    logFilePath = null;
                     return false;
                 }
 
@@ -852,7 +566,6 @@ internal static partial class Program
                 {
                     ebootPath = string.Empty;
                     runtimeOptions = default;
-                    logFilePath = null;
                     return false;
                 }
 
@@ -860,23 +573,6 @@ internal static partial class Program
                 continue;
             }
 
-            if (string.Equals(argument, "--log-file", StringComparison.OrdinalIgnoreCase))
-            {
-                if (i + 1 < args.Length &&
-                    !string.IsNullOrWhiteSpace(args[i + 1]) &&
-                    !args[i + 1].StartsWith("--", StringComparison.Ordinal) &&
-                    ShouldConsumeLogFilePath(args, i + 1))
-                {
-                    logFilePath = args[++i];
-                }
-                else
-                {
-                    logFilePath = BuildDefaultLogFilePath(TryFindEbootPathToken(args));
-                }
-
-                continue;
-            }
-
             const string logLevelPrefix = "--log-level=";
             if (argument.StartsWith(logLevelPrefix, StringComparison.OrdinalIgnoreCase))
             {
@@ -900,7 +596,6 @@ internal static partial class Program
                     ebootPath = string.Empty;
                     runtimeOptions = default;
                     logLevel = SharpEmuLog.MinimumLevel;
-                    logFilePath = null;
                     return false;
                 }
 
@@ -923,27 +618,11 @@ internal static partial class Program
                 continue;
             }
 
-            const string logFilePrefix = "--log-file=";
-            if (argument.StartsWith(logFilePrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                logFilePath = argument[logFilePrefix.Length..];
-                if (string.IsNullOrWhiteSpace(logFilePath))
-                {
-                    ebootPath = string.Empty;
-                    runtimeOptions = default;
-                    logLevel = SharpEmuLog.MinimumLevel;
-                    return false;
-                }
-
-                continue;
-            }
-
             if (argument.StartsWith("--", StringComparison.Ordinal))
             {
                 ebootPath = string.Empty;
                 runtimeOptions = default;
                 logLevel = SharpEmuLog.MinimumLevel;
-                logFilePath = null;
                 return false;
             }
 
@@ -955,7 +634,6 @@ internal static partial class Program
             ebootPath = string.Empty;
             runtimeOptions = default;
             logLevel = SharpEmuLog.MinimumLevel;
-            logFilePath = null;
             return false;
         }
 
@@ -1057,56 +735,6 @@ internal static partial class Program
         public nuint PeakJobMemoryUsed;
     }
 
-    private sealed class TeeTextWriter : TextWriter
-    {
-        private readonly TextWriter _primary;
-        private readonly TextWriter _mirror;
-
-        public TeeTextWriter(TextWriter primary, TextWriter mirror)
-        {
-            _primary = primary;
-            _mirror = mirror;
-        }
-
-        public override Encoding Encoding => _primary.Encoding;
-
-        public override void Write(char value)
-        {
-            lock (ConsoleMirrorSync)
-            {
-                _primary.Write(value);
-                _mirror.Write(value);
-            }
-        }
-
-        public override void Write(string? value)
-        {
-            lock (ConsoleMirrorSync)
-            {
-                _primary.Write(value);
-                _mirror.Write(value);
-            }
-        }
-
-        public override void WriteLine(string? value)
-        {
-            lock (ConsoleMirrorSync)
-            {
-                _primary.WriteLine(value);
-                _mirror.WriteLine(value);
-            }
-        }
-
-        public override void Flush()
-        {
-            lock (ConsoleMirrorSync)
-            {
-                _primary.Flush();
-                _mirror.Flush();
-            }
-        }
-    }
-
     [DllImport("kernel32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     private static extern bool InitializeProcThreadAttributeList(
@@ -1191,10 +819,6 @@ internal static partial class Program
     [return: MarshalAs(UnmanagedType.Bool)]
     private static extern bool SetStdHandle(int stdHandle, nint handle);
 
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool SetHandleInformation(nint handle, uint mask, uint flags);
-
     [DllImport("kernel32.dll", EntryPoint = "CreateFileW", SetLastError = true, CharSet = CharSet.Unicode)]
     private static extern nint CreateFileW(
         string fileName,

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.CLI/packages.lock.json

@@ -216,10 +216,7 @@
         }
       },
       "sharpemu.hle": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.Logging": "[1.0.0, )"
-        }
+        "type": "Project"
       },
       "sharpemu.libs": {
         "type": "Project",

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

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using SharpEmu.HLE;
-using SharpEmu.Logging;
 
 namespace SharpEmu.Core.Cpu.Native;
 
@@ -38,78 +37,13 @@ public sealed partial class DirectExecutionBackend
 		}
 	}
 
-	private void RecordDeferredBootstrapTrace(
-		long dispatchIndex,
-		ulong op,
-		ulong symbolPointer,
-		ulong outputPointer,
-		ulong returnRip)
-	{
-		lock (_deferredBootstrapTraceGate)
-		{
-			_deferredBootstrapTrace[_deferredBootstrapTraceWriteIndex] = new DeferredBootstrapTraceEntry(
-				dispatchIndex,
-				op,
-				symbolPointer,
-				outputPointer,
-				returnRip);
-			_deferredBootstrapTraceWriteIndex =
-				(_deferredBootstrapTraceWriteIndex + 1) % _deferredBootstrapTrace.Length;
-			if (_deferredBootstrapTraceCount < _deferredBootstrapTrace.Length)
-			{
-				_deferredBootstrapTraceCount++;
-			}
-		}
-	}
-
-	private void DrainDeferredBootstrapTraces()
-	{
-		if (!_logBootstrap)
-		{
-			return;
-		}
-
-		DeferredBootstrapTraceEntry[] pending;
-		lock (_deferredBootstrapTraceGate)
-		{
-			if (_deferredBootstrapTraceCount == 0)
-			{
-				return;
-			}
-
-			pending = new DeferredBootstrapTraceEntry[_deferredBootstrapTraceCount];
-			var readIndex = (_deferredBootstrapTraceWriteIndex - _deferredBootstrapTraceCount +
-				_deferredBootstrapTrace.Length) % _deferredBootstrapTrace.Length;
-			for (var i = 0; i < _deferredBootstrapTraceCount; i++)
-			{
-				pending[i] = _deferredBootstrapTrace[(readIndex + i) % _deferredBootstrapTrace.Length];
-			}
-
-			_deferredBootstrapTraceCount = 0;
-		}
-
-		foreach (var entry in pending)
-		{
-			var symbolText = "<unreadable>";
-			if (TryReadAsciiZ(entry.SymbolPointer, 256, out var sym))
-			{
-				symbolText = sym;
-			}
-
-			Console.Error.WriteLine(
-				$"[LOADER][TRACE] bootstrap_call#{entry.DispatchIndex}: op=0x{entry.Op:X16} " +
-				$"sym_ptr=0x{entry.SymbolPointer:X16} sym='{symbolText}' " +
-				$"out_ptr=0x{entry.OutputPointer:X16} ret=0x{entry.ReturnRip:X16}");
-		}
-	}
-
 	private void DumpRecentImportTrace()
 	{
 		if (_recentImportTraceCount == 0)
 		{
 			return;
 		}
-		Log.Info($"   Recent import calls ({_recentImportTraceCount}):");
+		Console.Error.WriteLine($"[LOADER][INFO]   Recent import calls ({_recentImportTraceCount}):");
 		int num = (_recentImportTraceWriteIndex - _recentImportTraceCount + _recentImportTrace.Length) % _recentImportTrace.Length;
 		for (int i = 0; i < _recentImportTraceCount; i++)
 		{
@@ -117,8 +51,8 @@ public sealed partial class DirectExecutionBackend
 			var entry = _recentImportTrace[num2];
 			if (!string.IsNullOrEmpty(entry.Nid))
 			{
-				Log.Info(
-					$"     #{entry.DispatchIndex} nid={entry.Nid} ret=0x{entry.ReturnRip:X16} " +
+				Console.Error.WriteLine(
+					$"[LOADER][INFO]     #{entry.DispatchIndex} nid={entry.Nid} ret=0x{entry.ReturnRip:X16} " +
 					$"rdi=0x{entry.Arg0:X16} rsi=0x{entry.Arg1:X16} rdx=0x{entry.Arg2:X16}");
 			}
 		}
@@ -157,12 +91,12 @@ public sealed partial class DirectExecutionBackend
 						list.Add(num7);
 						if (num2 < 32)
 						{
-							Log.Info($"Suspicious unresolved pointer: slot=0x{num7:X16} value=0x{value2:X16}");
+							Console.Error.WriteLine($"[LOADER][INFO] Suspicious unresolved pointer: slot=0x{num7:X16} value=0x{value2:X16}");
 							num2++;
 						}
 						if (num >= 16384)
 						{
-							Log.Warning($"Suspicious unresolved pointer scan reached cap ({16384}); truncating.");
+							Console.Error.WriteLine($"[LOADER][WARNING] Suspicious unresolved pointer scan reached cap ({16384}); truncating.");
 							return list;
 						}
 					}
@@ -172,7 +106,7 @@ public sealed partial class DirectExecutionBackend
 		}
 		if (num != 0)
 		{
-			Log.Warning($"Suspicious unresolved pointer hits: {num}");
+			Console.Error.WriteLine($"[LOADER][WARNING] Suspicious unresolved pointer hits: {num}");
 		}
 		return list;
 	}
@@ -187,18 +121,18 @@ public sealed partial class DirectExecutionBackend
 		Span<byte> destination = stackalloc byte[128];
 		if (!cpuContext.Memory.TryRead(returnRip, destination))
 		{
-			Log.Debug($"Import#{dispatchIndex} return-rip probe: unreadable @0x{returnRip:X16}");
+			Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} return-rip probe: unreadable @0x{returnRip:X16}");
 			return;
 		}
 		string value = BitConverter.ToString(destination.ToArray()).Replace("-", " ");
-		Log.Debug($"Import#{dispatchIndex} return-rip bytes @0x{returnRip:X16}: {value}");
+		Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} return-rip bytes @0x{returnRip:X16}: {value}");
 		if (destination[0] == byte.MaxValue && (destination[1] == 21 || destination[1] == 37))
 		{
 			int num = BitConverter.ToInt32(destination.Slice(2, 4));
 			ulong num2 = returnRip + 6 + (ulong)num;
 			if (cpuContext.TryReadUInt64(num2, out var value2))
 			{
-				Log.Debug($"Import#{dispatchIndex} return-rip slot: [0x{num2:X16}] = 0x{value2:X16}");
+				Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} return-rip slot: [0x{num2:X16}] = 0x{value2:X16}");
 			}
 		}
 		if (destination[0] == 72 && destination[1] == 139 && destination[2] == 5)
@@ -207,7 +141,7 @@ public sealed partial class DirectExecutionBackend
 			ulong num4 = returnRip + 7 + (ulong)num3;
 			if (cpuContext.TryReadUInt64(num4, out var value3))
 			{
-				Log.Debug($"Import#{dispatchIndex} return-rip mov-slot: [0x{num4:X16}] = 0x{value3:X16}");
+				Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} return-rip mov-slot: [0x{num4:X16}] = 0x{value3:X16}");
 			}
 		}
 		for (int i = 0; i + 6 <= destination.Length; i++)
@@ -219,7 +153,7 @@ public sealed partial class DirectExecutionBackend
 				ulong num7 = num6 + 6 + (ulong)num5;
 				if (cpuContext.TryReadUInt64(num7, out var value4))
 				{
-					Log.Debug($"Import#{dispatchIndex} near-indirect @{num6:X16}: slot=0x{num7:X16} val=0x{value4:X16}");
+					Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} near-indirect @{num6:X16}: slot=0x{num7:X16} val=0x{value4:X16}");
 				}
 			}
 		}
@@ -234,33 +168,32 @@ public sealed partial class DirectExecutionBackend
 			int rel32 = BitConverter.ToInt32(destination.Slice(i + 1, 4));
 			ulong callRip = returnRip + (ulong)i;
 			ulong target = unchecked((ulong)((long)(callRip + 5) + rel32));
-			Log.Debug($"Import#{dispatchIndex} near-call @{callRip:X16}: target=0x{target:X16}");
-			var importEntries = _importEntries;
-			for (int importIndex = 0; importIndex < importEntries.Length; importIndex++)
+			Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} near-call @{callRip:X16}: target=0x{target:X16}");
+			for (int importIndex = 0; importIndex < _importEntries.Length; importIndex++)
 			{
-				if (importEntries[importIndex].Address != target)
+				if (_importEntries[importIndex].Address != target)
 				{
 					continue;
 				}
 
-				string nid = importEntries[importIndex].Nid;
+				string nid = _importEntries[importIndex].Nid;
 				if (_moduleManager.TryGetExport(nid, out var export))
 				{
-					Log.Debug(
-						$"Import#{dispatchIndex} near-call import: index={importIndex} {export.LibraryName}:{export.Name} ({nid})");
+					Console.Error.WriteLine(
+						$"[LOADER][TRACE] Import#{dispatchIndex} near-call import: index={importIndex} {export.LibraryName}:{export.Name} ({nid})");
 				}
 				else
 				{
-					Log.Debug(
-						$"Import#{dispatchIndex} near-call import: index={importIndex} nid={nid}");
+					Console.Error.WriteLine(
+						$"[LOADER][TRACE] Import#{dispatchIndex} near-call import: index={importIndex} nid={nid}");
 				}
 				break;
 			}
 
 			if (cpuContext.Memory.TryRead(target, targetBytes))
 			{
-				Log.Debug(
-					$"Import#{dispatchIndex} near-call target bytes @0x{target:X16}: " +
+				Console.Error.WriteLine(
+					$"[LOADER][TRACE] Import#{dispatchIndex} near-call target bytes @0x{target:X16}: " +
 					BitConverter.ToString(targetBytes.ToArray()).Replace("-", " "));
 				if (targetBytes[0] == 0xFF && targetBytes[1] == 0x25)
 				{
@@ -268,25 +201,25 @@ public sealed partial class DirectExecutionBackend
 					ulong slot = unchecked((ulong)((long)(target + 6) + slotRel32));
 					if (cpuContext.TryReadUInt64(slot, out var slotTarget))
 					{
-						Log.Debug(
-							$"Import#{dispatchIndex} near-call PLT slot: [0x{slot:X16}] = 0x{slotTarget:X16}");
-						for (int importIndex = 0; importIndex < importEntries.Length; importIndex++)
+						Console.Error.WriteLine(
+							$"[LOADER][TRACE] Import#{dispatchIndex} near-call PLT slot: [0x{slot:X16}] = 0x{slotTarget:X16}");
+						for (int importIndex = 0; importIndex < _importEntries.Length; importIndex++)
 						{
-							if (importEntries[importIndex].Address != slotTarget)
+							if (_importEntries[importIndex].Address != slotTarget)
 							{
 								continue;
 							}
 
-							string nid = importEntries[importIndex].Nid;
+							string nid = _importEntries[importIndex].Nid;
 							if (_moduleManager.TryGetExport(nid, out var export))
 							{
-								Log.Debug(
-									$"Import#{dispatchIndex} near-call PLT import: index={importIndex} {export.LibraryName}:{export.Name} ({nid})");
+								Console.Error.WriteLine(
+									$"[LOADER][TRACE] Import#{dispatchIndex} near-call PLT import: index={importIndex} {export.LibraryName}:{export.Name} ({nid})");
 							}
 							else
 							{
-								Log.Debug(
-									$"Import#{dispatchIndex} near-call PLT import: index={importIndex} nid={nid}");
+								Console.Error.WriteLine(
+									$"[LOADER][TRACE] Import#{dispatchIndex} near-call PLT import: index={importIndex} nid={nid}");
 							}
 							break;
 						}

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

@@ -103,15 +103,6 @@ public sealed partial class DirectExecutionBackend
 			ulong rip = ReadCtxU64(contextRecord, 248);
 			ulong rsp = ReadCtxU64(contextRecord, 152);
 
-			// Thread-mode probe: a hardware exception raised while this thread is inside
-			// the managed import gateway means the VEH->managed reentry happened from
-			// cooperative GC mode — a ReversePInvokeBadTransition candidate.
-			if (LogThreadMode && _threadModeGatewayDepth > 0)
-			{
-				TraceThreadMode(
-					$"veh_in_gateway code=0x{exceptionCode:X8} rip=0x{rip:X16} gateway_depth={_threadModeGatewayDepth}");
-			}
-
 			if (exceptionCode == 3221225477u && TryHandleLazyCommittedPage(exceptionRecord, rip, rsp))
 			{
 				return -1;

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

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using SharpEmu.Core.Cpu;
-using SharpEmu.Core.Loader;
 using SharpEmu.HLE;
 
 namespace SharpEmu.Core.Cpu.Native;
@@ -20,16 +19,6 @@ public sealed partial class DirectExecutionBackend
 
 	private static ulong ImportDispatchGatewayManaged(nint backendHandle, int importIndex, nint argPackPtr)
 	{
-		if (LogThreadMode)
-		{
-			_threadModeGatewayCalls++;
-			_threadModeGatewayDepth++;
-			if (!_threadModeGatewayFirstLogged)
-			{
-				_threadModeGatewayFirstLogged = true;
-				TraceThreadMode($"gateway_first import={importIndex} total={_threadModeGatewayCalls}");
-			}
-		}
 		try
 		{
 			if (!(GCHandle.FromIntPtr(backendHandle).Target is DirectExecutionBackend directExecutionBackend))
@@ -47,13 +36,6 @@ public sealed partial class DirectExecutionBackend
 				$"[LOADER][ERROR] ImportDispatchGatewayManaged exception: {ex.GetType().Name}: {ex.Message}");
 			return 18446744071562199298uL;
 		}
-		finally
-		{
-			if (LogThreadMode)
-			{
-				_threadModeGatewayDepth--;
-			}
-		}
 	}
 
 	private unsafe static int RawVectoredHandlerManaged(void* exceptionInfo)
@@ -87,12 +69,6 @@ public sealed partial class DirectExecutionBackend
 			WriteCtxU64(contextRecord, 152, nextRsp);
 			WriteCtxU64(contextRecord, 248, returnRip);
 			Interlocked.Increment(ref _rawSentinelRecoveries);
-			if (LogThreadMode)
-			{
-				TraceThreadMode(
-					$"sentinel_recover rip=0x{value:X16} -> 0x{returnRip:X16} rsp=0x{rsp:X16} -> 0x{nextRsp:X16} " +
-					$"gateway_depth={_threadModeGatewayDepth}");
-			}
 			return -1;
 		}
 		return 0;
@@ -111,13 +87,12 @@ public sealed partial class DirectExecutionBackend
 			LastError = "Import dispatch called without active CPU context";
 			return 18446744071562199298uL;
 		}
-		var importEntries = _importEntries;
-		if ((uint)importIndex >= (uint)importEntries.Length)
+		if ((uint)importIndex >= (uint)_importEntries.Length)
 		{
 			LastError = $"Import dispatch index out of range: {importIndex}";
 			return 18446744071562199042uL;
 		}
-		ImportStubEntry importStubEntry = importEntries[importIndex];
+		ImportStubEntry importStubEntry = _importEntries[importIndex];
 		int num2 = Volatile.Read(in _rawSentinelRecoveries);
 		if (num2 != _lastReportedRawSentinelRecoveries)
 		{
@@ -161,14 +136,6 @@ public sealed partial class DirectExecutionBackend
 				*(ulong*)(xmmSlot + 8));
 		}
 		cpuContext[CpuRegister.Rsp] = (ulong)argPackPtr + 96uL;
-		if (importStubEntry.Kind == ImportStubKind.BootstrapBridge)
-		{
-			NormalizeKernelDynlibDlsymArguments(cpuContext, out _, out _);
-			*(ulong*)argPackPtr = cpuContext[CpuRegister.Rdi];
-			*(ulong*)(argPackPtr + 8) = cpuContext[CpuRegister.Rsi];
-			*(ulong*)(argPackPtr + 16) = cpuContext[CpuRegister.Rdx];
-		}
-
 		ulong value = cpuContext[CpuRegister.Rdi];
 		ulong value2 = cpuContext[CpuRegister.Rsi];
 		ulong num3 = cpuContext[CpuRegister.Rdx];
@@ -219,6 +186,16 @@ public sealed partial class DirectExecutionBackend
 			TraceGuestContext(
 				$"import dispatch={num} nid={importStubEntry.Nid} ret=0x{num7:X16} managed={Environment.CurrentManagedThreadId} guest=0x{GuestThreadExecution.CurrentGuestThreadHandle:X16} fiber=0x{GuestThreadExecution.CurrentFiberAddress:X16} active={HasActiveExecutionThread}");
 		}
+		if (_logBootstrap && string.Equals(importStubEntry.Nid, RuntimeStubNids.BootstrapBridge, StringComparison.Ordinal))
+		{
+			string symbolText = "<unreadable>";
+			if (TryReadAsciiZ(value2, 256, out var sym))
+			{
+				symbolText = sym;
+			}
+			Console.Error.WriteLine(
+				$"[LOADER][TRACE] bootstrap_call#{num}: op=0x{value:X16} sym_ptr=0x{value2:X16} sym='{symbolText}' out_ptr=0x{num3:X16} ret=0x{num7:X16}");
+		}
 		if (!isGuestWorker &&
 			!ActiveForcedGuestExit &&
 			ShouldForceGuestExitOnImportLoop(importStubEntry.Nid, num7, num, value, value2) &&
@@ -227,33 +204,6 @@ public sealed partial class DirectExecutionBackend
 			cpuContext[CpuRegister.Rax] = 1uL;
 			return 1uL;
 		}
-		// Backend teardown in progress: unwind this worker to the host instead of
-		// dispatching. RunGuestThread parks it as Blocked with no wake handler, its
-		// host thread exits, and RequestGuestThreadTeardown can finish before any
-		// executable memory is freed.
-		if (isGuestWorker &&
-			_guestTeardownRequested &&
-			TryYieldGuestThreadToHostStub(argPackPtr, num, num7, importStubEntry.Nid, "backend teardown"))
-		{
-			cpuContext[CpuRegister.Rax] = 0uL;
-			return 0uL;
-		}
-		if (_hostShutdownRequested)
-		{
-			if (isGuestWorker &&
-				TryYieldGuestThreadToHostStub(argPackPtr, num, num7, importStubEntry.Nid, "host shutdown"))
-			{
-				cpuContext[CpuRegister.Rax] = 0uL;
-				return 0uL;
-			}
-
-			if (!isGuestWorker &&
-				TryAbortGuestForHostShutdown(argPackPtr, num, num7))
-			{
-				cpuContext[CpuRegister.Rax] = 1uL;
-				return 1uL;
-			}
-		}
 		bool flag0 = ShouldSuppressStrlenTrace(importStubEntry.Nid);
 		bool flag = num7 >= 2156221920u && num7 <= 2156225024u;
 		bool flag2 = num7 >= 2156351360u && num7 <= 2156352080u;
@@ -261,13 +211,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;
@@ -328,15 +277,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}");
 		}
@@ -366,7 +315,7 @@ public sealed partial class DirectExecutionBackend
 				Console.Error.Flush();
 			}
 		}
-		if ((traceFlags & ImportStubTraceFlags.StackChkFail) != 0)
+		if (importStubEntry.Nid == "Ou3iL1abvng")
 		{
 			if (_logStackCheck)
 			{
@@ -398,20 +347,16 @@ public sealed partial class DirectExecutionBackend
 				ActiveGuestReturnSlotAddress);
 			try
 			{
-				if (importStubEntry.Kind == ImportStubKind.BootstrapBridge)
+				if (string.Equals(importStubEntry.Nid, RuntimeStubNids.BootstrapBridge, StringComparison.Ordinal))
 				{
-					if (_logBootstrap)
-					{
-						RecordDeferredBootstrapTrace(num, value, value2, num3, num7);
-					}
-
 					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();
 				}
@@ -566,7 +511,6 @@ public sealed partial class DirectExecutionBackend
 			cpuContext.GetXmmRegister(0, out var returnXmm0Low, out var returnXmm0High);
 			*(ulong*)(argPackPtr - 0x80) = returnXmm0Low;
 			*(ulong*)(argPackPtr - 0x80 + 8) = returnXmm0High;
-			DrainDeferredBootstrapTraces();
 			return cpuContext[CpuRegister.Rax];
 		}
 		catch (Exception ex)
@@ -575,7 +519,6 @@ public sealed partial class DirectExecutionBackend
 			Console.Error.WriteLine($"[LOADER][ERROR] {LastError}");
 			Console.Error.WriteLine($"[LOADER][ERROR] {ex.StackTrace}");
 			cpuContext[CpuRegister.Rax] = 18446744071562199298uL;
-			DrainDeferredBootstrapTraces();
 			return 18446744071562199298uL;
 		}
 	}
@@ -728,7 +671,6 @@ public sealed partial class DirectExecutionBackend
 			"eE4Szl8sil8" or // sceKernelAprSubmitCommandBuffer
 			"qvMUCyyaCSI" or // sceKernelAprSubmitCommandBufferAndGetId
 			"Q2V+iqvjgC0" or // vsnprintf
-			"AV6ipCNa4Rw" or // strcasecmp
 			"q1cHNfGycLI" or // scePadRead
 			"xk0AcarP3V4" or // scePadOpen
 			"yH17Q6NWtVg" or // sceUserServiceGetEvent
@@ -752,9 +694,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;
@@ -767,7 +706,6 @@ public sealed partial class DirectExecutionBackend
 		if (!expectedFileProbeMiss &&
 			!expectedTimedWaitTimeout &&
 			!expectedEqueueTimeout &&
-			!expectedEventFlagTimeout &&
 			!expectedMutexTrylockBusy &&
 			!expectedUserServiceNoEvent &&
 			!expectedPrivacyInvalidParameter)
@@ -830,15 +768,11 @@ public sealed partial class DirectExecutionBackend
 			return !_logUsleep;
 		}
 
-		// Mutex lock uses this block-capable leaf path. Keep it out of the no-block subset.
 		return nid is
 			"9UK1vLZQft4" or // scePthreadMutexLock
-			"7H0iTOciTLo" or // pthread_mutex_lock
 			"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
@@ -897,11 +831,10 @@ 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
-			"AV6ipCNa4Rw" or // strcasecmp
 			"pNtJdE3x49E" or // wcscmp
 			"fV2xHER+bKE" or // wcscoll
 			"E8wCoUEbfzk" or // wcsncmp
@@ -912,7 +845,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
@@ -922,12 +860,7 @@ public sealed partial class DirectExecutionBackend
 			"vz+pg2zdopI" or // sceKernelGetEventUserData
 			"mJ7aghmgvfc" or // sceKernelGetEventId
 			"23CPPI1tyBY" or // sceKernelGetEventFilter
-			"kwGyyjohI50" or // sceKernelGetEventData
-			// _Getpctype is a per-character ctype table lookup; the embedded mcpp preprocessor
-			// re-fetches the table pointer on every isdigit()/isalpha() check, so classifying a
-			// large input legitimately calls it hundreds of thousands of times back-to-back -
-			// real, finite work that would otherwise trip the loop guard.
-			"sUP1hBaouOw";   // _Getpctype
+			"kwGyyjohI50";   // sceKernelGetEventData
 	}
 
 	private long NextImportDispatchIndex()
@@ -991,31 +924,6 @@ public sealed partial class DirectExecutionBackend
 		return true;
 	}
 
-	private unsafe bool TryAbortGuestForHostShutdown(nint argPackPtr, long dispatchIndex, ulong returnRip)
-	{
-		ulong hostExit = ActiveEntryReturnSentinelRip;
-		if (hostExit < 65536 || !TryPatchActiveGuestReturnSlot(hostExit))
-		{
-			return false;
-		}
-		try
-		{
-			*(ulong*)(argPackPtr + 96) = hostExit;
-		}
-		catch
-		{
-			return false;
-		}
-		ActiveForcedGuestExit = true;
-		if (string.IsNullOrWhiteSpace(LastError))
-		{
-			LastError = "Host shutdown requested.";
-		}
-		Console.Error.WriteLine(
-			$"[LOADER][INFO] Guest unwind for host shutdown at import#{dispatchIndex} ret=0x{returnRip:X16} -> host_exit=0x{hostExit:X16}");
-		return true;
-	}
-
 	private unsafe bool TryCompleteGuestEntryToHostStub(nint argPackPtr, long dispatchIndex, ulong returnRip, string nid, string reason, ulong value)
 	{
 		ulong hostExit = ActiveEntryReturnSentinelRip;
@@ -1122,15 +1030,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()
 	{
@@ -1370,485 +1270,30 @@ public sealed partial class DirectExecutionBackend
 		{
 			return OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
 		}
-
-		NormalizeKernelDynlibDlsymArguments(cpuContext, out var symbolNameAddress, out var outputAddress);
-		try
+		ulong symbolNameAddress = cpuContext[CpuRegister.Rsi];
+		ulong outputAddress = cpuContext[CpuRegister.Rdx];
+		if (!TryReadAsciiZ(symbolNameAddress, 512, out var symbolName))
 		{
-			if (!TryReadAsciiZ(symbolNameAddress, 512, out var symbolName) ||
-				!TryResolveDlsymGuestAddress(symbolName, out var resolvedAddress) ||
-				outputAddress == 0 ||
-				!TryWriteUInt64Compat(outputAddress, resolvedAddress))
-			{
-				return CompleteKernelDynlibDlsymFailure(cpuContext, outputAddress);
-			}
+			cpuContext[CpuRegister.Rax] = 18446744073709551615uL;
+			return OrbisGen2Result.ORBIS_GEN2_OK;
 		}
-		catch
+		if (!TryResolveRuntimeSymbolAddress(symbolName, out var resolvedAddress) &&
+			!TryResolveRuntimeSymbolAlias(symbolName, out resolvedAddress))
 		{
-			return CompleteKernelDynlibDlsymFailure(cpuContext, outputAddress);
+			Console.Error.WriteLine(
+				$"[LOADER][WARN] sceKernelDlsym failed: handle=0x{cpuContext[CpuRegister.Rdi]:X} symbol='{symbolName}'");
+			cpuContext[CpuRegister.Rax] = 18446744073709551615uL;
+			return OrbisGen2Result.ORBIS_GEN2_OK;
+		}
+		if (outputAddress == 0L || !TryWriteUInt64Compat(outputAddress, resolvedAddress))
+		{
+			cpuContext[CpuRegister.Rax] = 18446744073709551615uL;
+			return OrbisGen2Result.ORBIS_GEN2_OK;
 		}
-
 		cpuContext[CpuRegister.Rax] = 0uL;
 		return OrbisGen2Result.ORBIS_GEN2_OK;
 	}
 
-	private static void NormalizeKernelDynlibDlsymArguments(
-		CpuContext cpuContext,
-		out ulong symbolNameAddress,
-		out ulong outputAddress)
-	{
-		var handle = cpuContext[CpuRegister.Rdi];
-		symbolNameAddress = cpuContext[CpuRegister.Rsi];
-		outputAddress = cpuContext[CpuRegister.Rdx];
-
-		// Standalone bootstrap loaders sometimes call through the bridge with
-		// (symbol_ptr, handle, out) while sceKernelDlsym is (handle, symbol_ptr, out).
-		// Heuristic only: valid when RSI looks like a small handle and RDI is a guest pointer.
-		if (symbolNameAddress < 0x10000 &&
-			IsPlausibleDynlibSymbolPointer(handle))
-		{
-			symbolNameAddress = handle;
-			handle = cpuContext[CpuRegister.Rsi];
-			cpuContext[CpuRegister.Rdi] = handle;
-			cpuContext[CpuRegister.Rsi] = symbolNameAddress;
-		}
-	}
-
-	private static bool IsPlausibleDynlibSymbolPointer(ulong address)
-	{
-		return address >= 0x10000 && address < 0x0000_8000_0000_0000UL;
-	}
-
-	private OrbisGen2Result CompleteKernelDynlibDlsymFailure(CpuContext cpuContext, ulong outputAddress)
-	{
-		if (outputAddress != 0)
-		{
-			_ = TryWriteUInt64Compat(outputAddress, 0);
-		}
-
-		cpuContext[CpuRegister.Rax] = ulong.MaxValue;
-		return OrbisGen2Result.ORBIS_GEN2_OK;
-	}
-
-	private void ResetLazyDlsymStubState()
-	{
-		lock (_lazyDlsymStubGate)
-		{
-			_lazyDlsymStubCache.Clear();
-			_lazyImportStubPoolMapped = false;
-			_lazyImportStubPoolBase = 0;
-			_lazyImportStubNextSlot = 0;
-			_lazyImportStubPoolLimit = 0;
-		}
-	}
-
-	private bool TryResolveDlsymGuestAddress(string symbolName, out ulong guestAddress)
-	{
-		guestAddress = 0;
-		if (string.IsNullOrWhiteSpace(symbolName))
-		{
-			return false;
-		}
-
-		// Tier 0: ELF runtime symbols and aliases.
-		if (TryResolveRuntimeSymbolAddress(symbolName, out guestAddress) ||
-			TryResolveRuntimeSymbolAlias(symbolName, out guestAddress))
-		{
-			return true;
-		}
-
-		// Tier 1: existing import stub entries (duplicate prevention).
-		if (TryFindImportStubGuestAddress(symbolName, out guestAddress))
-		{
-			return true;
-		}
-
-		var hasAerolibSymbol = Aerolib.Instance.TryGetByExportName(symbolName, out var hleSymbol);
-		if (hasAerolibSymbol)
-		{
-			if (HleDataSymbols.TryGetAddress(hleSymbol.Nid, out _))
-			{
-				return false;
-			}
-
-			if (TryResolveRuntimeSymbolAddress(hleSymbol.Nid, out guestAddress) ||
-				TryResolveRuntimeSymbolAddress(hleSymbol.ExportName, out guestAddress) ||
-				TryFindImportStubGuestAddress(hleSymbol.Nid, out guestAddress) ||
-				TryFindImportStubGuestAddress(hleSymbol.ExportName, out guestAddress))
-			{
-				return true;
-			}
-		}
-		else if (Aerolib.Instance.TryGetByNid(symbolName, out hleSymbol))
-		{
-			if (HleDataSymbols.TryGetAddress(hleSymbol.Nid, out _))
-			{
-				return false;
-			}
-
-			if (TryFindImportStubGuestAddress(hleSymbol.Nid, out guestAddress) ||
-				TryFindImportStubGuestAddress(hleSymbol.ExportName, out guestAddress))
-			{
-				return true;
-			}
-
-			hasAerolibSymbol = true;
-		}
-
-		// Tier 3: lazy materialization for callable HLE symbols missing from ELF imports.
-		if (!TryResolveLazyDispatchTarget(symbolName, hasAerolibSymbol, in hleSymbol, out var dispatchNid, out var export))
-		{
-			return false;
-		}
-
-		return TryGetOrCreateLazyImportStub(
-			dispatchNid,
-			symbolName,
-			hasAerolibSymbol ? hleSymbol : null,
-			export,
-			out guestAddress);
-	}
-
-	private bool TryFindImportStubGuestAddress(string identifier, out ulong guestAddress)
-	{
-		guestAddress = 0;
-		if (string.IsNullOrWhiteSpace(identifier))
-		{
-			return false;
-		}
-
-		var importEntries = _importEntries;
-		for (var i = 0; i < importEntries.Length; i++)
-		{
-			var entry = importEntries[i];
-			if (!ImportStubEntryMatchesIdentifier(entry, identifier))
-			{
-				continue;
-			}
-
-			if (entry.Address >= 0x10000)
-			{
-				guestAddress = entry.Address;
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private static bool ImportStubEntryMatchesIdentifier(in ImportStubEntry entry, string identifier)
-	{
-		if (string.Equals(entry.Nid, identifier, StringComparison.Ordinal))
-		{
-			return true;
-		}
-
-		if (entry.Export is not { } export)
-		{
-			return false;
-		}
-
-		return string.Equals(export.Name, identifier, StringComparison.Ordinal) ||
-			string.Equals(export.Nid, identifier, StringComparison.Ordinal);
-	}
-
-	private static bool IsKernelDynlibDlsymIdentifier(string identifier)
-	{
-		return string.Equals(identifier, "sceKernelDlsym", StringComparison.Ordinal) ||
-			string.Equals(identifier, KernelDynlibDlsymAerolibNid, StringComparison.Ordinal) ||
-			string.Equals(identifier, RuntimeStubNids.KernelDynlibDlsym, StringComparison.Ordinal);
-	}
-
-	private bool TryResolveLazyDispatchTarget(
-		string symbolName,
-		bool hasAerolibSymbol,
-		in SysAbiSymbol hleSymbol,
-		out string dispatchNid,
-		out ExportedFunction? export)
-	{
-		export = null;
-		dispatchNid = string.Empty;
-
-		if (IsKernelDynlibDlsymIdentifier(symbolName))
-		{
-			dispatchNid = KernelDynlibDlsymAerolibNid;
-			_ = _moduleManager.TryGetExport(dispatchNid, out export);
-			return true;
-		}
-
-		if (!hasAerolibSymbol)
-		{
-			return false;
-		}
-
-		if (HleDataSymbols.TryGetAddress(hleSymbol.Nid, out _))
-		{
-			return false;
-		}
-
-		if (_moduleManager.TryGetExport(hleSymbol.Nid, out export))
-		{
-			dispatchNid = hleSymbol.Nid;
-			return true;
-		}
-
-		return false;
-	}
-
-	private bool TryGetOrCreateLazyImportStub(
-		string dispatchNid,
-		string symbolName,
-		SysAbiSymbol? hleSymbol,
-		ExportedFunction? export,
-		out ulong guestAddress)
-	{
-		guestAddress = 0;
-		if (string.IsNullOrWhiteSpace(dispatchNid))
-		{
-			return false;
-		}
-
-		lock (_lazyDlsymStubGate)
-		{
-			if (TryGetCachedLazyDlsymAddress(dispatchNid, symbolName, out guestAddress))
-			{
-				return true;
-			}
-
-			if (!EnsureLazyImportStubPoolMapped())
-			{
-				LogLazyImportStubMaterializationFailure(
-					"import stub region unresolved",
-					dispatchNid,
-					symbolName);
-				return false;
-			}
-
-			if (!TryAllocateLazyImportStubSlot(out guestAddress))
-			{
-				LogLazyImportStubMaterializationFailure(
-					"lazy import stub pool exhausted",
-					dispatchNid,
-					symbolName);
-				return false;
-			}
-
-			var previousEntries = _importEntries;
-			var importIndex = previousEntries.Length;
-			var newEntries = new ImportStubEntry[importIndex + 1];
-			if (importIndex > 0)
-			{
-				Array.Copy(previousEntries, newEntries, importIndex);
-			}
-
-			newEntries[importIndex] = new ImportStubEntry(guestAddress, dispatchNid, export);
-
-			var hostTrampoline = CreateImportHandlerTrampoline(importIndex);
-			if (hostTrampoline == 0 ||
-				!PatchImportStub((nint)(long)guestAddress, hostTrampoline))
-			{
-				guestAddress = 0;
-				LogLazyImportStubMaterializationFailure(
-					"failed to patch lazy import stub trampoline",
-					dispatchNid,
-					symbolName);
-				return false;
-			}
-
-			_importEntries = newEntries;
-
-			RegisterDlsymRuntimeSymbolKeys(symbolName, dispatchNid, hleSymbol, guestAddress);
-			return true;
-		}
-	}
-
-	private bool TryGetCachedLazyDlsymAddress(string dispatchNid, string symbolName, out ulong guestAddress)
-	{
-		if (_lazyDlsymStubCache.TryGetValue(dispatchNid, out guestAddress) ||
-			_lazyDlsymStubCache.TryGetValue(symbolName, out guestAddress))
-		{
-			return guestAddress >= 0x10000;
-		}
-
-		return false;
-	}
-
-	private void RegisterDlsymRuntimeSymbolKeys(
-		string symbolName,
-		string dispatchNid,
-		SysAbiSymbol? hleSymbol,
-		ulong guestAddress)
-	{
-		RegisterDlsymRuntimeSymbolKey(symbolName, guestAddress);
-		RegisterDlsymRuntimeSymbolKey(dispatchNid, guestAddress);
-
-		if (IsKernelDynlibDlsymIdentifier(symbolName) || IsKernelDynlibDlsymIdentifier(dispatchNid))
-		{
-			RegisterDlsymRuntimeSymbolKey(RuntimeStubNids.KernelDynlibDlsym, guestAddress);
-			RegisterDlsymRuntimeSymbolKey(KernelDynlibDlsymAerolibNid, guestAddress);
-			RegisterDlsymRuntimeSymbolKey("sceKernelDlsym", guestAddress);
-		}
-
-		if (hleSymbol.HasValue)
-		{
-			RegisterDlsymRuntimeSymbolKey(hleSymbol.Value.Nid, guestAddress);
-			RegisterDlsymRuntimeSymbolKey(hleSymbol.Value.ExportName, guestAddress);
-		}
-	}
-
-	private void RegisterDlsymRuntimeSymbolKey(string key, ulong guestAddress)
-	{
-		if (string.IsNullOrWhiteSpace(key) || !IsRuntimeSymbolAddressUsable(guestAddress))
-		{
-			return;
-		}
-
-		_runtimeSymbolsByName[key] = guestAddress;
-		_lazyDlsymStubCache[key] = guestAddress;
-	}
-
-	private void LogLazyImportStubMaterializationFailure(string reason, string dispatchNid, string symbolName)
-	{
-		Console.Error.WriteLine(
-			$"[LOADER][WARN] Lazy import stub materialization failed ({reason}): " +
-			$"nid={dispatchNid} symbol='{symbolName}'");
-	}
-
-	private unsafe bool TryResolveImportStubRegionBounds(
-		ImportStubEntry[] importEntries,
-		out ulong regionBase,
-		out ulong regionLimit)
-	{
-		regionBase = 0;
-		regionLimit = 0;
-
-		for (var candidateIndex = 0; candidateIndex < 64; candidateIndex++)
-		{
-			var candidateBase = ImportStubRegionCanonicalBase -
-				(ulong)candidateIndex * ImportStubRegionAddressStride;
-			if (VirtualQuery((void*)candidateBase, out var memoryInfo, (nuint)sizeof(MEMORY_BASIC_INFORMATION64)) == 0 ||
-				memoryInfo.RegionSize == 0 ||
-				memoryInfo.State != 4096)
-			{
-				continue;
-			}
-
-			var candidateLimit = candidateBase + memoryInfo.RegionSize;
-			var hasStub = false;
-			for (var i = 0; i < importEntries.Length; i++)
-			{
-				var entryAddress = importEntries[i].Address;
-				if (entryAddress < candidateBase || entryAddress >= candidateLimit)
-				{
-					continue;
-				}
-
-				if ((entryAddress - candidateBase) % LazyImportStubSlotSize != 0)
-				{
-					continue;
-				}
-
-				hasStub = true;
-				break;
-			}
-
-			if (!hasStub)
-			{
-				continue;
-			}
-
-			regionBase = candidateBase;
-			regionLimit = candidateLimit;
-			return true;
-		}
-
-		ulong maxStubEnd = 0;
-		for (var i = 0; i < importEntries.Length; i++)
-		{
-			var entryAddress = importEntries[i].Address;
-			if (entryAddress < ImportStubRegionCanonicalBase)
-			{
-				continue;
-			}
-
-			if ((entryAddress - ImportStubRegionCanonicalBase) % LazyImportStubSlotSize != 0)
-			{
-				continue;
-			}
-
-			var entryEnd = entryAddress + LazyImportStubSlotSize;
-			if (entryEnd > maxStubEnd)
-			{
-				maxStubEnd = entryEnd;
-				regionBase = ImportStubRegionCanonicalBase;
-			}
-		}
-
-		if (regionBase == 0 || maxStubEnd <= regionBase)
-		{
-			return false;
-		}
-
-		var spanBytes = maxStubEnd - regionBase;
-		regionLimit = regionBase + AlignUp(spanBytes, ImportStubRegionPageSize);
-		return regionLimit > regionBase;
-	}
-
-	private bool EnsureLazyImportStubPoolMapped()
-	{
-		if (_lazyImportStubPoolMapped && _lazyImportStubPoolBase != 0)
-		{
-			return true;
-		}
-
-		var importEntries = _importEntries;
-		if (!TryResolveImportStubRegionBounds(importEntries, out var importStubRegionBase, out var importStubRegionLimit))
-		{
-			return false;
-		}
-
-		ulong nextSlot = importStubRegionBase;
-		for (var i = 0; i < importEntries.Length; i++)
-		{
-			var entryAddress = importEntries[i].Address;
-			if (entryAddress < importStubRegionBase || entryAddress >= importStubRegionLimit)
-			{
-				continue;
-			}
-
-			var entryEnd = entryAddress + LazyImportStubSlotSize;
-			if (entryEnd > nextSlot)
-			{
-				nextSlot = entryEnd;
-			}
-		}
-
-		if (nextSlot >= importStubRegionLimit)
-		{
-			return false;
-		}
-
-		_lazyImportStubPoolBase = importStubRegionBase;
-		_lazyImportStubNextSlot = nextSlot;
-		_lazyImportStubPoolLimit = importStubRegionLimit;
-		_lazyImportStubPoolMapped = true;
-		return true;
-	}
-
-	private bool TryAllocateLazyImportStubSlot(out ulong guestAddress)
-	{
-		guestAddress = 0;
-		if (!_lazyImportStubPoolMapped ||
-			_lazyImportStubNextSlot < _lazyImportStubPoolBase ||
-			_lazyImportStubNextSlot + LazyImportStubSlotSize > _lazyImportStubPoolLimit)
-		{
-			return false;
-		}
-
-		guestAddress = _lazyImportStubNextSlot;
-		_lazyImportStubNextSlot += LazyImportStubSlotSize;
-		return true;
-	}
-
 	private bool TryResolveRuntimeSymbolAlias(string symbolName, out ulong address)
 	{
 		address = 0;
@@ -1913,20 +1358,29 @@ public sealed partial class DirectExecutionBackend
 			return OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
 		}
 
+		ulong bridgeHandle = cpuContext[CpuRegister.Rdi];
+		ulong symbolNameAddress = cpuContext[CpuRegister.Rsi];
 		ulong outputAddress = cpuContext[CpuRegister.Rdx];
-		try
+		_ = TryReadAsciiZ(symbolNameAddress, 512, out var symbolName);
+
+		OrbisGen2Result result = DispatchKernelDynlibDlsym();
+		if (result != OrbisGen2Result.ORBIS_GEN2_OK)
 		{
-			OrbisGen2Result result = DispatchKernelDynlibDlsym();
-			if (result != OrbisGen2Result.ORBIS_GEN2_OK)
-			{
-				return result;
-			}
+			return result;
 		}
-		catch
+		if (_logBootstrap)
 		{
-			return CompleteKernelDynlibDlsymFailure(cpuContext, outputAddress);
+			Console.Error.WriteLine(
+				$"[LOADER][TRACE] bootstrap_dispatch: handle=0x{bridgeHandle:X16} symbol='{symbolName}' out=0x{outputAddress:X16} rax=0x{cpuContext[CpuRegister.Rax]:X16}");
 		}
 
+		if (cpuContext[CpuRegister.Rax] == 0uL)
+		{
+			return OrbisGen2Result.ORBIS_GEN2_OK;
+		}
+
+		Console.Error.WriteLine(
+			$"[LOADER][WARN] bootstrap_bridge unresolved: handle=0x{bridgeHandle:X} symbol='{symbolName}' out=0x{outputAddress:X16}");
 		return OrbisGen2Result.ORBIS_GEN2_OK;
 	}
 
@@ -1967,7 +1421,6 @@ public sealed partial class DirectExecutionBackend
 		{
 			return false;
 		}
-
 		List<byte> list = new List<byte>(Math.Min(maxLength, 256));
 		Span<byte> destination = stackalloc byte[1];
 		for (int i = 0; i < maxLength; i++)

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

@@ -1,582 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Native;
-
-public sealed partial class DirectExecutionBackend
-{
-	// Guest entry stubs must not run above CLR-managed frames on a CLR-created thread:
-	// the suspension/stack-walk machinery then has to traverse a frame chain that is
-	// interleaved with guest stubs carrying no CLR unwind info, and any window in which
-	// the thread-mode bookkeeping disagrees with the actual stack (import dispatch, VEH
-	// redirection) fail-fasts the runtime — the audio_output_thread ~7th-cycle
-	// "attempted to call a UnmanagedCallersOnly method from managed code" crash.
-	//
-	// Guest execution therefore runs on dedicated raw OS threads whose run loop is
-	// emitted native code. While guest code executes there is not a single managed
-	// frame on the thread and it sits in preemptive mode, so the GC ignores it
-	// entirely. The only managed activity on the thread is the reverse-P/Invoke import
-	// dispatch and the per-run prologue/epilogue, which the CLR supports on foreign
-	// threads (lazy attach, preemptive between calls). The managed orchestrator
-	// (RunGuestThread / the main execution thread) parks in a preemptive wait for the
-	// duration of the run, so its own frame chain is never walked across guest frames.
-	private static readonly bool NativeGuestWorkersDisabled =
-		string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_DISABLE_NATIVE_GUEST_WORKERS"), "1", StringComparison.Ordinal);
-
-	private readonly object _nativeWorkerGate = new();
-	private readonly List<NativeGuestExecutor> _allNativeWorkers = new();
-	private readonly Stack<NativeGuestExecutor> _idleNativeWorkers = new();
-	private bool _nativeWorkersDisposed;
-	private int _nativeWorkerCreationFailedLogged;
-
-	private const uint StackSizeParamIsAReservation = 0x00010000u;
-
-	[DllImport("kernel32.dll", SetLastError = true)]
-	private static extern nint CreateThread(
-		nint lpThreadAttributes,
-		nuint dwStackSize,
-		nint lpStartAddress,
-		nint lpParameter,
-		uint dwCreationFlags,
-		out uint lpThreadId);
-
-	[DllImport("kernel32.dll", SetLastError = true)]
-	private static extern uint WaitForSingleObject(nint hHandle, uint dwMilliseconds);
-
-	// Runs an emitted guest entry stub. Preferred path is a pooled native worker
-	// thread; falls back to the historical inline calli (guest frames above this
-	// thread's managed frames) when workers are disabled or unavailable.
-	//
-	// Callers set the Active* thread-statics before emitting the stub and read the
-	// yield/forced-exit flags right after this returns, so the worker outcome is
-	// copied back into this thread's statics before returning.
-	private unsafe int RunGuestEntryStub(void* entryStub, ulong hostRspSlot)
-	{
-		var worker = RentNativeGuestExecutor();
-		if (worker is null)
-		{
-			TlsSetValue(_hostRspSlotTlsIndex, (nint)hostRspSlot);
-			return CallNativeEntry(entryStub);
-		}
-		try
-		{
-			var state = _activeGuestThreadState;
-			var nativeReturn = worker.Run(
-				_activeCpuContext!,
-				state,
-				GuestThreadExecution.CurrentGuestThreadHandle,
-				_activeEntryReturnSentinelRip,
-				_activeGuestReturnSlotAddress,
-				(nint)hostRspSlot,
-				(nint)entryStub,
-				state?.AffinityMask ?? 0,
-				out var yieldRequested,
-				out var yieldReason,
-				out var forcedExit);
-			_activeGuestThreadYieldRequested = yieldRequested;
-			_activeGuestThreadYieldReason = yieldReason;
-			_activeForcedGuestExit = forcedExit;
-			return nativeReturn;
-		}
-		finally
-		{
-			ReturnNativeGuestExecutor(worker);
-		}
-	}
-
-	private NativeGuestExecutor? RentNativeGuestExecutor()
-	{
-		if (NativeGuestWorkersDisabled)
-		{
-			return null;
-		}
-		lock (_nativeWorkerGate)
-		{
-			if (_nativeWorkersDisposed)
-			{
-				return null;
-			}
-			if (_idleNativeWorkers.Count > 0)
-			{
-				return _idleNativeWorkers.Pop();
-			}
-		}
-		var worker = NativeGuestExecutor.TryCreate(this);
-		if (worker is null)
-		{
-			if (Interlocked.Exchange(ref _nativeWorkerCreationFailedLogged, 1) == 0)
-			{
-				Console.Error.WriteLine(
-					"[LOADER][WARN] Failed to create a native guest worker thread; falling back to inline guest execution.");
-			}
-			return null;
-		}
-		lock (_nativeWorkerGate)
-		{
-			if (_nativeWorkersDisposed)
-			{
-				worker.Dispose();
-				return null;
-			}
-			_allNativeWorkers.Add(worker);
-		}
-		return worker;
-	}
-
-	private void ReturnNativeGuestExecutor(NativeGuestExecutor worker)
-	{
-		lock (_nativeWorkerGate)
-		{
-			if (!_nativeWorkersDisposed)
-			{
-				_idleNativeWorkers.Push(worker);
-				return;
-			}
-		}
-		worker.Dispose();
-	}
-
-	private void DisposeNativeGuestExecutors()
-	{
-		NativeGuestExecutor[] workers;
-		lock (_nativeWorkerGate)
-		{
-			if (_nativeWorkersDisposed)
-			{
-				return;
-			}
-			_nativeWorkersDisposed = true;
-			workers = _allNativeWorkers.ToArray();
-			_allNativeWorkers.Clear();
-			_idleNativeWorkers.Clear();
-		}
-		foreach (var worker in workers)
-		{
-			worker.Dispose();
-		}
-	}
-
-	// A pooled raw OS thread that executes guest entry stubs. The run loop is emitted
-	// native code (no CLR unwind info required — nothing ever unwinds through it):
-	//
-	//   loop: WaitForSingleObject(work);
-	//         if (*stopFlag) { SetEvent(done); ExitThread(0); }
-	//         rax = RunPrologue(self);      // managed: binds per-run ambient, returns stub
-	//         if (rax != 0) eax = rax();    // guest entry stub — zero managed frames below
-	//         RunEpilogue(self, eax);       // managed: captures outcome, restores ambient
-	//         SetEvent(done); goto loop;
-	//
-	// Workers carry no per-guest identity of their own: the prologue rebinds guest TLS,
-	// the host-RSP slot, the Active* thread-statics and the GuestThreadExecution ambient
-	// on every run, so a worker can be reused for any guest thread.
-	private sealed unsafe class NativeGuestExecutor : IDisposable
-	{
-		private const uint LoopStubSize = 512u;
-		private const uint WorkerStackReservation = 4u * 1024u * 1024u;
-
-		private static nint _waitForSingleObjectAddress;
-		private static nint _setEventAddress;
-		private static nint _exitThreadAddress;
-
-		private readonly DirectExecutionBackend _backend;
-		private readonly AutoResetEvent _workAvailable = new(false);
-		private readonly AutoResetEvent _workCompleted = new(false);
-		private GCHandle _selfHandle;
-		private void* _controlBlock;
-		private void* _loopStub;
-		private nint _threadHandle;
-		private uint _nativeThreadId;
-
-		// Single in-flight run; publication is ordered by the work/done event pair.
-		private CpuContext? _runContext;
-		private GuestThreadState? _runState;
-		private ulong _runGuestThreadHandle;
-		private ulong _runSentinelRip;
-		private ulong _runReturnSlotAddress;
-		private nint _runHostRspSlot;
-		private nint _runEntryStub;
-		private ulong _runAffinityMask;
-		private int _runNativeResult;
-		private bool _runYieldRequested;
-		private string? _runYieldReason;
-		private bool _runForcedExit;
-		private bool _runPrologueFailed;
-
-		// Prologue -> epilogue carry, only touched on the worker thread.
-		private DirectExecutionBackend? _prevBackend;
-		private CpuContext? _prevContext;
-		private ulong _prevSentinel;
-		private ulong _prevReturnSlot;
-		private bool _prevForcedExit;
-		private bool _prevYieldRequested;
-		private string? _prevYieldReason;
-		private GuestThreadState? _prevState;
-		private ulong _prevGuestThreadHandle;
-		private nint _prevHostRspSlot;
-		private int _prevHostThreadId;
-		private bool _entered;
-
-		private NativeGuestExecutor(DirectExecutionBackend backend)
-		{
-			_backend = backend;
-		}
-
-		public static NativeGuestExecutor? TryCreate(DirectExecutionBackend backend)
-		{
-			if (!EnsureKernel32Exports())
-			{
-				return null;
-			}
-			var executor = new NativeGuestExecutor(backend);
-			if (!executor.Initialize())
-			{
-				executor.Dispose();
-				return null;
-			}
-			return executor;
-		}
-
-		private static bool EnsureKernel32Exports()
-		{
-			if (_exitThreadAddress != 0)
-			{
-				return _waitForSingleObjectAddress != 0 && _setEventAddress != 0;
-			}
-			nint kernel32 = GetModuleHandle("kernel32.dll");
-			if (kernel32 == 0)
-			{
-				return false;
-			}
-			_waitForSingleObjectAddress = GetProcAddress(kernel32, "WaitForSingleObject");
-			_setEventAddress = GetProcAddress(kernel32, "SetEvent");
-			_exitThreadAddress = GetProcAddress(kernel32, "ExitThread");
-			return _waitForSingleObjectAddress != 0 && _setEventAddress != 0 && _exitThreadAddress != 0;
-		}
-
-		private bool Initialize()
-		{
-			_selfHandle = GCHandle.Alloc(this);
-			_controlBlock = VirtualAlloc(null, 4096u, 12288u, 4u);
-			if (_controlBlock == null)
-			{
-				return false;
-			}
-			_loopStub = VirtualAlloc(null, LoopStubSize, 12288u, 64u);
-			if (_loopStub == null)
-			{
-				return false;
-			}
-
-			var prologuePtr = (nint)(delegate* unmanaged<nint, nint>)&RunPrologue;
-			var epiloguePtr = (nint)(delegate* unmanaged<nint, int, void>)&RunEpilogue;
-			var executorHandle = GCHandle.ToIntPtr(_selfHandle);
-			var workHandle = _workAvailable.SafeWaitHandle.DangerousGetHandle();
-			var doneHandle = _workCompleted.SafeWaitHandle.DangerousGetHandle();
-
-			byte* code = (byte*)_loopStub;
-			int offset = 0;
-			void Emit(byte value) => code[offset++] = value;
-			void EmitMovRcxImm64(ulong value)
-			{
-				Emit(0x48); Emit(0xB9);
-				*(ulong*)(code + offset) = value;
-				offset += sizeof(ulong);
-			}
-			void EmitMovRaxImm64(ulong value)
-			{
-				Emit(0x48); Emit(0xB8);
-				*(ulong*)(code + offset) = value;
-				offset += sizeof(ulong);
-			}
-			void EmitCallRax()
-			{
-				Emit(0xFF); Emit(0xD0);
-			}
-			void EmitSetDoneEvent()
-			{
-				EmitMovRcxImm64((ulong)doneHandle);
-				EmitMovRaxImm64((ulong)_setEventAddress);
-				EmitCallRax();
-			}
-
-			// Thread entry leaves RSP ≡ 8 (mod 16); after this every call below happens
-			// at RSP ≡ 0 with shadow space available.
-			Emit(0x48); Emit(0x83); Emit(0xEC); Emit(0x28); // sub rsp, 0x28
-			int loopStart = offset;
-			EmitMovRcxImm64((ulong)workHandle);
-			Emit(0xBA);                                     // mov edx, INFINITE
-			*(uint*)(code + offset) = 0xFFFFFFFFu;
-			offset += sizeof(uint);
-			EmitMovRaxImm64((ulong)_waitForSingleObjectAddress);
-			EmitCallRax();
-			EmitMovRaxImm64((ulong)_controlBlock);
-			Emit(0x83); Emit(0x38); Emit(0x00);             // cmp dword [rax], 0
-			Emit(0x0F); Emit(0x85);                         // jne stop
-			int stopJump = offset;
-			offset += sizeof(int);
-			EmitMovRcxImm64((ulong)executorHandle);
-			EmitMovRaxImm64((ulong)prologuePtr);
-			EmitCallRax();                                  // rax = entry stub, or 0 on failure
-			Emit(0x48); Emit(0x85); Emit(0xC0);             // test rax, rax
-			Emit(0x0F); Emit(0x84);                         // je skipEntry
-			int skipJump = offset;
-			offset += sizeof(int);
-			EmitCallRax();                                  // guest entry stub -> eax
-			int skipEntryOffset = offset;
-			Emit(0x89); Emit(0xC2);                         // mov edx, eax
-			EmitMovRcxImm64((ulong)executorHandle);
-			EmitMovRaxImm64((ulong)epiloguePtr);
-			EmitCallRax();
-			EmitSetDoneEvent();
-			Emit(0xE9);                                     // jmp loop
-			*(int*)(code + offset) = loopStart - (offset + sizeof(int));
-			offset += sizeof(int);
-			int stopOffset = offset;
-			// Signal done so a Run() racing teardown cannot park forever; a stopped
-			// worker is never re-rented, so the stale signal is unobservable.
-			EmitSetDoneEvent();
-			Emit(0x31); Emit(0xC9);                         // xor ecx, ecx
-			EmitMovRaxImm64((ulong)_exitThreadAddress);
-			EmitCallRax();
-			Emit(0xCC);                                     // int3 (ExitThread never returns)
-			*(int*)(code + stopJump) = stopOffset - (stopJump + sizeof(int));
-			*(int*)(code + skipJump) = skipEntryOffset - (skipJump + sizeof(int));
-
-			uint oldProtect = 0;
-			if (!VirtualProtect(_loopStub, LoopStubSize, 32u, &oldProtect))
-			{
-				return false;
-			}
-			FlushInstructionCache(GetCurrentProcess(), _loopStub, LoopStubSize);
-			_threadHandle = CreateThread(
-				0,
-				WorkerStackReservation,
-				(nint)_loopStub,
-				0,
-				StackSizeParamIsAReservation,
-				out _nativeThreadId);
-			if (_threadHandle == 0)
-			{
-				return false;
-			}
-			if (LogThreadMode)
-			{
-				TraceThreadMode($"worker_created native_tid={_nativeThreadId} loop=0x{(ulong)_loopStub:X16}");
-			}
-			return true;
-		}
-
-		public int Run(
-			CpuContext context,
-			GuestThreadState? state,
-			ulong guestThreadHandle,
-			ulong sentinelRip,
-			ulong returnSlotAddress,
-			nint hostRspSlot,
-			nint entryStub,
-			ulong affinityMask,
-			out bool yieldRequested,
-			out string? yieldReason,
-			out bool forcedExit)
-		{
-			_runContext = context;
-			_runState = state;
-			_runGuestThreadHandle = guestThreadHandle;
-			_runSentinelRip = sentinelRip;
-			_runReturnSlotAddress = returnSlotAddress;
-			_runHostRspSlot = hostRspSlot;
-			_runEntryStub = entryStub;
-			_runAffinityMask = affinityMask;
-			_runPrologueFailed = true;
-			_runYieldRequested = false;
-			_runYieldReason = null;
-			_runForcedExit = false;
-			_workAvailable.Set();
-			_workCompleted.WaitOne();
-			_runContext = null;
-			_runState = null;
-			yieldRequested = _runYieldRequested;
-			yieldReason = _runYieldReason;
-			forcedExit = _runForcedExit;
-			if (_runPrologueFailed)
-			{
-				throw new InvalidOperationException("Native guest worker failed to bind the run ambient (prologue fault)");
-			}
-			return _runNativeResult;
-		}
-
-		[UnmanagedCallersOnly]
-		private static nint RunPrologue(nint executorHandle)
-		{
-			try
-			{
-				var executor = (NativeGuestExecutor)GCHandle.FromIntPtr(executorHandle).Target!;
-				return executor.EnterRun();
-			}
-			catch (Exception ex)
-			{
-				try
-				{
-					Console.Error.WriteLine(
-						$"[LOADER][ERROR] Native guest worker prologue failed: {ex.GetType().Name}: {ex.Message}");
-				}
-				catch
-				{
-				}
-				return 0;
-			}
-		}
-
-		[UnmanagedCallersOnly]
-		private static void RunEpilogue(nint executorHandle, int nativeResult)
-		{
-			try
-			{
-				var executor = (NativeGuestExecutor)GCHandle.FromIntPtr(executorHandle).Target!;
-				executor.ExitRun(nativeResult);
-			}
-			catch (Exception ex)
-			{
-				try
-				{
-					Console.Error.WriteLine(
-						$"[LOADER][ERROR] Native guest worker epilogue failed: {ex.GetType().Name}: {ex.Message}");
-				}
-				catch
-				{
-				}
-			}
-		}
-
-		private nint EnterRun()
-		{
-			var backend = _backend;
-			_prevBackend = _activeExecutionBackend;
-			_prevContext = _activeCpuContext;
-			_prevSentinel = _activeEntryReturnSentinelRip;
-			_prevReturnSlot = _activeGuestReturnSlotAddress;
-			_prevForcedExit = _activeForcedGuestExit;
-			_prevYieldRequested = _activeGuestThreadYieldRequested;
-			_prevYieldReason = _activeGuestThreadYieldReason;
-			_prevState = _activeGuestThreadState;
-			_prevHostRspSlot = TlsGetValue(backend._hostRspSlotTlsIndex);
-			_prevGuestThreadHandle = GuestThreadExecution.EnterGuestThread(_runGuestThreadHandle);
-			_entered = true;
-			_activeExecutionBackend = backend;
-			_activeCpuContext = _runContext;
-			_activeEntryReturnSentinelRip = _runSentinelRip;
-			_activeGuestReturnSlotAddress = _runReturnSlotAddress;
-			_activeForcedGuestExit = false;
-			_activeGuestThreadYieldRequested = false;
-			_activeGuestThreadYieldReason = null;
-			_activeGuestThreadState = _runState;
-			backend.BindTlsBase(_runContext!);
-			TlsSetValue(backend._hostRspSlotTlsIndex, _runHostRspSlot);
-			if (_runState is { } state)
-			{
-				_prevHostThreadId = Volatile.Read(ref state.HostThreadId);
-				Volatile.Write(ref state.HostThreadId, unchecked((int)GetCurrentThreadId()));
-			}
-			if (_runAffinityMask != 0)
-			{
-				backend.ApplyGuestThreadAffinity(_runAffinityMask);
-			}
-			_runPrologueFailed = false;
-			if (LogThreadMode)
-			{
-				TraceThreadMode(
-					$"worker_enter guest=0x{_runGuestThreadHandle:X16} stub=0x{(ulong)_runEntryStub:X16}");
-			}
-			return _runEntryStub;
-		}
-
-		private void ExitRun(int nativeResult)
-		{
-			_runNativeResult = nativeResult;
-			_runYieldRequested = _activeGuestThreadYieldRequested;
-			_runYieldReason = _activeGuestThreadYieldReason;
-			_runForcedExit = _activeForcedGuestExit;
-			if (!_entered)
-			{
-				return;
-			}
-			_entered = false;
-			if (_runState is { } state)
-			{
-				Volatile.Write(ref state.HostThreadId, _prevHostThreadId);
-			}
-			TlsSetValue(_backend._hostRspSlotTlsIndex, _prevHostRspSlot);
-			GuestThreadExecution.RestoreGuestThread(_prevGuestThreadHandle);
-			_activeExecutionBackend = _prevBackend;
-			_activeCpuContext = _prevContext;
-			_activeEntryReturnSentinelRip = _prevSentinel;
-			_activeGuestReturnSlotAddress = _prevReturnSlot;
-			_activeForcedGuestExit = _prevForcedExit;
-			_activeGuestThreadYieldRequested = _prevYieldRequested;
-			_activeGuestThreadYieldReason = _prevYieldReason;
-			_activeGuestThreadState = _prevState;
-			_prevBackend = null;
-			_prevContext = null;
-			_prevState = null;
-			_prevYieldReason = null;
-			if (LogThreadMode)
-			{
-				TraceThreadMode(
-					$"worker_exit guest=0x{_runGuestThreadHandle:X16} result=0x{nativeResult:X8} yield={_runYieldRequested}");
-			}
-		}
-
-		public void Dispose()
-		{
-			if (_controlBlock != null)
-			{
-				*(int*)_controlBlock = 1;
-			}
-			try
-			{
-				_workAvailable.Set();
-			}
-			catch (ObjectDisposedException)
-			{
-			}
-			var exited = _threadHandle == 0;
-			if (_threadHandle != 0)
-			{
-				exited = WaitForSingleObject(_threadHandle, 1000u) == 0u;
-				CloseHandle(_threadHandle);
-				_threadHandle = 0;
-			}
-			if (!exited)
-			{
-				// The worker is still parked in guest code (teardown should have unwound
-				// it first). Leak the stub, control block, events and GC handle rather
-				// than have the thread execute freed memory.
-				Console.Error.WriteLine(
-					$"[LOADER][WARN] Native guest worker tid={_nativeThreadId} did not stop; leaking its run loop.");
-				return;
-			}
-			if (_loopStub != null)
-			{
-				VirtualFree(_loopStub, 0u, 32768u);
-				_loopStub = null;
-			}
-			if (_controlBlock != null)
-			{
-				VirtualFree(_controlBlock, 0u, 32768u);
-				_controlBlock = null;
-			}
-			if (_selfHandle.IsAllocated)
-			{
-				_selfHandle.Free();
-			}
-			_workAvailable.Dispose();
-			_workCompleted.Dispose();
-		}
-	}
-}

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/Loader/SelfLoader.cs

@@ -10,16 +10,12 @@ using SharpEmu.Core;
 using SharpEmu.Core.Cpu;
 using SharpEmu.Core.Memory;
 using SharpEmu.HLE;
-using SharpEmu.Logging;
 
 namespace SharpEmu.Core.Loader;
 
 public sealed class SelfLoader : ISelfLoader
 {
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("Loader");
-    private const uint ElfMagic = 0x7F454C46;
-    private const uint Ps4SelfMagic  = 0x4F153D1D;
-    private const uint Ps5SelfMagic  = 0x5414F5EE;
+    private const uint SelfMagic = 0x4F153D1D;
     private const ulong SelfSegmentFlag = 0x800;
     private const int PageSize = 0x1000;
     private const ulong ImportStubBaseAddress = 0x0000_7000_0000_0000UL;
@@ -159,7 +155,7 @@ public sealed class SelfLoader : ISelfLoader
         }
 
         var tlsModuleId = _nextTlsModuleId == 0 ? 1u : _nextTlsModuleId;
-        Log.Debug($"TLS load_start clear={clearVirtualMemory} next={_nextTlsModuleId} assigned={tlsModuleId}");
+        Console.Error.WriteLine($"[LOADER][TLS] load_start clear={clearVirtualMemory} next={_nextTlsModuleId} assigned={tlsModuleId}");
 
         var loadContext = ParseLayout(imageData);
         var elfHeader = ReadUnmanaged<ElfHeader>(imageData, loadContext.ElfOffset);
@@ -259,7 +255,7 @@ public sealed class SelfLoader : ISelfLoader
         {
             _nextTlsModuleId++;
         }
-        Log.Debug($"TLS load_done assigned={tlsModuleId} next={_nextTlsModuleId}");
+        Console.Error.WriteLine($"[LOADER][TLS] load_done assigned={tlsModuleId} next={_nextTlsModuleId}");
 
         return new SelfImage(
             loadContext.IsSelf,
@@ -325,8 +321,7 @@ public sealed class SelfLoader : ISelfLoader
             throw new InvalidDataException("Input image is too small to contain an ELF header.");
         }
 
-        var magic = BinaryPrimitives.ReadUInt32BigEndian(imageData[..sizeof(uint)]);
-        if (magic is Ps4SelfMagic or Ps5SelfMagic)
+        if (imageData.Length >= sizeof(uint) && BinaryPrimitives.ReadUInt32BigEndian(imageData[..sizeof(uint)]) == SelfMagic)
         {
             var selfHeader = ReadUnmanaged<SelfHeader>(imageData, 0);
             if (!selfHeader.HasKnownLayout || selfHeader.Unknown != 0x22)
@@ -348,12 +343,6 @@ public sealed class SelfLoader : ISelfLoader
             return new LoadContext(IsSelf: true, elfOffset, selfHeader.FileSize, segments);
         }
 
-        if (magic != ElfMagic)
-        {
-            throw new InvalidDataException(
-                $"Unsupported executable signature 0x{magic:X8}");
-        }
-
         return new LoadContext(IsSelf: false, ElfOffset: 0, SelfFileSize: 0, Array.Empty<SelfSegment>());
     }
 
@@ -414,15 +403,15 @@ public sealed class SelfLoader : ISelfLoader
 
             var virtualAddress = header.VirtualAddress + imageBase;
 
-            Log.Debug($"Segment {index}: VAddr=0x{virtualAddress:X16}, FileSize=0x{header.FileSize:X}, MemSize=0x{header.MemorySize:X}, Align=0x{header.Alignment:X}");
+            Console.Error.WriteLine($"[LOADER] Segment {index}: VAddr=0x{virtualAddress:X16}, FileSize=0x{header.FileSize:X}, MemSize=0x{header.MemorySize:X}, Align=0x{header.Alignment:X}");
             if (header.Alignment > 1)
             {
                 var vaddrMod = virtualAddress % header.Alignment;
                 var offsetMod = header.Offset % header.Alignment;
                 if (vaddrMod != offsetMod)
                 {
-                    Log.Warning(
-                        $"Segment {index} ELF alignment mismatch! " +
+                    Console.Error.WriteLine(
+                        $"[LOADER] WARNING: Segment {index} ELF alignment mismatch! " +
                         $"VAddr=0x{virtualAddress:X}, Offset=0x{header.Offset:X}, Align=0x{header.Alignment:X}, " +
                         $"VAddr%Align=0x{vaddrMod:X}, Offset%Align=0x{offsetMod:X}");
                 }
@@ -682,13 +671,13 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (descriptor.ValueKind == RelocationValueKind.TlsModuleId)
                 {
-                    Log.Debug(
-                        $"Patching DTPMOD64 at 0x{descriptor.TargetAddress:X} with module id 0x{targetValue:X}");
+                    Console.Error.WriteLine(
+                        $"[LOADER][TLS] Patching DTPMOD64 at 0x{descriptor.TargetAddress:X} with module id 0x{targetValue:X}");
                 }
                 else
                 {
-                    Log.Warning($"!!! CRITICAL !!! Patching address 0x{descriptor.TargetAddress:X} with INVALID value 0x{targetValue:X} for NID {descriptor.ImportNid ?? "(null)"}");
-                    Log.Warning($"  SymbolValue=0x{descriptor.SymbolValue:X}, Addend=0x{descriptor.Addend:X}, StubAddress=0x{(addressesByNid.TryGetValue(descriptor.ImportNid ?? "", out var sa) ? sa : 0):X}");
+                    Console.Error.WriteLine($"[LOADER] !!! CRITICAL !!! Patching address 0x{descriptor.TargetAddress:X} with INVALID value 0x{targetValue:X} for NID {descriptor.ImportNid ?? "(null)"}");
+                    Console.Error.WriteLine($"[LOADER]   SymbolValue=0x{descriptor.SymbolValue:X}, Addend=0x{descriptor.Addend:X}, StubAddress=0x{(addressesByNid.TryGetValue(descriptor.ImportNid ?? "", out var sa) ? sa : 0):X}");
                 }
             }
 
@@ -700,8 +689,8 @@ public sealed class SelfLoader : ISelfLoader
             if (descriptor.TargetAddress >= 0x00000008030FC300UL &&
                 descriptor.TargetAddress <= 0x00000008030FC3F0UL)
             {
-                Log.Debug(
-                    $"[RELOC] target=0x{descriptor.TargetAddress:X16} value=0x{targetValue:X16} addend=0x{descriptor.Addend:X} nid={(descriptor.ImportNid ?? "<sym>")}");
+                Console.Error.WriteLine(
+                    $"[LOADER][RELOC] target=0x{descriptor.TargetAddress:X16} value=0x{targetValue:X16} addend=0x{descriptor.Addend:X} nid={(descriptor.ImportNid ?? "<sym>")}");
             }
         }
 
@@ -794,15 +783,15 @@ public sealed class SelfLoader : ISelfLoader
         {
             if (IsFocusRelocationOffset(relocation.Offset, imageBase))
             {
-                Log.Debug(
-                    $"[FOCUS][SCAN] off=0x{relocation.Offset:X16} type={relocation.Type} sym={relocation.SymbolIndex} addend=0x{relocation.Addend:X}");
+                Console.Error.WriteLine(
+                    $"[LOADER][FOCUS][SCAN] off=0x{relocation.Offset:X16} type={relocation.Type} sym={relocation.SymbolIndex} addend=0x{relocation.Addend:X}");
             }
 
             if (!IsSupportedRelocationType(relocation.Type))
             {
                 if (IsFocusRelocationOffset(relocation.Offset, imageBase))
                 {
-                    Log.Debug($"[FOCUS][SKIP] unsupported type={relocation.Type}");
+                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] unsupported type={relocation.Type}");
                 }
                 continue;
             }
@@ -811,7 +800,7 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (IsFocusRelocationOffset(relocation.Offset, imageBase))
                 {
-                    Log.Debug("[FOCUS][SKIP] target address not mapped");
+                    Console.Error.WriteLine("[LOADER][FOCUS][SKIP] target address not mapped");
                 }
                 continue;
             }
@@ -851,7 +840,7 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (targetAddress >= FocusRelocGuestStart && targetAddress <= FocusRelocGuestEnd)
                 {
-                    Log.Debug($"[FOCUS][SKIP] symbol read failed index={symbolIndex}");
+                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] symbol read failed index={symbolIndex}");
                 }
                 continue;
             }
@@ -863,9 +852,10 @@ public sealed class SelfLoader : ISelfLoader
                 var symbolAddress = ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
                 if (symbolAddress == 0)
                 {
-                    Log.Warning(
-                        $"Skipping local relocation with invalid symbol value 0x{symbol.Value:X} " +
+                    Console.Error.WriteLine(
+                        $"[LOADER] Skipping local relocation with invalid symbol value 0x{symbol.Value:X} " +
                         $"at target 0x{targetAddress:X16}, type={relocation.Type}, sym={symbolIndex}");
+                    continue;
                 }
 
                 descriptors.Add(new RelocationDescriptor(
@@ -883,9 +873,10 @@ public sealed class SelfLoader : ISelfLoader
                 var symbolAddress = ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
                 if (symbolAddress == 0)
                 {
-                    Log.Warning(
-                        $"Skipping relocation with invalid symbol value 0x{symbol.Value:X} " +
+                    Console.Error.WriteLine(
+                        $"[LOADER] Skipping relocation with invalid symbol value 0x{symbol.Value:X} " +
                         $"at target 0x{targetAddress:X16}, type={relocation.Type}, sym={symbolIndex}");
+                    continue;
                 }
 
                 descriptors.Add(new RelocationDescriptor(
@@ -902,7 +893,7 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (targetAddress >= FocusRelocGuestStart && targetAddress <= FocusRelocGuestEnd)
                 {
-                    Log.Debug($"[FOCUS][SKIP] bind={symbolBind} not importable");
+                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] bind={symbolBind} not importable");
                 }
                 continue;
             }
@@ -911,7 +902,7 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (targetAddress >= FocusRelocGuestStart && targetAddress <= FocusRelocGuestEnd)
                 {
-                    Log.Debug($"[FOCUS][SKIP] symbol name read failed offset={symbol.NameOffset}");
+                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] symbol name read failed offset={symbol.NameOffset}");
                 }
                 continue;
             }
@@ -959,8 +950,8 @@ public sealed class SelfLoader : ISelfLoader
 
         if (sectionSymbols > 0 || dynamicSymbols > 0)
         {
-            Log.Info(
-                $"Runtime symbol index populated: section={sectionSymbols}, dynamic={dynamicSymbols}, total={runtimeSymbols.Count}");
+            Console.Error.WriteLine(
+                $"[LOADER] Runtime symbol index populated: section={sectionSymbols}, dynamic={dynamicSymbols}, total={runtimeSymbols.Count}");
         }
     }
 
@@ -1034,8 +1025,8 @@ public sealed class SelfLoader : ISelfLoader
 
         if (preInitializers.Count != 0 || initializers.Count != 0)
         {
-            Log.Info(
-                $"Initializers discovered: preinit={preInitializers.Count}, init={initializers.Count}");
+            Console.Error.WriteLine(
+                $"[LOADER] Initializers discovered: preinit={preInitializers.Count}, init={initializers.Count}");
         }
     }
 
@@ -1418,8 +1409,8 @@ public sealed class SelfLoader : ISelfLoader
 
         var requiredBytes = checked((ulong)orderedImportNids.Count * ImportStubSlotSize);
         var mapSize = AlignUp(Math.Max(requiredBytes, (ulong)PageSize), PageSize);
-        Log.Debug(
-            $"CreateImportStubMapping: nids={orderedImportNids.Count}, required=0x{requiredBytes:X}, map_size=0x{mapSize:X}");
+        Console.Error.WriteLine(
+            $"[LOADER] CreateImportStubMapping: nids={orderedImportNids.Count}, required=0x{requiredBytes:X}, map_size=0x{mapSize:X}");
         if (mapSize > int.MaxValue)
         {
             throw new NotSupportedException("Import stub mapping exceeds 2 GB and is not supported.");
@@ -1851,16 +1842,16 @@ public sealed class SelfLoader : ISelfLoader
         tableBytes = GC.AllocateUninitializedArray<byte>((int)size);
 
         var guestAddr = location + imageBase;
-        Log.Debug($"TryLoadTableBytes: trying guest address 0x{guestAddr:X}");
+        Console.Error.WriteLine($"[LOADER] TryLoadTableBytes: trying guest address 0x{guestAddr:X}");
         if (virtualMemory.TryRead(guestAddr, tableBytes))
         {
-            Log.Debug($"TryLoadTableBytes: loaded from guest memory at 0x{guestAddr:X}");
+            Console.Error.WriteLine($"[LOADER] TryLoadTableBytes: loaded from guest memory at 0x{guestAddr:X}");
             return true;
         }
 
         if (virtualMemory.TryRead(location, tableBytes))
         {
-            Log.Debug($"TryLoadTableBytes: loaded from absolute guest address 0x{location:X}");
+            Console.Error.WriteLine($"[LOADER] TryLoadTableBytes: loaded from absolute guest address 0x{location:X}");
             return true;
         }
 
@@ -1868,11 +1859,11 @@ public sealed class SelfLoader : ISelfLoader
         {
             var slice = elfData.Slice((int)location, (int)size);
             tableBytes = slice.ToArray();
-            Log.Debug($"TryLoadTableBytes: loaded from elfData as file offset at 0x{location:X}");
+            Console.Error.WriteLine($"[LOADER] TryLoadTableBytes: loaded from elfData as file offset at 0x{location:X}");
             return true;
         }
 
-        Log.Warning($"TryLoadTableBytes: FAILED for location 0x{location:X}");
+        Console.Error.WriteLine($"[LOADER] TryLoadTableBytes: FAILED for location 0x{location:X}");
         tableBytes = Array.Empty<byte>();
         return false;
     }
@@ -1929,17 +1920,17 @@ public sealed class SelfLoader : ISelfLoader
 
     private static ulong ResolveMappedAddressOrFallback(IVirtualMemory virtualMemory, ulong address, ulong imageBase)
     {
-        Log.Debug($"ResolveMappedAddressOrFallback addr=0x{address:X} imageBase=0x{imageBase:X16}");
+        Console.Error.WriteLine($"[LOADER][TEST] ResolveMappedAddressOrFallback addr=0x{address:X} imageBase=0x{imageBase:X16}");
 
         if (address == 0)
         {
-            Log.Debug("-> return 0 (null)");
+            Console.Error.WriteLine("[LOADER][TEST] -> return 0 (null)");
             return 0;
         }
 
         if (TryResolveMappedAddress(virtualMemory, address, imageBase, 1, out var resolved))
         {
-            Log.Debug($"-> resolved raw 0x{resolved:X16}");
+            Console.Error.WriteLine($"[LOADER][TEST] -> resolved raw 0x{resolved:X16}");
             return resolved;
         }
 
@@ -1948,18 +1939,18 @@ public sealed class SelfLoader : ISelfLoader
             var rebased = address + imageBase;
             if (TryResolveMappedAddress(virtualMemory, rebased, imageBase, 1, out var resolvedRebased))
             {
-                Log.Debug($"-> resolved rebased 0x{resolvedRebased:X16}");
+                Console.Error.WriteLine($"[LOADER][TEST] -> resolved rebased 0x{resolvedRebased:X16}");
                 return resolvedRebased;
             }
         }
 
         if (address < 0x10000)
         {
-            Log.Debug($"-> reject small 0x{address:X}");
+            Console.Error.WriteLine($"[LOADER][TEST] -> reject small 0x{address:X}");
             return 0;
         }
 
-        Log.Debug($"-> fallback raw 0x{address:X}");
+        Console.Error.WriteLine($"[LOADER][TEST] -> fallback raw 0x{address:X}");
         return address;
     }
 
@@ -2389,14 +2380,10 @@ public sealed class SelfLoader : ISelfLoader
         public ulong FileSize => _fileSize;
 
         public bool HasKnownLayout =>
-            ((_ident0 == 0x4F &&
-              _ident1 == 0x15 &&
-              _ident2 == 0x3D &&
-              _ident3 == 0x1D) ||
-             (_ident0 == 0x54 &&
-              _ident1 == 0x14 &&
-              _ident2 == 0xF5 &&
-              _ident3 == 0xEE)) &&
+            _ident0 == 0x4F &&
+            _ident1 == 0x15 &&
+            _ident2 == 0x3D &&
+            _ident3 == 0x1D &&
             _ident4 == 0x00 &&
             _ident5 == 0x01 &&
             _ident6 == 0x01 &&

src/SharpEmu.Core/Memory/PhysicalVirtualMemory.cs

@@ -550,47 +550,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         }
     }
 
-    public bool TryCompare(ulong virtualAddress, ReadOnlySpan<byte> expected)
-    {
-        _gate.EnterReadLock();
-        try
-        {
-            var region = FindRegion(virtualAddress, (ulong)expected.Length);
-            if (region is null ||
-                !TryResolveRegionOffset(
-                    virtualAddress,
-                    (ulong)expected.Length,
-                    region,
-                    out var offset))
-            {
-                return false;
-            }
-
-            if (expected.IsEmpty)
-            {
-                return true;
-            }
-
-            var srcPtr = (void*)(region.VirtualAddress + offset);
-            if (region.IsReservedOnly &&
-                !EnsureRangeCommitted((ulong)srcPtr, (ulong)expected.Length, region))
-            {
-                return false;
-            }
-
-            if (!CanReadWithoutProtectionChange((ulong)srcPtr, (ulong)expected.Length, region))
-            {
-                return false;
-            }
-
-            return new ReadOnlySpan<byte>(srcPtr, expected.Length).SequenceEqual(expected);
-        }
-        finally
-        {
-            _gate.ExitReadLock();
-        }
-    }
-
     public bool TryWrite(ulong virtualAddress, ReadOnlySpan<byte> source)
     {
         var requiresExclusiveAccess = false;

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();
 
@@ -139,7 +140,7 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         LastMilestoneLog = null;
         KernelModuleRegistry.Reset();
         var image = LoadImage(normalizedEbootPath);
-        VideoOutExports.ConfigureApplicationInfo(image.Title, image.TitleId, image.Version, BuildInfo.CommitSha);
+        VideoOutExports.ConfigureApplicationInfo(image.Title, image.TitleId, image.Version);
         SaveDataExports.ConfigureApplicationInfo(image.TitleId);
         LogAppBundleInfo(normalizedEbootPath, image);
         RegisterLoadedModule(normalizedEbootPath, image, isMain: true, isSystemModule: false);

src/SharpEmu.Core/packages.lock.json

@@ -65,10 +65,7 @@
         "contentHash": "Iy22JopynbOJ32vA0lBhFEzGi65GQJBuJHYBYRBpydrDpNoTiHnjIXfA65Gu+8qsOr/ZEoIF8r9aHCgAXuO6DA=="
       },
       "sharpemu.hle": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.Logging": "[1.0.0, )"
-        }
+        "type": "Project"
       },
       "sharpemu.libs": {
         "type": "Project",

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

@@ -1,162 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using Avalonia;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using System.Collections.Specialized;
-
-namespace SharpEmu.GUI;
-
-public sealed class ConsoleWindow : Window
-{
-    private readonly AvaloniaList<LogLine> _sourceLines;
-    private readonly AvaloniaList<LogLine> _visibleLines = new();
-    private readonly ListBox _list;
-    private readonly TextBox _searchBox;
-    private readonly CheckBox _autoScrollCheck;
-
-    public ConsoleWindow(
-        AvaloniaList<LogLine> lines,
-        Action clear,
-        bool autoScroll)
-    {
-        var loc = Localization.Instance;
-
-        _sourceLines = lines;
-        Title = loc.Get("Console.WindowTitle");
-        Width = 980;
-        Height = 620;
-        MinWidth = 520;
-        MinHeight = 320;
-        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),
-        };
-        _autoScrollCheck = new CheckBox
-        {
-            Content = loc.Get("Console.AutoScroll"),
-            IsChecked = autoScroll,
-            FontSize = 12,
-            Margin = new Thickness(0, 0, 12, 0),
-            VerticalAlignment = VerticalAlignment.Center,
-        };
-        var copyButton = new Button
-        {
-            Classes = { "ghost" },
-            Content = loc.Get("Console.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),
-        };
-        copyButton.Click += async (_, _) => await CopyAsync();
-        clearButton.Click += (_, _) => clear();
-        _searchBox.TextChanged += (_, _) => RefreshVisibleLines();
-
-        _list = new ListBox
-        {
-            Classes = { "console" },
-            ItemsSource = _visibleLines,
-            BorderThickness = new Thickness(1),
-            BorderBrush = new SolidColorBrush(Color.Parse("#232B3A")),
-            ItemTemplate = new FuncDataTemplate<LogLine>((_, _) =>
-            {
-                var text = new TextBlock { TextWrapping = TextWrapping.NoWrap };
-                text.Bind(TextBlock.TextProperty, new Binding(nameof(LogLine.Text)));
-                text.Bind(TextBlock.ForegroundProperty, new Binding(nameof(LogLine.Brush)));
-                return text;
-            }),
-        };
-
-        Content = new Grid
-        {
-            Margin = new Thickness(12),
-            RowDefinitions = new RowDefinitions("Auto,*"),
-            Children =
-            {
-                new Grid
-                {
-                    Margin = new Thickness(0, 0, 0, 8),
-                    ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,Auto"),
-                    Children =
-                    {
-                        new TextBlock
-                        {
-                            Classes = { "sectionTitle" },
-                            Text = loc.Get("Console.Title"),
-                            VerticalAlignment = VerticalAlignment.Center,
-                        },
-                        _searchBox.WithGridColumn(1),
-                        _autoScrollCheck.WithGridColumn(2),
-                        copyButton.WithGridColumn(3),
-                        clearButton.WithGridColumn(4),
-                    },
-                },
-                _list.WithGridRow(1),
-            },
-        };
-
-        lines.CollectionChanged += OnLinesChanged;
-        Closed += (_, _) => lines.CollectionChanged -= OnLinesChanged;
-        RefreshVisibleLines();
-    }
-
-    private void OnLinesChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        RefreshVisibleLines();
-        if (_autoScrollCheck.IsChecked == true)
-        {
-            Dispatcher.UIThread.Post(() => (_list.Scroll as ScrollViewer)?.ScrollToEnd());
-        }
-    }
-
-    private void RefreshVisibleLines()
-    {
-        var query = _searchBox.Text ?? string.Empty;
-        _visibleLines.Clear();
-        _visibleLines.AddRange(string.IsNullOrWhiteSpace(query)
-            ? _sourceLines
-            : _sourceLines.Where(line => line.Text.Contains(query, StringComparison.OrdinalIgnoreCase)));
-    }
-
-    private async Task CopyAsync()
-    {
-        if (_visibleLines.Count == 0 || Clipboard is null)
-        {
-            return;
-        }
-
-        await Clipboard.SetTextAsync(string.Join(Environment.NewLine, _visibleLines.Select(line => line.Text)));
-    }
-}
-
-file static class GridExtensions
-{
-    public static T WithGridColumn<T>(this T control, int column) where T : Control
-    {
-        Grid.SetColumn(control, column);
-        return control;
-    }
-
-    public static T WithGridRow<T>(this T control, int row) where T : Control
-    {
-        Grid.SetRow(control, row);
-        return control;
-    }
-}

src/SharpEmu.GUI/DiscordRichPresence.cs

@@ -1,252 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.IO.Pipes;
-using System.Text;
-using System.Text.Json;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Minimal Discord Rich Presence client. Speaks Discord's local IPC
-/// protocol (framed JSON over the discord-ipc-N named pipe) directly, so no
-/// external dependency is needed. All failures are silent: no Discord, no
-/// presence, no impact on the launcher.
-/// </summary>
-public sealed class DiscordRichPresence : IDisposable
-{
-    private const int OpHandshake = 0;
-    private const int OpFrame = 1;
-    private const int MaxFrameBytes = 64 * 1024;
-
-    private static readonly JsonSerializerOptions JsonOptions = new()
-    {
-        DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
-    };
-
-    private readonly object _gate = new();
-    private readonly string _clientId;
-    private readonly AutoResetEvent _signal = new(false);
-    private readonly Thread _worker;
-
-    private NamedPipeClientStream? _pipe;
-    private PresenceState? _desired;
-    private PresenceState? _sent;
-    private volatile bool _disposed;
-
-    private sealed record PresenceState(string Details, string? State, long? StartUnixSeconds);
-
-    public DiscordRichPresence(string clientId)
-    {
-        _clientId = clientId;
-        _worker = new Thread(WorkerLoop)
-        {
-            IsBackground = true,
-            Name = "DiscordRichPresence",
-        };
-        _worker.Start();
-    }
-
-    /// <summary>
-    /// Requests the given presence; the worker applies it asynchronously and
-    /// retries (with reconnection) until it is delivered or replaced.
-    /// </summary>
-    public void SetPresence(string details, string? state = null, long? startUnixSeconds = null)
-    {
-        lock (_gate)
-        {
-            _desired = new PresenceState(details, state, startUnixSeconds);
-        }
-
-        Trace($"queued details=\"{details}\" state=\"{state}\"");
-        _signal.Set();
-    }
-
-    public void Dispose()
-    {
-        _disposed = true;
-        _signal.Set();
-        ClosePipe();
-    }
-
-    private void WorkerLoop()
-    {
-        while (!_disposed)
-        {
-            // Woken immediately on presence changes; the periodic tick
-            // retries after connection failures (e.g. Discord starts later).
-            _signal.WaitOne(TimeSpan.FromSeconds(15));
-            if (_disposed || _clientId.Length == 0)
-            {
-                continue;
-            }
-
-            PresenceState? desired;
-            lock (_gate)
-            {
-                desired = _desired;
-            }
-
-            if (desired is null || desired == _sent)
-            {
-                continue;
-            }
-
-            try
-            {
-                EnsureConnected();
-                SendActivity(desired);
-                _sent = desired;
-                Trace($"sent details=\"{desired.Details}\" state=\"{desired.State}\"");
-            }
-            catch (Exception exception)
-            {
-                // Connection died (or never existed); reconnect on a later tick.
-                Trace($"send failed: {exception.Message}");
-                ClosePipe();
-                _sent = null;
-            }
-        }
-    }
-
-    private void EnsureConnected()
-    {
-        if (_pipe is { IsConnected: true })
-        {
-            return;
-        }
-
-        ClosePipe();
-        Exception? lastError = null;
-        for (var index = 0; index < 10; index++)
-        {
-            var pipe = new NamedPipeClientStream(
-                ".",
-                $"discord-ipc-{index}",
-                PipeDirection.InOut,
-                PipeOptions.Asynchronous);
-            try
-            {
-                pipe.Connect(500);
-                _pipe = pipe;
-                WriteFrame(OpHandshake, JsonSerializer.Serialize(new
-                {
-                    v = 1,
-                    client_id = _clientId,
-                }));
-
-                // Discord replies with a READY (or error) frame; consume it
-                // so the pipe buffer stays drained.
-                _ = ReadFrame();
-                return;
-            }
-            catch (Exception exception)
-            {
-                lastError = exception;
-                pipe.Dispose();
-                _pipe = null;
-            }
-        }
-
-        throw lastError ?? new IOException("Discord IPC pipe not found.");
-    }
-
-    private void SendActivity(PresenceState presence)
-    {
-        var payload = new Dictionary<string, object?>
-        {
-            ["cmd"] = "SET_ACTIVITY",
-            ["nonce"] = Guid.NewGuid().ToString(),
-            ["args"] = new Dictionary<string, object?>
-            {
-                ["pid"] = Environment.ProcessId,
-                ["activity"] = new Dictionary<string, object?>
-                {
-                    ["details"] = presence.Details,
-                    ["state"] = presence.State,
-                    ["timestamps"] = presence.StartUnixSeconds is { } start
-                        ? new Dictionary<string, object?> { ["start"] = start }
-                        : null,
-                    ["assets"] = new Dictionary<string, object?>
-                    {
-                        ["large_image"] = "logo",
-                        ["large_text"] = "SharpEmu",
-                    },
-                },
-            },
-        };
-
-        WriteFrame(OpFrame, JsonSerializer.Serialize(payload, JsonOptions));
-
-        // Consume Discord's acknowledgement to keep the pipe drained.
-        _ = ReadFrame();
-    }
-
-    private void WriteFrame(int opcode, string json)
-    {
-        var pipe = _pipe ?? throw new IOException("Discord IPC pipe is not connected.");
-        var payload = Encoding.UTF8.GetBytes(json);
-        var frame = new byte[8 + payload.Length];
-        BitConverter.TryWriteBytes(frame.AsSpan(0, 4), opcode);
-        BitConverter.TryWriteBytes(frame.AsSpan(4, 4), payload.Length);
-        payload.CopyTo(frame, 8);
-        pipe.Write(frame, 0, frame.Length);
-        pipe.Flush();
-    }
-
-    private string ReadFrame()
-    {
-        var pipe = _pipe ?? throw new IOException("Discord IPC pipe is not connected.");
-        var header = ReadExactly(pipe, 8);
-        var length = BitConverter.ToInt32(header, 4);
-        if (length is < 0 or > MaxFrameBytes)
-        {
-            throw new IOException($"Discord IPC frame length {length} is out of range.");
-        }
-
-        return Encoding.UTF8.GetString(ReadExactly(pipe, length));
-    }
-
-    private static byte[] ReadExactly(NamedPipeClientStream pipe, int count)
-    {
-        var buffer = new byte[count];
-        var read = 0;
-        while (read < count)
-        {
-            var chunk = pipe.Read(buffer, read, count - read);
-            if (chunk <= 0)
-            {
-                throw new IOException("Discord IPC pipe closed.");
-            }
-
-            read += chunk;
-        }
-
-        return buffer;
-    }
-
-    private static void Trace(string message)
-    {
-        if (string.Equals(
-                Environment.GetEnvironmentVariable("SHARPEMU_LOG_DISCORD"),
-                "1",
-                StringComparison.Ordinal))
-        {
-            Console.Error.WriteLine($"[DISCORD] {message}");
-        }
-    }
-
-    private void ClosePipe()
-    {
-        var pipe = _pipe;
-        _pipe = null;
-        try
-        {
-            pipe?.Dispose();
-        }
-        catch (Exception)
-        {
-            // Best effort; the pipe may already be broken.
-        }
-    }
-}

src/SharpEmu.GUI/EmulatorProcess.cs

@@ -85,14 +85,6 @@ internal sealed class EmulatorProcess : IDisposable
                 return;
             }
 
-            // Prefer terminating the job: it kills the whole tree, including
-            // any children the emulator spawned, even when the main process
-            // is wedged in a GPU driver call.
-            if (_jobHandle != 0)
-            {
-                _ = TerminateJobObject(_jobHandle, 1);
-            }
-
             if (_processHandle != 0)
             {
                 _ = TerminateProcess(_processHandle, 1);
@@ -168,7 +160,8 @@ internal sealed class EmulatorProcess : IDisposable
             var policy1 = PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
             var policy2 =
                 PROCESS_CREATION_MITIGATION_POLICY2_CET_USER_SHADOW_STACKS_ALWAYS_OFF |
-                PROCESS_CREATION_MITIGATION_POLICY2_USER_CET_SET_CONTEXT_IP_VALIDATION_ALWAYS_OFF;
+                PROCESS_CREATION_MITIGATION_POLICY2_USER_CET_SET_CONTEXT_IP_VALIDATION_ALWAYS_OFF |
+                PROCESS_CREATION_MITIGATION_POLICY2_XTENDED_CONTROL_FLOW_GUARD_ALWAYS_OFF;
 
             mitigationPolicies = Marshal.AllocHGlobal(sizeof(ulong) * 2);
             Marshal.WriteInt64(mitigationPolicies, unchecked((long)policy1));
@@ -199,10 +192,29 @@ internal sealed class EmulatorProcess : IDisposable
                 ref startupInfoEx,
                 out var processInfo);
 
+            if (!created)
+            {
+                // Some mitigation policy bits (e.g. XFG) are not supported on
+                // older Windows builds. Mirror the CLI's behavior and fall back
+                // to launching without the mitigation attribute list.
+                startupInfoEx.lpAttributeList = 0;
+                created = CreateProcessW(
+                    exePath,
+                    new StringBuilder(BuildCommandLine(exePath, arguments)),
+                    0,
+                    0,
+                    true,
+                    CREATE_NO_WINDOW,
+                    0,
+                    currentDirectory,
+                    ref startupInfoEx,
+                    out processInfo);
+            }
+
             if (!created)
             {
                 var error = Marshal.GetLastWin32Error();
-                throw new Win32Exception(error, $"Failed to start '{exePath}' with CET/CFG mitigation disabled (Win32 error {error}: {new Win32Exception(error).Message}).");
+                throw new Win32Exception(error, $"Failed to start '{exePath}' (Win32 error {error}: {new Win32Exception(error).Message}).");
             }
 
             CloseHandle(processInfo.hThread);
@@ -627,10 +639,6 @@ internal sealed class EmulatorProcess : IDisposable
     [return: MarshalAs(UnmanagedType.Bool)]
     private static extern bool TerminateProcess(nint process, uint exitCode);
 
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool TerminateJobObject(nint job, uint exitCode);
-
     [DllImport("kernel32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     private static extern bool CloseHandle(nint handle);

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

@@ -23,38 +23,14 @@ public sealed class GuiSettings
 
     public bool StrictDynlibResolution { get; set; }
 
-    /// <summary>
-    /// Mirror emulator output to user/logs/&lt;titleId&gt;-&lt;timestamp&gt;.log, if <see cref="LogFilePath"/> is null.
-    /// </summary>
+    /// <summary>Mirror emulator output to user/logs/&lt;titleId&gt;-&lt;timestamp&gt;.log.</summary>
     public bool LogToFile { get; set; }
 
-    /// <summary>If <see cref="LogToFile"/> is true it logs to this file path.</summary>
-    public string? LogFilePath { get; set; }
-
-    /// <summary> 
-    /// If <see cref="OverrideLogFile"/> is false it appends &lt;titleId&gt;-&lt;timestamp&gt; to the filename specified by 
-    /// <see cref="LogFilePath"/>. Otherwise it uses the exact filename from <see cref="LogFilePath"/>
-    /// </summary>
-    public bool OverrideLogFile { get; set; }
-
     /// <summary>Loop the selected game's sce_sys/snd0.at9 preview music.</summary>
     public bool PlayTitleMusic { get; set; } = true;
 
     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;
-
-    /// <summary>
-    /// Discord application ID used for Rich Presence; the default is the
-    /// SharpEmu application. Override to rebrand what Discord shows as
-    /// "Playing …" (register at discord.com/developers/applications).
-    /// </summary>
-    public string DiscordClientId { get; set; } = "1525606762248540221";
-
     // The emulator is portable and keeps its data next to the executable;
     // the GUI follows the same convention.
     public static string SettingsPath => Path.Combine(AppContext.BaseDirectory, "gui-settings.json");

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/br.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Português (Brasil)",
-
-  "Page.Library": "Biblioteca",
-  "Page.Options": "Opções",
-  "Page.GameCount.One": "1 Jogo",
-  "Page.GameCount.Other": "{0} jogos",
-
-  "Library.SearchWatermark": "Pesquisar na biblioteca…",
-  "Library.AddFolder": "＋ Adicionar pasta",
-  "Library.Rescan": "⟳ Atualizar biblioteca",
-  "Library.OpenFile": "Abrir arquivo…",
-
-  "Library.Context.Launch": "Jogar",
-  "Library.Context.OpenFolder": "Abrir pasta do jogo",
-  "Library.Context.CopyPath": "Copiar o caminho",
-  "Library.Context.CopyTitleId": "Copiar ID do título",
-  "Library.Context.Remove": "Remover da biblioteca",
-
-  "Library.Empty.Title": "Sua biblioteca está vazia",
-  "Library.Empty.Hint": "Adicione uma pasta contendo seus jogos para começar.",
-  "Library.Empty.SearchTitle": "Nenhum jogo corresponde à sua busca",
-  "Library.Empty.SearchHint": "Nada na biblioteca corresponde a “{0}”.",
-  "Library.Empty.AddFolder": "＋ Adicionar pasta do jogo",
-
-  "Library.Loading": "Carregando biblioteca…",
-
-  "Options.General": "Opções Gerais",
-  "Options.Section.Emulation": "EMULAÇÃO",
-  "Options.Section.Logging": "LOGS",
-  "Options.Section.Launcher": "INICIALIZADOR",
-
-  "Options.CpuEngine.Label": "Motor da CPU",
-  "Options.CpuEngine.Desc": "Motor de execução usado para executar o código do jogo.",
-  "Options.CpuEngine.Native": "Nativo",
-
-  "Options.Strict.Label": "Resolução estrita de bibliotecas dinâmicas",
-  "Options.Strict.Desc": "Interrompe a inicialização caso um símbolo importado não possa ser vinculado.",
-
-  "Options.LogLevel.Label": "Nível de log",
-  "Options.LogLevel.Desc": "Nível de detalhamento das mensagens exibidas no console do emulador.",
-  "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 de rastreamento de importações",
-  "Options.TraceImports.Desc": "Rastreia as primeiras N importações de cada módulo (0 = desativado).",
-
-  "Options.LogToFile.Label": "Salvar log em arquivo",
-  "Options.LogToFile.Desc": "Copia a saída do emulador para um arquivo de log.",
-
-  "Options.LogFilePath.Label": "Caminho do arquivo de log",
-  "Options.LogFilePath.Default": "Nenhum caminho definido — logs vão para user/logs na pasta do emulador.",
-  "Options.LogFilePath.Select": "Selecionar…",
-
-  "Options.OverrideLogFile.Label": "Sobrescrever arquivo de log",
-  "Options.OverrideLogFile.Desc": "Use o caminho exato do arquivo em vez de adicionar o ID do título e o log de data e hora.",
-
-  "Options.TitleMusic.Label": "Música de prévia",
-  "Options.TitleMusic.Desc": "Reproduz em loop a música de prévia do jogo selecionado na biblioteca.",
-
-  "Options.Discord.Label": "Status do Discord",
-  "Options.Discord.Desc": "Exibir o jogo em execução no seu perfil do Discord.",
-
-  "Options.Language.Label": "Idioma do emulador",
-  "Options.Language.Desc": "Idioma usado em toda a interface do emulador. A alteração é aplicada imediatamente.",
-
-  "Common.On": "Ativado",
-  "Common.Off": "Desativado",
-
-  "Console.Title": "CONSOLE",
-  "Console.SearchWatermark": "Pesquisar...",
-  "Console.AutoScroll": "Rolagem automática",
-  "Console.Split": "Recortar",
-  "Console.Copy": "Copiar",
-  "Console.Clear": "Limpar",
-  "Console.WindowTitle": "Console do SharpEmu",
-
-  "Launch.NoGameSelected": "Nenhum jogo selecionado",
-  "Launch.NoGameHint": "Selecione um jogo na biblioteca ou abra um arquivo eboot.bin diretamente.",
-  "Launch.Idle": "Ocioso",
-  "Launch.Console": "≡ Console",
-  "Launch.Launch": "▶  Iniciar",
-  "Launch.Stop": "■  Parar",
-  "Launch.Running": "Em execução — {0}",
-  "Launch.Stopping": "Encerrando…",
-  "Launch.Exited": "Encerrado com código {0} ({1})",
-  "Launch.ExeNotFound": "Executável do SharpEmu não encontrado. Compile primeiro o projeto SharpEmu.CLI (dotnet build).",
-  "Launch.LogFile": "Arquivo de log: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Falha ao iniciar o emulador: {0}",
-  "Launch.ProcessExited": "O processo foi encerrado com código {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "argumentos inválidos",
-  "Exit.EbootNotFound": "eboot.bin não encontrado",
-  "Exit.RuntimeException": "exceção em tempo de execução",
-  "Exit.EmulationError": "erro de emulação",
-  "Exit.Unknown": "desconhecido",
-
-  "Status.EmulatorLocating": "Emulador: localizando…",
-  "Status.EmulatorPath": "Emulador: {0}",
-  "Status.EmulatorNotFound": "Emulador: executável do SharpEmu não encontrado — compile o SharpEmu.CLI primeiro.",
-  "Status.ScanningLibrary": "Verificando biblioteca…",
-  "Status.AddFolderPrompt": "Adicione uma pasta de jogos para preencher a biblioteca.",
-  "Status.LibraryScanned": "Biblioteca verificada: {0} jogo(s) em {1} pasta(s).",
-  "Status.CouldNotOpenFolder": "Não foi possível abrir a pasta: {0}",
-  "Status.CopiedToClipboard": "{0} copiado para a área de transferência.",
-  "Status.RemovedFromLibrary": "“{0}” removido da biblioteca. Adicione novamente sua pasta para restaurá-lo.",
-  "Status.Running": "Executando {0}",
-  "Status.Stopping": "Encerrando…",
-  "Status.Idle": "Ocioso",
-
-  "Clipboard.Path": "Caminho",
-  "Clipboard.TitleId": "ID do título",
-
-  "Discord.Playing": "Jogando {0}",
-  "Discord.Browsing": "Navegando pela biblioteca",
-
-  "Dialog.ChooseGameFolder": "Escolha uma pasta contendo jogos",
-  "Dialog.OpenExecutable": "Abrir um executável para iniciar",
-  "Dialog.PsExecutables": "Executáveis de PS",
-  "Dialog.SaveLogFile": "Selecione onde salvar o arquivo de log",
-  "Dialog.PlainTextFiles": "Arquivos de texto simples",
-  "Dialog.LogFiles": "Arquivos de log"
-}

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,137 +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",
-
-  "Options.About" : "About",
-  "About.Github.Label": "GitHub",
-  "About.Github.Desc": "Source code, issues and project development.",
-  "About.Discord.Label": "Discord",
-  "About.Discord.Desc": "Join the community, get support and follow development.",
-  "About.GithubButton": "Contribute in GitHub!",
-  "About.DiscordButton": "Join our Discord!"
-}

src/SharpEmu.GUI/Languages/es.json

@@ -1,137 +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",
-
-  "Options.About" : "Informacion",
-  "About.Github.Label": "GitHub",
-  "About.Github.Desc": "Código fuente, issues y desarrollo del proyecto.",
-  "About.Discord.Label": "Discord",
-  "About.Discord.Desc": "Únete a la comunidad, recibe soporte y sigue el desarrollo.",
-  "About.GithubButton": "Contribuye en GitHub!",
-  "About.DiscordButton": "Únete a nuestro Discord!"
-}

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/ja.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": "CPUエンジン",
-  "Options.CpuEngine.Desc": "ゲームコードを実行するために使用される実行エンジン。",
-  "Options.CpuEngine.Native": "ネイティブ",
-
-  "Options.Strict.Label": "厳格な動的ライブラリ解決",
-  "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": "ゲーム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": "ライブラリのスキャン完了: {1} 個のフォルダーから {0} 本のゲームを検出。",
-  "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": "PlayStation 実行ファイル",
-  "Dialog.SaveLogFile": "ログファイルの保存先を選択",
-  "Dialog.PlainTextFiles": "プレーンテキストファイル",
-  "Dialog.LogFiles": "ログファイル"
-}

src/SharpEmu.GUI/Languages/ko.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": "CPU 엔진",
-  "Options.CpuEngine.Desc": "게임 코드를 실행하는 데 사용되는 실행 엔진입니다.",
-  "Options.CpuEngine.Native": "네이티브",
-
-  "Options.Strict.Label": "엄격한 동적 라이브러리 해석",
-  "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": "게임 ID와 타임스탬프를 추가하는 대신 정확히 이 경로를 사용합니다.",
-
-  "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": "라이브러리 스캔 완료: {1}개 폴더에서 {0}개 게임 발견.",
-  "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": "PlayStation 실행 파일",
-  "Dialog.SaveLogFile": "로그 파일 저장 위치 선택",
-  "Dialog.PlainTextFiles": "일반 텍스트 파일",
-  "Dialog.LogFiles": "로그 파일"
-}

src/SharpEmu.GUI/Languages/nl.json

@@ -1,129 +0,0 @@
-{
-  "_languageName": "Nederlands",
-
-  "Page.Library": "Bibliotheek",
-  "Page.Options": "Opties",
-  "Page.GameCount.One": "1 game",
-  "Page.GameCount.Other": "{0} games",
-
-  "Library.SearchWatermark": "Zoeken in bibliotheek…",
-  "Library.AddFolder": "＋ Map toevoegen",
-  "Library.Rescan": "⟳ Opnieuw scannen",
-  "Library.OpenFile": "Bestand openen…",
-
-  "Library.Context.Launch": "Starten",
-  "Library.Context.OpenFolder": "Gamemap openen",
-  "Library.Context.CopyPath": "Pad kopiëren",
-  "Library.Context.CopyTitleId": "Titel-ID kopiëren",
-  "Library.Context.Remove": "Verwijderen uit bibliotheek",
-
-  "Library.Empty.Title": "Je bibliotheek is leeg",
-  "Library.Empty.Hint": "Voeg een map met je games toe om te beginnen.",
-  "Library.Empty.SearchTitle": "Geen games komen overeen met je zoekopdracht",
-  "Library.Empty.SearchHint": "Niets in de bibliotheek komt overeen met “{0}”.",
-  "Library.Empty.AddFolder": "＋ Gamemap toevoegen",
-
-  "Library.Loading": "Bibliotheek laden…",
-
-  "Options.General": "Algemeen",
-  "Options.Section.Emulation": "EMULATIE",
-  "Options.Section.Logging": "LOGGING",
-  "Options.Section.Launcher": "LAUNCHER",
-
-  "Options.CpuEngine.Label": "CPU-engine",
-  "Options.CpuEngine.Desc": "Engine die wordt gebruikt om gamecode uit te voeren.",
-  "Options.CpuEngine.Native": "Native",
-
-  "Options.Strict.Label": "Strikte dynlib-resolutie",
-  "Options.Strict.Desc": "Laat het opstarten mislukken wanneer een geïmporteerd symbool niet kan worden opgelost.",
-
-  "Options.LogLevel.Label": "Logniveau",
-  "Options.LogLevel.Desc": "Uitgebreidheid van de console-uitvoer van de emulator.",
-  "Options.LogLevel.Trace": "Trace",
-  "Options.LogLevel.Debug": "Debug",
-  "Options.LogLevel.Info": "Info",
-  "Options.LogLevel.Warning": "Waarschuwing",
-  "Options.LogLevel.Error": "Fout",
-  "Options.LogLevel.Critical": "Kritiek",
-
-  "Options.TraceImports.Label": "Tracelimiet voor imports",
-  "Options.TraceImports.Desc": "Traceer de eerste N imports per module (0 = uit).",
-
-  "Options.LogToFile.Label": "Loggen naar bestand",
-  "Options.LogToFile.Desc": "Stuur de uitvoer van de emulator ook naar een logbestand.",
-
-  "Options.LogFilePath.Label": "Pad naar logbestand",
-  "Options.LogFilePath.Default": "Geen aangepast pad — logs komen terecht in user/logs naast de emulator.",
-  "Options.LogFilePath.Select": "Selecteren…",
-
-  "Options.OverrideLogFile.Label": "Logbestand overschrijven",
-  "Options.OverrideLogFile.Desc": "Gebruik het exacte bestandspad in plaats van de titel-ID en tijdstempel toe te voegen.",
-
-  "Options.TitleMusic.Label": "Titelmuziek",
-  "Options.TitleMusic.Desc": "Herhaal de voorbeeldmuziek van de geselecteerde game in de bibliotheek.",
-
-  "Options.Discord.Label": "Discord-aanwezigheid",
-  "Options.Discord.Desc": "Toon de actieve game op je Discord-profiel.",
-
-  "Options.Language.Label": "Taal van de emulator",
-  "Options.Language.Desc": "Taal die in de hele launcher wordt gebruikt. Wordt direct toegepast.",
-
-  "Common.On": "Aan",
-  "Common.Off": "Uit",
-
-  "Console.Title": "CONSOLE",
-  "Console.SearchWatermark": "Zoeken...",
-  "Console.AutoScroll": "Automatisch scrollen",
-  "Console.Split": "Splitsen",
-  "Console.Copy": "Kopiëren",
-  "Console.Clear": "Wissen",
-  "Console.WindowTitle": "SharpEmu-console",
-
-  "Launch.NoGameSelected": "Geen game geselecteerd",
-  "Launch.NoGameHint": "Kies een game uit de bibliotheek, of open direct een eboot.bin-bestand.",
-  "Launch.Idle": "Inactief",
-  "Launch.Console": "≡ Console",
-  "Launch.Launch": "▶  Starten",
-  "Launch.Stop": "■  Stoppen",
-  "Launch.Running": "Actief — {0}",
-  "Launch.Stopping": "Stoppen…",
-  "Launch.Exited": "Afgesloten met code {0} ({1})",
-  "Launch.ExeNotFound": "SharpEmu-uitvoerbaar bestand niet gevonden. Bouw eerst het SharpEmu.CLI-project (dotnet build).",
-  "Launch.LogFile": "Logbestand: {0}",
-  "Launch.Command": "$ SharpEmu {0}",
-  "Launch.StartFailed": "Starten van de emulator mislukt: {0}",
-  "Launch.ProcessExited": "Proces afgesloten met code {0} ({1}).",
-
-  "Exit.Ok": "OK",
-  "Exit.InvalidArguments": "ongeldige argumenten",
-  "Exit.EbootNotFound": "eboot niet gevonden",
-  "Exit.RuntimeException": "runtime-uitzondering",
-  "Exit.EmulationError": "emulatiefout",
-  "Exit.Unknown": "onbekend",
-
-  "Status.EmulatorLocating": "Emulator: zoeken…",
-  "Status.EmulatorPath": "Emulator: {0}",
-  "Status.EmulatorNotFound": "Emulator: SharpEmu-uitvoerbaar bestand niet gevonden — bouw eerst SharpEmu.CLI.",
-  "Status.ScanningLibrary": "Bibliotheek scannen…",
-  "Status.AddFolderPrompt": "Voeg een gamemap toe om de bibliotheek te vullen.",
-  "Status.LibraryScanned": "Bibliotheek gescand: {0} game(s) in {1} map(pen).",
-  "Status.CouldNotOpenFolder": "Kan map niet openen: {0}",
-  "Status.CopiedToClipboard": "{0} gekopieerd naar klembord.",
-  "Status.RemovedFromLibrary": "“{0}” verwijderd uit de bibliotheek. Voeg de map opnieuw toe om dit te herstellen.",
-  "Status.Running": "Actief {0}",
-  "Status.Stopping": "Stoppen…",
-  "Status.Idle": "Inactief",
-
-  "Clipboard.Path": "Pad",
-  "Clipboard.TitleId": "Titel-ID",
-
-  "Discord.Playing": "Speelt {0}",
-  "Discord.Browsing": "Bladert door de bibliotheek",
-
-  "Dialog.ChooseGameFolder": "Kies een map met games",
-  "Dialog.OpenExecutable": "Open een uitvoerbaar bestand om te starten",
-  "Dialog.PsExecutables": "PS-uitvoerbare bestanden",
-  "Dialog.SaveLogFile": "Selecteer waar het logbestand moet worden opgeslagen",
-  "Dialog.PlainTextFiles": "Platte tekstbestanden",
-  "Dialog.LogFiles": "Logbestanden"
-}

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,256 +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 Dictionary<string, string> _fallbackStrings = 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)
-    {
-        if (_strings.TryGetValue(key, out var value))
-            return value;
-
-        if (_fallbackStrings.TryGetValue(key, out var fallbackValue))
-            return fallbackValue;
-
-        return 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>
-    /// english is the fallback language
-    public void Load(string code)
-    {
-        if (_fallbackStrings.Count == 0 && !string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
-        {
-            if (!TryLoadLooseFile("en", out var fallback) && !TryLoadEmbedded("en", out fallback))
-            {
-                fallback = new Dictionary<string, string>();
-            }
-            _fallbackStrings = fallback;
-        }
-        else if (string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
-        {
-            if (TryLoadLooseFile("en", out var enDict) || TryLoadEmbedded("en", out enDict))
-            {
-                _strings = enDict;
-                _fallbackStrings = enDict;
-            }
-            else
-            {
-                _strings = new Dictionary<string, string>();
-                _fallbackStrings = new Dictionary<string, string>();
-            }
-            CurrentCode = "en";
-            return;
-        }
-
-        // Load the requested language
-        if (TryLoadLooseFile(code, out var loaded) || TryLoadEmbedded(code, out loaded))
-        {
-            _strings = loaded;
-        }
-        else
-        {
-            if (_fallbackStrings.Count > 0)
-                _strings = new Dictionary<string, string>(_fallbackStrings);
-            else
-                _strings = new Dictionary<string, string>();
-        }
-        CurrentCode = code;
-    }
-
-    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 TryLoadLooseFile(string code, out Dictionary<string, string> result)
-    {
-        result = new Dictionary<string, string>();
-        try
-        {
-            var path = Path.Combine(LanguagesDirectory, $"{code}.json");
-            if (!File.Exists(path))
-                return false;
-
-            var json = File.ReadAllText(path);
-            return TryLoad(json, out result);
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-    }
-
-    private bool TryLoadEmbedded(string code, out Dictionary<string, string> result)
-    {
-        result = new Dictionary<string, string>();
-        try
-        {
-            using var stream = OpenEmbeddedLanguageStream(code);
-            if (stream is null)
-                return false;
-
-            using var reader = new StreamReader(stream);
-            var json = reader.ReadToEnd();
-            return TryLoad(json, out result);
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-    }
-
-    private static bool TryLoad(string json, out Dictionary<string, string> result)
-    {
-        var loaded = JsonSerializer.Deserialize<Dictionary<string, string>>(json);
-        if (loaded is null)
-        {
-            result = new Dictionary<string, string>();
-            return false;
-        }
-
-        result = loaded;
-        return true;
-    }
-    
-    private bool TryLoad(string code, string json)
-    {
-        if (TryLoad(json, out var dict))
-        {
-            _strings = dict;
-            CurrentCode = code;
-            return true;
-        }
-        return false;
-    }
-}

src/SharpEmu.GUI/MainWindow.axaml

@@ -9,16 +9,14 @@ 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"
         ExtendClientAreaChromeHints="PreferSystemChrome"
         ExtendClientAreaTitleBarHeightHint="44"
-        Icon="avares://SharpEmu.GUI/Assets/SharpEmu.ico"
-        KeyDown="OnKeyDown">
+        Icon="avares://SharpEmu.GUI/Assets/SharpEmu.ico">
 
-  <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 +40,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,356 +53,119 @@ 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>
-                  <Border Classes="card">
-                    <StackPanel Spacing="14">
-                      <TextBlock x:Name="AboutSectionTitle"
-                                Classes="sectionTitle"
-                                Text="ABOUT" />
-                      
-                      <!--Github-->
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel Grid.Column="0"
-                                      Orientation="Horizontal"
-                                      Spacing="8"
-                                      VerticalAlignment="Center">
-                          <Image Source="avares://SharpEmu.GUI/Assets/github.png"
-                                    Width="20"
-                                    Height="20"
-                                    VerticalAlignment="Center" />
-                          <StackPanel VerticalAlignment="Center"
-                                          Spacing="2">
-                            <TextBlock x:Name="GithubLabel"
-                                            Text="GitHub"
-                                            FontSize="13" />
-                            <TextBlock x:Name="GithubDesc"
-                                            Text="Source code, issues and project development."
-                                            FontSize="11"
-                                            Foreground="{StaticResource MutedBrush}"
-                                            TextWrapping="Wrap" />
-                          </StackPanel>
-                        </StackPanel>
-
-                        <Button Grid.Column="1"
-                                x:Name="GithubButton"
-                                Classes="ghost"
-                                Content="Open"
-                                VerticalAlignment="Center" />
-                      </Grid>
-
-                      <!--Discord-->
-                      <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel Grid.Column="0"
-                                        Orientation="Horizontal"
-                                        Spacing="8"
-                                        VerticalAlignment="Center">
-                          <Image Source="avares://SharpEmu.GUI/Assets/discord.png"
-                                  Width="20"
-                                  Height="20"
-                                  VerticalAlignment="Center" />
-                          <StackPanel VerticalAlignment="Center"
-                                      Spacing="2">
-                            <TextBlock x:Name="DiscordServerLabel"
-                                      Text="Discord"
-                                      FontSize="13" />
-                            <TextBlock x:Name="DiscordServerDesc"
-                                      Text="Join the community, get support and follow development."
-                                      FontSize="11"
-                                      Foreground="{StaticResource MutedBrush}"
-                                      TextWrapping="Wrap" />
-                          </StackPanel>
-                        </StackPanel>
-
-                        <Button Grid.Column="1"
-                                x:Name="DiscordButton"
-                                Classes="ghost"
-                                Content="Join"
-                                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) -->
       <Border Grid.Row="2" x:Name="ConsolePanel" Classes="card" Padding="0" Height="240"
               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" />
-            <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"
-                    FontSize="12" Margin="0,0,12,0" />
-            <Button Grid.Column="3" x:Name="DetachConsoleButton" Classes="ghost" Content="Split" FontSize="12"
+          <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto" Margin="16,12,16,8">
+            <TextBlock Classes="sectionTitle" Text="CONSOLE" VerticalAlignment="Center" />
+            <CheckBox Grid.Column="1" x:Name="AutoScrollCheck" Content="Auto-scroll" IsChecked="True"
+                      FontSize="12" Margin="0,0,12,0" />
+            <Button Grid.Column="2" x:Name="CopyLogButton" Classes="ghost" Content="Copy" FontSize="12"
                     Padding="10,4" Margin="0,0,8,0" />
-            <Button Grid.Column="4" x:Name="CopyLogButton" Classes="ghost" Content="Copy" FontSize="12"
-                    Padding="10,4" Margin="0,0,8,0" />
-            <Button Grid.Column="5" x:Name="ClearLogButton" Classes="ghost" Content="Clear" FontSize="12"
+            <Button Grid.Column="3" x:Name="ClearLogButton" Classes="ghost" Content="Clear" FontSize="12"
                     Padding="10,4" />
           </Grid>
           <ListBox Grid.Row="1" x:Name="ConsoleList" Classes="console" BorderThickness="0,1,0,0"
@@ -419,8 +179,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">
 
@@ -439,32 +199,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">
@@ -476,18 +213,56 @@ 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>
+              <TextBlock Classes="fieldLabel" Text="Title music" />
+              <ToggleSwitch x:Name="TitleMusicToggle" OnContent="On" OffContent="Off" IsChecked="True" />
+            </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/SharpEmu.GUI.csproj

@@ -28,18 +28,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
   <ItemGroup>
     <AvaloniaResource Include="..\..\assets\images\SharpEmu.ico" Link="Assets/SharpEmu.ico" />
-    <AvaloniaResource Include="..\..\assets\images\github.png" Link="Assets/github.png" />
-    <AvaloniaResource Include="..\..\assets\images\discord.png" Link="Assets/discord.png" />
   </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/Aerolib/Aerolib.cs

@@ -3,13 +3,11 @@
 
 using System.Buffers.Binary;
 using System.Linq;
-using SharpEmu.Logging;
 
 namespace SharpEmu.HLE;
 
 public sealed class Aerolib : ISymbolCatalog
 {
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("Aerolib");
     private static readonly Lazy<Aerolib> _instance = new(() => new Aerolib());
     private static readonly Aerolib EmptyCatalog = new Aerolib(empty: true);
 
@@ -110,14 +108,14 @@ public sealed class Aerolib : ISymbolCatalog
 
             if (resourceName == null)
             {
-                Log.Error("Embedded resource 'aerolib.bin' not found");
+                Console.Error.WriteLine("[AEROLIB] Embedded resource 'aerolib.bin' not found");
                 return;
             }
 
             using var stream = assembly.GetManifestResourceStream(resourceName);
             if (stream == null)
             {
-                Log.Error("Failed to open embedded resource stream");
+                Console.Error.WriteLine("[AEROLIB] Failed to open embedded resource stream");
                 return;
             }
 
@@ -147,11 +145,11 @@ public sealed class Aerolib : ISymbolCatalog
                 _byExportName[name] = symbol;
             }
 
-            Log.Info($"Loaded {_byNid.Count} NID entries from binary resource");
+            Console.Error.WriteLine($"[AEROLIB] Loaded {_byNid.Count} NID entries from binary resource");
         }
         catch (Exception ex)
         {
-            Log.Error($"Failed to load embedded aerolib.bin: {ex.Message}", ex);
+            Console.Error.WriteLine($"[AEROLIB] Failed to load embedded aerolib.bin: {ex.Message}");
         }
     }
 

src/SharpEmu.HLE/HostSessionControl.cs

@@ -1,31 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.HLE;
-
-/// <summary>
-/// Lets host-facing libraries (VideoOut, AudioOut) request cooperative guest
-/// shutdown without taking a dependency on SharpEmu.Core.
-/// </summary>
-public static class HostSessionControl
-{
-    private static Action<string>? _shutdownHandler;
-
-    public static void SetShutdownHandler(Action<string>? handler)
-    {
-        Volatile.Write(ref _shutdownHandler, handler);
-    }
-
-    public static void RequestShutdown(string reason)
-    {
-        try
-        {
-            Volatile.Read(ref _shutdownHandler)?.Invoke(reason);
-        }
-        catch (Exception exception)
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][WARN] Host shutdown handler failed: {exception.Message}");
-        }
-    }
-}

src/SharpEmu.HLE/ICpuMemory.cs

@@ -8,6 +8,4 @@ public interface ICpuMemory
     bool TryRead(ulong virtualAddress, Span<byte> destination);
 
     bool TryWrite(ulong virtualAddress, ReadOnlySpan<byte> source);
-
-    bool TryCompare(ulong virtualAddress, ReadOnlySpan<byte> expected) => false;
 }

src/SharpEmu.HLE/ModuleManager.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Concurrent;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 namespace SharpEmu.HLE;
 
@@ -13,7 +12,6 @@ public sealed class ModuleManager : IModuleManager
     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 +25,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>();
 
@@ -81,195 +73,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);

src/SharpEmu.HLE/OrbisGen2Result.cs

@@ -40,13 +40,6 @@ public enum OrbisGen2Result : int
     /// </summary>
     ORBIS_GEN2_ERROR_DEADLOCK = unchecked((int)0x8002000B),
 
-    /// <summary>
-    /// Indicates that the waited-on object was deleted while the caller was
-    /// blocked on it. Matches the SCE kernel EACCES code that waiters of a
-    /// deleted semaphore observe.
-    /// </summary>
-    ORBIS_GEN2_ERROR_DELETED = unchecked((int)0x8002000D),
-
     /// <summary>
     /// Indicates that the target resource is busy.
     /// </summary>
@@ -57,13 +50,6 @@ public enum OrbisGen2Result : int
     /// </summary>
     ORBIS_GEN2_ERROR_TRY_AGAIN = unchecked((int)0x80020023),
 
-    /// <summary>
-    /// Indicates that a blocked wait was canceled (e.g. sceKernelCancelSema).
-    /// Matches the SCE kernel ECANCELED code that canceled semaphore waiters
-    /// observe.
-    /// </summary>
-    ORBIS_GEN2_ERROR_CANCELED = unchecked((int)0x80020055),
-
     /// <summary>
     /// Indicates that behavior is recognized but not implemented yet.
     /// </summary>

src/SharpEmu.HLE/SharpEmu.HLE.csproj

@@ -12,10 +12,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\SharpEmu.Logging\SharpEmu.Logging.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Aerolib\aerolib.bin" />
   </ItemGroup>

src/SharpEmu.HLE/packages.lock.json

@@ -1,10 +1,6 @@
 {
   "version": 2,
   "dependencies": {
-    "net10.0": {
-      "sharpemu.logging": {
-        "type": "Project"
-      }
-    }
+    "net10.0": {}
   }
 }

src/SharpEmu.Libs/Agc/Gen5ShaderIr.cs

@@ -49,11 +49,6 @@ internal enum Gen5PixelOutputKind
     Sint,
 }
 
-internal readonly record struct Gen5PixelOutputBinding(
-    uint GuestSlot,
-    uint HostLocation,
-    Gen5PixelOutputKind Kind);
-
 internal enum Gen5SpirvStage
 {
     Vertex,

src/SharpEmu.Libs/Agc/Gen5ShaderScalarEvaluator.cs

@@ -13,24 +13,6 @@ internal static class Gen5ShaderScalarEvaluator
     private const int ImageDescriptorDwords = 8;
     private const int SamplerDescriptorDwords = 4;
     private const int MaxGlobalMemoryBindingBytes = 16 * 1024 * 1024;
-    private static readonly int DefaultGlobalMemoryBindingBytes =
-        int.TryParse(
-            Environment.GetEnvironmentVariable("SHARPEMU_GLOBAL_BINDING_BYTES"),
-            out var configured) && configured >= sizeof(uint)
-            ? Math.Min(configured, MaxGlobalMemoryBindingBytes)
-            : 1 * 1024 * 1024;
-
-    internal static long GlobalMemoryReadCount;
-    internal static long GlobalMemoryReadBytes;
-    internal static long GlobalMemoryReadCacheHits;
-    internal static long GlobalMemoryReadPvmBytes;
-    internal static long GlobalMemoryReadLibcBytes;
-    internal static long GlobalMemoryReadReuses;
-
-    private const long CrossFrameReadCacheMaxBytes = 1024L * 1024 * 1024;
-    private static readonly object _crossFrameReadGate = new();
-    private static readonly Dictionary<(ulong BaseAddress, int SizeBytes), byte[]> _crossFrameReadCache = new();
-    private static long _crossFrameReadCacheBytes;
     private const ulong RdnaWaveMask = 0xFFFF_FFFFUL;
 
     private readonly record struct BufferDescriptor(
@@ -62,8 +44,7 @@ internal static class Gen5ShaderScalarEvaluator
         Gen5ShaderState state,
         out Gen5ShaderEvaluation evaluation,
         out string error,
-        bool resolveVertexInputs = false,
-        uint? vertexRecordLimit = null)
+        bool resolveVertexInputs = false)
     {
         evaluation = default!;
         error = string.Empty;
@@ -274,28 +255,10 @@ internal static class Gen5ShaderScalarEvaluator
                 if (resolveVertexInputs &&
                     IsVertexFetchCandidate(instruction, bufferMemory, bufferDescriptor))
                 {
-                    var vertexReadSize = bufferDescriptor.SizeBytes;
-                    if (vertexRecordLimit is { } recordLimit &&
-                        instruction.Sources.Count > 2 &&
-                        TryEvaluateScalarOperand(
-                            instruction.Sources[2],
-                            scalarRegisters,
-                            out var scalarOffset))
-                    {
-                        var bindingOffset = unchecked((uint)bufferMemory.OffsetBytes + scalarOffset);
-                        var requiredBytes =
-                            (ulong)bindingOffset +
-                            (ulong)(Math.Max(recordLimit, 1u) - 1u) * bufferDescriptor.Stride +
-                            (ulong)bufferMemory.DwordCount * sizeof(uint);
-                        vertexReadSize = Math.Min(
-                            bufferDescriptor.SizeBytes,
-                            Math.Max(requiredBytes, sizeof(uint)));
-                    }
-
                     if (!TryReadGlobalMemory(
                             ctx,
                             bufferDescriptor.BaseAddress,
-                            vertexReadSize,
+                            bufferDescriptor.SizeBytes,
                             out var vertexData))
                     {
                         error =
@@ -570,29 +533,22 @@ internal static class Gen5ShaderScalarEvaluator
         return false;
     }
 
-    [ThreadStatic]
-    private static Dictionary<(ulong BaseAddress, int SizeBytes), byte[]>? _globalMemoryReadCache;
-
-    internal static void BeginGlobalMemoryReadScope()
-    {
-        _globalMemoryReadCache = new Dictionary<(ulong, int), byte[]>();
-    }
-
-    internal static void EndGlobalMemoryReadScope()
-    {
-        _globalMemoryReadCache = null;
-    }
-
     private static bool TryReadGlobalMemory(
         CpuContext ctx,
         ulong baseAddress,
         out byte[] data)
     {
-        return TryReadGlobalMemory(
-            ctx,
-            baseAddress,
-            (ulong)DefaultGlobalMemoryBindingBytes,
-            out data);
+        for (var size = MaxGlobalMemoryBindingBytes; size >= 4096; size >>= 1)
+        {
+            data = GC.AllocateUninitializedArray<byte>(size);
+            if (ctx.Memory.TryRead(baseAddress, data))
+            {
+                return true;
+            }
+        }
+
+        data = [];
+        return false;
     }
 
     private static bool TryReadGlobalMemory(
@@ -614,74 +570,13 @@ internal static class Gen5ShaderScalarEvaluator
             return false;
         }
 
-        var cache = _globalMemoryReadCache;
-        var cacheKey = (baseAddress, (int)cappedSize);
-        if (cache is not null && cache.TryGetValue(cacheKey, out var cached))
-        {
-            Interlocked.Increment(ref GlobalMemoryReadCacheHits);
-            data = cached;
-            return true;
-        }
-
-        byte[]? previous;
-        lock (_crossFrameReadGate)
-        {
-            _crossFrameReadCache.TryGetValue(cacheKey, out previous);
-        }
-
-        if (previous is not null && ctx.Memory.TryCompare(baseAddress, previous))
-        {
-            Interlocked.Increment(ref GlobalMemoryReadReuses);
-            if (cache is not null)
-            {
-                cache[cacheKey] = previous;
-            }
-
-            data = previous;
-            return true;
-        }
-
         var candidateSize = (int)cappedSize;
         while (candidateSize >= sizeof(uint))
         {
             data = GC.AllocateUninitializedArray<byte>(candidateSize);
-            var readFromPvm = ctx.Memory.TryRead(baseAddress, data);
-            if (readFromPvm ||
+            if (ctx.Memory.TryRead(baseAddress, data) ||
                 KernelMemoryCompatExports.TryReadTrackedLibcHeap(baseAddress, data))
             {
-                Interlocked.Increment(ref GlobalMemoryReadCount);
-                Interlocked.Add(ref GlobalMemoryReadBytes, data.Length);
-                if (readFromPvm)
-                {
-                    Interlocked.Add(ref GlobalMemoryReadPvmBytes, data.Length);
-                }
-                else
-                {
-                    Interlocked.Add(ref GlobalMemoryReadLibcBytes, data.Length);
-                }
-
-                if (cache is not null)
-                {
-                    cache[cacheKey] = data;
-                }
-
-                lock (_crossFrameReadGate)
-                {
-                    if (_crossFrameReadCache.TryGetValue(cacheKey, out var replaced))
-                    {
-                        _crossFrameReadCacheBytes -= replaced.Length;
-                    }
-
-                    if (_crossFrameReadCacheBytes + data.Length > CrossFrameReadCacheMaxBytes)
-                    {
-                        _crossFrameReadCache.Clear();
-                        _crossFrameReadCacheBytes = 0;
-                    }
-
-                    _crossFrameReadCache[cacheKey] = data;
-                    _crossFrameReadCacheBytes += data.Length;
-                }
-
                 return true;
             }
 

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/Agc/Gen5SpirvTranslator.cs

@@ -18,67 +18,19 @@ internal static partial class Gen5SpirvTranslator
         out string error,
         int globalBufferBase = 0,
         int totalGlobalBufferCount = -1,
-        int imageBindingBase = 0,
-        int scalarRegisterBufferIndex = -1) =>
-        TryCompilePixelShader(
-            state,
-            evaluation,
-            [new Gen5PixelOutputBinding(0, 0, outputKind)],
-            out shader,
-            out error,
-            globalBufferBase,
-            totalGlobalBufferCount,
-            imageBindingBase,
-            scalarRegisterBufferIndex);
-
-    public static bool TryCompilePixelShader(
-        Gen5ShaderState state,
-        Gen5ShaderEvaluation evaluation,
-        IReadOnlyList<Gen5PixelOutputBinding> outputs,
-        out Gen5SpirvShader shader,
-        out string error,
-        int globalBufferBase = 0,
-        int totalGlobalBufferCount = -1,
-        int imageBindingBase = 0,
-        int scalarRegisterBufferIndex = -1)
+        int imageBindingBase = 0)
     {
-        if (outputs.Count > 8 || outputs.Any(output => output.GuestSlot > 7))
-        {
-            shader = default!;
-            error = "pixel outputs must contain at most eight guest slots in the 0..7 range";
-            return false;
-        }
-
-        if (outputs.Select(output => output.GuestSlot).Distinct().Count() != outputs.Count ||
-            outputs.Select(output => output.HostLocation).Distinct().Count() != outputs.Count)
-        {
-            shader = default!;
-            error = "pixel output guest slots and host locations must be unique";
-            return false;
-        }
-
-        if (!outputs
-                .OrderBy(output => output.HostLocation)
-                .Select((output, index) => output.HostLocation == (uint)index)
-                .All(isDense => isDense))
-        {
-            shader = default!;
-            error = "pixel output host locations must be dense in the 0..N-1 range";
-            return false;
-        }
-
         var context = new CompilationContext(
             Gen5SpirvStage.Pixel,
             state,
             evaluation,
-            outputs,
+            outputKind,
             1,
             1,
             1,
             globalBufferBase,
             totalGlobalBufferCount,
-            imageBindingBase,
-            scalarRegisterBufferIndex);
+            imageBindingBase);
         return context.TryCompile(out shader, out error);
     }
 
@@ -89,21 +41,19 @@ internal static partial class Gen5SpirvTranslator
         out string error,
         int globalBufferBase = 0,
         int totalGlobalBufferCount = -1,
-        int imageBindingBase = 0,
-        int scalarRegisterBufferIndex = -1)
+        int imageBindingBase = 0)
     {
         var context = new CompilationContext(
             Gen5SpirvStage.Vertex,
             state,
             evaluation,
-            [],
+            Gen5PixelOutputKind.Float,
             1,
             1,
             1,
             globalBufferBase,
             totalGlobalBufferCount,
-            imageBindingBase,
-            scalarRegisterBufferIndex);
+            imageBindingBase);
         return context.TryCompile(out shader, out error);
     }
 
@@ -120,14 +70,13 @@ internal static partial class Gen5SpirvTranslator
             Gen5SpirvStage.Compute,
             state,
             evaluation,
-            [],
+            Gen5PixelOutputKind.Float,
             Math.Max(localSizeX, 1),
             Math.Max(localSizeY, 1),
             Math.Max(localSizeZ, 1),
             0,
             -1,
-            0,
-            -1);
+            0);
         return context.TryCompile(out shader, out error);
     }
 
@@ -137,17 +86,15 @@ internal static partial class Gen5SpirvTranslator
         private readonly Gen5SpirvStage _stage;
         private readonly Gen5ShaderState _state;
         private readonly Gen5ShaderEvaluation _evaluation;
-        private readonly IReadOnlyList<Gen5PixelOutputBinding> _pixelOutputBindings;
+        private readonly Gen5PixelOutputKind _outputKind;
         private readonly uint _localSizeX;
         private readonly uint _localSizeY;
         private readonly uint _localSizeZ;
         private readonly int _globalBufferBase;
         private readonly int _totalGlobalBufferCount;
         private readonly int _imageBindingBase;
-        private readonly int _scalarRegisterBufferIndex;
         private readonly List<uint> _interfaces = [];
         private readonly Dictionary<uint, uint> _pixelInputs = [];
-        private readonly Dictionary<uint, SpirvPixelOutput> _pixelOutputs = [];
         private readonly Dictionary<uint, uint> _vertexOutputs = [];
         private readonly Dictionary<uint, SpirvVertexInput> _vertexInputsByPc = [];
         private readonly List<SpirvImageResource> _imageResources = [];
@@ -180,6 +127,7 @@ internal static partial class Gen5SpirvTranslator
         private uint _lds;
         private uint _workgroupUintPointer;
         private uint _positionOutput;
+        private uint _pixelOutput;
         private uint _vertexIndexInput;
         private uint _instanceIndexInput;
         private uint _fragCoordInput;
@@ -209,28 +157,22 @@ internal static partial class Gen5SpirvTranslator
             uint Type,
             uint ComponentCount);
 
-        private readonly record struct SpirvPixelOutput(
-            uint Variable,
-            uint Type,
-            Gen5PixelOutputKind Kind);
-
         public CompilationContext(
             Gen5SpirvStage stage,
             Gen5ShaderState state,
             Gen5ShaderEvaluation evaluation,
-            IReadOnlyList<Gen5PixelOutputBinding> pixelOutputBindings,
+            Gen5PixelOutputKind outputKind,
             uint localSizeX,
             uint localSizeY,
             uint localSizeZ,
             int globalBufferBase,
             int totalGlobalBufferCount,
-            int imageBindingBase,
-            int scalarRegisterBufferIndex)
+            int imageBindingBase)
         {
             _stage = stage;
             _state = state;
             _evaluation = evaluation;
-            _pixelOutputBindings = pixelOutputBindings;
+            _outputKind = outputKind;
             _localSizeX = localSizeX;
             _localSizeY = localSizeY;
             _localSizeZ = localSizeZ;
@@ -239,7 +181,6 @@ internal static partial class Gen5SpirvTranslator
                 ? evaluation.GlobalMemoryBindings.Count
                 : totalGlobalBufferCount;
             _imageBindingBase = imageBindingBase;
-            _scalarRegisterBufferIndex = scalarRegisterBufferIndex;
         }
 
         public bool TryCompile(out Gen5SpirvShader shader, out string error)
@@ -751,24 +692,19 @@ internal static partial class Gen5SpirvTranslator
                     (uint)SpirvBuiltIn.FragCoord);
                 _interfaces.Add(_fragCoordInput);
 
-                foreach (var binding in _pixelOutputBindings)
+                var outputType = _outputKind switch
                 {
-                    var outputType = GetPixelOutputType(binding.Kind);
-                    var outputPointer =
-                        _module.TypePointer(SpirvStorageClass.Output, outputType);
-                    var variable = _module.AddGlobalVariable(
-                        outputPointer,
-                        SpirvStorageClass.Output);
-                    _module.AddName(variable, $"mrt{binding.GuestSlot}");
-                    _module.AddDecoration(
-                        variable,
-                        SpirvDecoration.Location,
-                        binding.HostLocation);
-                    _pixelOutputs.Add(
-                        binding.GuestSlot,
-                        new SpirvPixelOutput(variable, outputType, binding.Kind));
-                    _interfaces.Add(variable);
-                }
+                    Gen5PixelOutputKind.Uint => _uvec4Type,
+                    Gen5PixelOutputKind.Sint => _module.TypeVector(_intType, 4),
+                    _ => _vec4Type,
+                };
+                var outputPointer =
+                    _module.TypePointer(SpirvStorageClass.Output, outputType);
+                _pixelOutput = _module.AddGlobalVariable(
+                    outputPointer,
+                    SpirvStorageClass.Output);
+                _module.AddDecoration(_pixelOutput, SpirvDecoration.Location, 0);
+                _interfaces.Add(_pixelOutput);
             }
             else
             {
@@ -831,25 +767,15 @@ internal static partial class Gen5SpirvTranslator
 
         private void EmitInitialState()
         {
-            if (_scalarRegisterBufferIndex >= 0)
+            for (uint index = 0;
+                 index < _evaluation.InitialScalarRegisters.Count &&
+                 index < ScalarRegisterCount;
+                 index++)
             {
-                for (uint index = 0; index < ScalarRegisterCount; index++)
+                var value = _evaluation.InitialScalarRegisters[(int)index];
+                if (value != 0)
                 {
-                    StoreS(index, LoadBufferWord(_scalarRegisterBufferIndex, UInt(index)));
-                }
-            }
-            else
-            {
-                for (uint index = 0;
-                     index < _evaluation.InitialScalarRegisters.Count &&
-                     index < ScalarRegisterCount;
-                     index++)
-                {
-                    var value = _evaluation.InitialScalarRegisters[(int)index];
-                    if (value != 0)
-                    {
-                        StoreS(index, UInt(value));
-                    }
+                    StoreS(index, UInt(value));
                 }
             }
 
@@ -887,10 +813,7 @@ internal static partial class Gen5SpirvTranslator
                     1);
                 StoreV(2, Bitcast(_uintType, x), guardWithExec: false);
                 StoreV(3, Bitcast(_uintType, y), guardWithExec: false);
-                foreach (var output in _pixelOutputs.Values)
-                {
-                    Store(output.Variable, _module.ConstantNull(output.Type));
-                }
+                Store(_pixelOutput, _module.ConstantNull(GetPixelOutputType()));
             }
             else
             {
@@ -2143,27 +2066,21 @@ internal static partial class Gen5SpirvTranslator
 
             if (_stage == Gen5SpirvStage.Pixel)
             {
-                if (!_pixelOutputs.TryGetValue(export.Target, out var output))
+                if (export.Target != 0)
                 {
                     return true;
                 }
 
+                var outputType = GetPixelOutputType();
                 var values = new uint[4];
                 for (var component = 0; component < 4; component++)
                 {
                     var enabled = (export.EnableMask & (1u << component)) != 0;
                     if (!enabled)
                     {
-                        values[component] = _module.AddInstruction(
-                            SpirvOp.CompositeExtract,
-                            output.Kind switch
-                            {
-                                Gen5PixelOutputKind.Uint => _uintType,
-                                Gen5PixelOutputKind.Sint => _intType,
-                                _ => _floatType,
-                            },
-                            Load(output.Type, output.Variable),
-                            (uint)component);
+                        values[component] = _outputKind == Gen5PixelOutputKind.Sint
+                            ? Bitcast(_intType, UInt(0))
+                            : UInt(0);
                         continue;
                     }
 
@@ -2172,7 +2089,7 @@ internal static partial class Gen5SpirvTranslator
                         var value = LoadCompressedExportComponent(
                             instruction,
                             component);
-                        values[component] = output.Kind switch
+                        values[component] = _outputKind switch
                         {
                             Gen5PixelOutputKind.Uint => _module.AddInstruction(
                                 SpirvOp.ConvertFToU,
@@ -2188,7 +2105,7 @@ internal static partial class Gen5SpirvTranslator
                     }
 
                     var raw = LoadV(instruction.Sources[component].Value);
-                    values[component] = output.Kind switch
+                    values[component] = _outputKind switch
                     {
                         Gen5PixelOutputKind.Uint => raw,
                         Gen5PixelOutputKind.Sint => Bitcast(_intType, raw),
@@ -2198,15 +2115,15 @@ internal static partial class Gen5SpirvTranslator
 
                 var vector = _module.AddInstruction(
                     SpirvOp.CompositeConstruct,
-                    output.Type,
+                    outputType,
                     values);
                 vector = _module.AddInstruction(
                     SpirvOp.Select,
-                    output.Type,
+                    outputType,
                     Load(_boolType, _exec),
                     vector,
-                    Load(output.Type, output.Variable));
-                Store(output.Variable, vector);
+                    Load(outputType, _pixelOutput));
+                Store(_pixelOutput, vector);
                 return true;
             }
 
@@ -2274,8 +2191,8 @@ internal static partial class Gen5SpirvTranslator
                 (uint)(component & 1));
         }
 
-        private uint GetPixelOutputType(Gen5PixelOutputKind kind) =>
-            kind switch
+        private uint GetPixelOutputType() =>
+            _outputKind switch
             {
                 Gen5PixelOutputKind.Uint => _uvec4Type,
                 Gen5PixelOutputKind.Sint => _module.TypeVector(_intType, 4),

src/SharpEmu.Libs/Agc/GpuWaitRegistry.cs

@@ -1,102 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Libs.Agc;
-
-// Holds DCBs whose parsing was suspended on an unsatisfied WAIT_REG_MEM condition.
-// AgcExports re-checks every waiter against guest memory on each submit and resumes
-// the ones whose condition became true (labels are advanced by ReleaseMem/WriteData/
-// DmaData packets or by direct CPU writes).
-internal static class GpuWaitRegistry
-{
-    public struct WaitingDcb
-    {
-        public ulong CommandBufferAddress;
-        public ulong ResumeAddress;
-        public uint TotalDwords;
-        public uint ResumeOffset;
-        public ulong WaitAddress;
-        public ulong ReferenceValue;
-        public ulong Mask;
-        public uint CompareFunction;
-        public bool Is64Bit;
-        public object? State;
-    }
-
-    private static readonly object _gate = new();
-    private static readonly Dictionary<ulong, List<WaitingDcb>> _waiters = new();
-
-    public static void Register(ulong address, WaitingDcb waiter)
-    {
-        waiter.WaitAddress = address;
-        lock (_gate)
-        {
-            if (!_waiters.TryGetValue(address, out var list))
-            {
-                list = new List<WaitingDcb>();
-                _waiters.Add(address, list);
-            }
-
-            list.Add(waiter);
-        }
-    }
-
-    // Re-evaluates every registered waiter. readValue receives (address, is64Bit) and
-    // returns null when the memory is unreadable; such waiters are kept registered.
-    public static List<WaitingDcb>? CollectSatisfied(Func<ulong, bool, ulong?> readValue)
-    {
-        List<WaitingDcb>? woken = null;
-        lock (_gate)
-        {
-            List<ulong>? emptied = null;
-            foreach (var (address, list) in _waiters)
-            {
-                for (var i = list.Count - 1; i >= 0; i--)
-                {
-                    var value = readValue(address, list[i].Is64Bit);
-                    if (value is null || !Compare(list[i], value.Value))
-                    {
-                        continue;
-                    }
-
-                    woken ??= new List<WaitingDcb>();
-                    woken.Add(list[i]);
-                    list.RemoveAt(i);
-                }
-
-                if (list.Count == 0)
-                {
-                    emptied ??= new List<ulong>();
-                    emptied.Add(address);
-                }
-            }
-
-            if (emptied != null)
-            {
-                foreach (var address in emptied)
-                {
-                    _waiters.Remove(address);
-                }
-            }
-        }
-
-        return woken;
-    }
-
-    public static bool Compare(in WaitingDcb waiter, ulong value)
-    {
-        var masked = value & waiter.Mask;
-        return waiter.CompareFunction switch
-        {
-            1 => masked < waiter.ReferenceValue,
-            2 => masked <= waiter.ReferenceValue,
-            3 => masked == waiter.ReferenceValue,
-            4 => masked != waiter.ReferenceValue,
-            5 => masked >= waiter.ReferenceValue,
-            6 => masked > waiter.ReferenceValue,
-            // 0 is "always" in the PM4 encoding and 7 is reserved; treating both as
-            // satisfied keeps a malformed packet from suspending its DCB forever.
-            _ => true,
-        };
-    }
-}

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/Ampr/AmprExports.cs

@@ -267,53 +267,19 @@ public static class AmprExports
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
 
-        ulong bytesRead = 0;
-
-        // Unregistered/missing files are zero-filled instead of failing: games queue
-        // speculative reads and only consume the bytes on success paths.
-        if (!AmprFileRegistry.TryGetHostPath(fileId, out var hostPath) || !File.Exists(hostPath))
+        if (!AmprFileRegistry.TryGetHostPath(fileId, out var hostPath))
         {
-            if (destination != 0 && size > 0)
-            {
-                int chunkSize = (int)Math.Min(size, 4096);
-                Span<byte> zeros = stackalloc byte[chunkSize];
-                zeros.Clear();
-                while (bytesRead < size)
-                {
-                    int currentChunk = (int)Math.Min((ulong)chunkSize, size - bytesRead);
-                    if (!ctx.Memory.TryWrite(destination + bytesRead, zeros[..currentChunk]))
-                    {
-                        break;
-                    }
-
-                    bytesRead += (ulong)currentChunk;
-                }
-            }
-
-            TraceAmprRead(ctx, commandBuffer, fileId, destination, size, fileOffset, bytesRead, "(missing)", (int)OrbisGen2Result.ORBIS_GEN2_OK);
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
+            TraceAmprRead(ctx, commandBuffer, fileId, destination, size, fileOffset, bytesRead: 0, hostPath, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND);
+            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
         }
 
-        // Offset -1 means "continue after the previous read of this file id".
-        if (fileOffset == unchecked((ulong)(long)-1))
-        {
-            fileOffset = PakDirectoryTracker.ResolveSequentialOffset(fileId, size);
-        }
-        else if (fileOffset > long.MaxValue)
-        {
-            fileOffset = 0;
-        }
-
-        var result = TryReadFileToGuestMemory(ctx, hostPath, fileOffset, destination, size, out bytesRead);
+        var result = TryReadFileToGuestMemory(ctx, hostPath, fileOffset, destination, size, out var bytesRead);
         if (result != (int)OrbisGen2Result.ORBIS_GEN2_OK)
         {
             TraceAmprRead(ctx, commandBuffer, fileId, destination, size, fileOffset, bytesRead, hostPath, result);
             return result;
         }
 
-        PakDirectoryTracker.OnReadCompleted(ctx, fileId, destination, fileOffset, bytesRead);
-
         if (!AppendReadFileRecord(ctx, commandBuffer, fileId, destination, size, fileOffset, bytesRead))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;

src/SharpEmu.Libs/Ampr/AmprFileRegistry.cs

@@ -21,7 +21,7 @@ internal static class AmprFileRegistry
         return _hostPathsById.TryGetValue(id, out hostPath!);
     }
 
-    internal static uint ComputeFileId(string guestPath)
+    private static uint ComputeFileId(string guestPath)
     {
         var bytes = System.Text.Encoding.UTF8.GetBytes(guestPath);
 

src/SharpEmu.Libs/Ampr/PakDirectoryTracker.cs

@@ -1,177 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Buffers.Binary;
-using System.Collections.Concurrent;
-using System.Text;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Ampr;
-
-/// <summary>
-/// sceAmprAprCommandBufferReadFile carries -1 instead of an absolute offset whenever the guest
-/// wants "the next sequential chunk" of a file. For an id Software PACK archive that sequence is
-/// always header -> directory table -> individual archived files, and the guest never tells us
-/// which archived file it wants next - only the byte count it expects, taken from the very
-/// directory entry it already parsed on its side. This tracks a per-fileId read cursor, and once
-/// the directory table has streamed past, parses it so later reads can be matched back to their
-/// real absolute offset by the size the guest asks for.
-/// </summary>
-internal static class PakDirectoryTracker
-{
-    private const int DirectoryEntrySize = 64;
-    private const int DirectoryEntryNameLength = 56;
-
-    private static readonly bool _trace =
-        string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_AMPR"), "1", StringComparison.Ordinal) ||
-        string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_AMPR_READS"), "1", StringComparison.Ordinal);
-
-    private sealed class DirectoryEntry(string name, uint filePos, uint fileLen)
-    {
-        public string Name { get; } = name;
-        public uint FilePos { get; } = filePos;
-        public uint FileLen { get; } = fileLen;
-        public bool Consumed { get; set; }
-    }
-
-    private sealed class FileState
-    {
-        public ulong NextOffset;
-        public bool ExpectingDirectory;
-        public List<DirectoryEntry>? Directory;
-    }
-
-    private static readonly ConcurrentDictionary<uint, FileState> _state = new();
-
-    /// <summary>
-    /// Resolves what "read the next sequential chunk of size <paramref name="requestedSize"/>"
-    /// really means for this fileId: an unconsumed directory entry whose length matches, if the
-    /// directory has already been parsed, otherwise the tracked linear cursor.
-    /// </summary>
-    public static ulong ResolveSequentialOffset(uint fileId, ulong requestedSize)
-    {
-        var state = _state.GetOrAdd(fileId, static _ => new FileState());
-
-        if (state.Directory is { } entries)
-        {
-            // Several unrelated archived files can share a byte count (e.g. a head model and a bot
-            // navigation file both 0x3A34 bytes). Directory order alone then picks whichever comes
-            // first, which is wrong when the game reads them out of order. id archives cluster
-            // related assets, and the guest streams them with locality, so disambiguate collisions
-            // by choosing the unconsumed match nearest the running read cursor.
-            DirectoryEntry? best = null;
-            var bestDistance = ulong.MaxValue;
-            foreach (var entry in entries)
-            {
-                if (entry.Consumed || entry.FileLen != requestedSize)
-                {
-                    continue;
-                }
-
-                var distance = entry.FilePos >= state.NextOffset
-                    ? entry.FilePos - state.NextOffset
-                    : state.NextOffset - entry.FilePos;
-                if (distance < bestDistance)
-                {
-                    bestDistance = distance;
-                    best = entry;
-                }
-            }
-
-            if (best is not null)
-            {
-                best.Consumed = true;
-                if (_trace)
-                {
-                    Console.Error.WriteLine(
-                        $"[LOADER][TRACE] pak.directory_match: id=0x{fileId:X8} name='{best.Name}' " +
-                        $"filepos=0x{best.FilePos:X8} filelen=0x{best.FileLen:X8}");
-                }
-
-                return best.FilePos;
-            }
-        }
-
-        return state.NextOffset;
-    }
-
-    /// <summary>
-    /// Feeds back a completed read so the tracker can advance its cursor, recognize a PACK
-    /// header and jump straight to its directory table, or parse the directory table itself
-    /// once it streams past.
-    /// </summary>
-    public static void OnReadCompleted(CpuContext ctx, uint fileId, ulong destination, ulong fileOffset, ulong bytesRead)
-    {
-        if (bytesRead == 0)
-        {
-            return;
-        }
-
-        var state = _state.GetOrAdd(fileId, static _ => new FileState());
-
-        if (state.ExpectingDirectory && fileOffset == state.NextOffset)
-        {
-            state.Directory = TryParseDirectory(ctx, destination, bytesRead);
-            state.ExpectingDirectory = false;
-            state.NextOffset = fileOffset + bytesRead;
-            if (_trace)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][TRACE] pak.directory_parsed: id=0x{fileId:X8} entries={state.Directory?.Count ?? 0}");
-            }
-
-            return;
-        }
-
-        if (fileOffset == 0 && bytesRead >= 12 && TryReadPackHeader(ctx, destination, out var dirOffset))
-        {
-            state.NextOffset = dirOffset;
-            state.ExpectingDirectory = true;
-            return;
-        }
-
-        state.NextOffset = fileOffset + bytesRead;
-    }
-
-    private static bool TryReadPackHeader(CpuContext ctx, ulong destination, out ulong dirOffset)
-    {
-        dirOffset = 0;
-        Span<byte> header = stackalloc byte[12];
-        if (!ctx.Memory.TryRead(destination, header) ||
-            header[0] != (byte)'P' || header[1] != (byte)'A' || header[2] != (byte)'C' || header[3] != (byte)'K')
-        {
-            return false;
-        }
-
-        dirOffset = BinaryPrimitives.ReadUInt32LittleEndian(header[4..8]);
-        return true;
-    }
-
-    private static List<DirectoryEntry>? TryParseDirectory(CpuContext ctx, ulong destination, ulong length)
-    {
-        var count = (int)(length / DirectoryEntrySize);
-        if (count <= 0)
-        {
-            return null;
-        }
-
-        var entries = new List<DirectoryEntry>(count);
-        Span<byte> record = stackalloc byte[DirectoryEntrySize];
-        for (var i = 0; i < count; i++)
-        {
-            if (!ctx.Memory.TryRead(destination + (ulong)(i * DirectoryEntrySize), record))
-            {
-                break;
-            }
-
-            var nameBytes = record[..DirectoryEntryNameLength];
-            var nullIndex = nameBytes.IndexOf((byte)0);
-            var name = Encoding.ASCII.GetString(nullIndex >= 0 ? nameBytes[..nullIndex] : nameBytes);
-            var filePos = BinaryPrimitives.ReadUInt32LittleEndian(record.Slice(56, 4));
-            var fileLen = BinaryPrimitives.ReadUInt32LittleEndian(record.Slice(60, 4));
-            entries.Add(new DirectoryEntry(name, filePos, fileLen));
-        }
-
-        return entries;
-    }
-}

src/SharpEmu.Libs/Audio/AudioOut2Exports.cs

@@ -8,14 +8,9 @@ namespace SharpEmu.Libs.Audio;
 
 public static class AudioOut2Exports
 {
-    // Sized from guest evidence, not SDK headers: Quake keeps its
-    // SceAudioOut2ContextParam on the stack with the frame canary at param+0x60,
-    // and an earlier 0x80-byte ResetParam write zeroed that canary
-    // (__stack_chk_fail right after sceAudioOut2UserCreate, which silently killed
-    // the whole audio init). Stay well below 0x60 and only write the prefix we
-    // populate.
-    private const int AudioOut2ContextParamSize = 0x30;
+    private const int AudioOut2ContextParamSize = 0x80;
     private const int AudioOut2ContextMemorySize = 0x10000;
+    private const int AudioOut2ContextMemoryAlignment = 0x10000;
     private static long _nextContextHandle = 1;
     private static long _nextUserHandle = 1;
     private static int _nextPortId;
@@ -64,13 +59,20 @@ public static class AudioOut2Exports
     public static int AudioOut2ContextQueryMemory(CpuContext ctx)
     {
         var paramAddress = ctx[CpuRegister.Rdi];
-        var outMemorySizeAddress = ctx[CpuRegister.Rsi];
-        if (paramAddress == 0 || outMemorySizeAddress == 0)
+        var memoryInfoAddress = ctx[CpuRegister.Rsi];
+        if (paramAddress == 0 || memoryInfoAddress == 0)
         {
             return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
         }
-        
-        return ctx.TryWriteUInt64(outMemorySizeAddress, AudioOut2ContextMemorySize)
+
+        Span<byte> memoryInfo = stackalloc byte[0x20];
+        memoryInfo.Clear();
+        BinaryPrimitives.WriteUInt64LittleEndian(memoryInfo[0x00..], AudioOut2ContextMemorySize);
+        BinaryPrimitives.WriteUInt64LittleEndian(memoryInfo[0x08..], AudioOut2ContextMemoryAlignment);
+        BinaryPrimitives.WriteUInt64LittleEndian(memoryInfo[0x10..], AudioOut2ContextMemorySize);
+        BinaryPrimitives.WriteUInt64LittleEndian(memoryInfo[0x18..], AudioOut2ContextMemoryAlignment);
+
+        return ctx.Memory.TryWrite(memoryInfoAddress, memoryInfo)
             ? ctx.SetReturn(0)
             : ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
     }
@@ -202,7 +204,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/Audio/AudioOutExports.cs

@@ -213,17 +213,6 @@ public static class AudioOutExports
                 : (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
     }
 
-    public static void ShutdownAllPorts()
-    {
-        foreach (var handle in Ports.Keys)
-        {
-            if (Ports.TryRemove(handle, out var port))
-            {
-                port.Dispose();
-            }
-        }
-    }
-
     private static bool TryGetFormat(
         int rawFormat,
         out int channels,

src/SharpEmu.Libs/AvPlayer/AvPlayerExports.cs

@@ -35,53 +35,6 @@ public static class AvPlayerExports
         return unchecked((int)handle);
     }
 
-    [SysAbiExport(
-        Nid = "KMcEa+rHsIo",
-        ExportName = "sceAvPlayerAddSource",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAvPlayer")]
-    public static int AvPlayerAddSource(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "JdksQu8pNdQ",
-        ExportName = "sceAvPlayerGetVideoDataEx",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAvPlayer")]
-    public static int AvPlayerGetVideoDataEx(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    // "UbQoYawOsfY" is sceAvPlayerIsActive, not sceAvPlayerGetVideoDataEx (the previous NID here
-    // was wrong - verified by hashing both names against scripts/ps5_names.txt). No player is
-    // ever actually active in this HLE implementation, so report false/inactive.
-    [SysAbiExport(
-        Nid = "UbQoYawOsfY",
-        ExportName = "sceAvPlayerIsActive",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAvPlayer")]
-    public static int AvPlayerIsActive(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return 0;
-    }
-
-    [SysAbiExport(
-        Nid = "Wnp1OVcrZgk",
-        ExportName = "sceAvPlayerGetAudioData",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAvPlayer")]
-    public static int AvPlayerGetAudioData(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "HD1YKVU26-M",
         ExportName = "sceAvPlayerPostInit",

src/SharpEmu.Libs/CommonDialog/CommonDialogExports.cs

@@ -8,6 +8,7 @@ namespace SharpEmu.Libs.CommonDialog;
 
 public static class CommonDialogExports
 {
+    private const int AlreadySystemInitialized = unchecked((int)0x80B80002);
     private static int _initialized;
 
     [SysAbiExport(
@@ -17,12 +18,11 @@ public static class CommonDialogExports
         LibraryName = "libSceCommonDialog")]
     public static int CommonDialogInitialize(CpuContext ctx)
     {
-        // Games can initialize the common-dialog service defensively from more than one
-        // subsystem. Keeping this HLE initialization idempotent avoids turning an error
-        // reporting path into a second, unrelated failure.
-        Interlocked.Exchange(ref _initialized, 1);
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
+        var result = Interlocked.Exchange(ref _initialized, 1) == 0
+            ? 0
+            : AlreadySystemInitialized;
+        ctx[CpuRegister.Rax] = unchecked((ulong)result);
+        return result;
     }
 
     [SysAbiExport(

src/SharpEmu.Libs/CommonDialog/MsgDialogExports.cs

@@ -2,31 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 using SharpEmu.HLE;
-using System.Buffers.Binary;
 using System.Threading;
 
 namespace SharpEmu.Libs.CommonDialog;
 
 public static class MsgDialogExports
 {
-    private const int StatusNone = 0;
-    private const int StatusInitialized = 1;
-    private const int StatusRunning = 2;
-    private const int StatusFinished = 3;
-
-    private const int ErrorOk = 0;
-    private const int ErrorNotInitialized = unchecked((int)0x80B80003);
-    private const int ErrorNotFinished = unchecked((int)0x80B80005);
-    private const int ErrorBusy = unchecked((int)0x80B80007);
-    private const int ErrorNotRunning = unchecked((int)0x80B8000B);
-    private const int ErrorArgNull = unchecked((int)0x80B8000D);
-
-    // Result buffer layout follows the common dialog convention: mode at +0x00,
-    // result at +0x04, buttonId at +0x08. The affirmative button (OK/YES) is 1.
-    private const int ResultSize = 0x20;
-    private const int ButtonIdAffirmative = 1;
-
-    private static int _status;
+    private const int AlreadyInitialized = unchecked((int)0x80B80002);
+    private static int _initialized;
 
     [SysAbiExport(
         Nid = "lDqxaY1UbEo",
@@ -35,226 +18,10 @@ public static class MsgDialogExports
         LibraryName = "libSceMsgDialog")]
     public static int MsgDialogInitialize(CpuContext ctx)
     {
-        // Treat repeated initialization as success. The dialog service is process-global in
-        // this HLE implementation and has no per-call resources to recreate. Only promote
-        // from NONE so re-initializing mid-flow cannot clobber a running/finished dialog.
-        Interlocked.CompareExchange(ref _status, StatusInitialized, StatusNone);
-        return ctx.SetReturn(ErrorOk);
-    }
-
-    [SysAbiExport(
-        Nid = "ePw-kqZmelo",
-        ExportName = "sceMsgDialogTerminate",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogTerminate(CpuContext ctx)
-    {
-        if (Interlocked.Exchange(ref _status, StatusNone) == StatusNone)
-        {
-            return ctx.SetReturn(ErrorNotInitialized);
-        }
-
-        return ctx.SetReturn(ErrorOk);
-    }
-
-    [SysAbiExport(
-        Nid = "b06Hh0DPEaE",
-        ExportName = "sceMsgDialogOpen",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogOpen(CpuContext ctx)
-    {
-        var paramAddress = ctx[CpuRegister.Rdi];
-        if (paramAddress == 0)
-        {
-            return ctx.SetReturn(ErrorArgNull);
-        }
-
-        var status = Volatile.Read(ref _status);
-        if (status == StatusNone)
-        {
-            return ctx.SetReturn(ErrorNotInitialized);
-        }
-
-        if (status == StatusRunning)
-        {
-            return ctx.SetReturn(ErrorBusy);
-        }
-
-        LogDialogMessage(ctx, paramAddress);
-
-        // There is no host popup to actually show. Enter RUNNING so close/cancel paths see
-        // a live dialog; the guest's next status poll auto-dismisses it (see PollStatus).
-        Interlocked.Exchange(ref _status, StatusRunning);
-        return ctx.SetReturn(ErrorOk);
-    }
-
-    // Best-effort extraction of the dialog text so fatal-error popups are visible in the
-    // log even though no host dialog is shown. The PS5 SceMsgDialogParam layout is not
-    // fully known, so chase every qword in the struct that points at readable text - one
-    // level deep, then a second level for nested sub-param structs.
-    private static void LogDialogMessage(CpuContext ctx, ulong paramAddress)
-    {
-        Console.Error.WriteLine($"[LOADER][INFO] sceMsgDialogOpen: param=0x{paramAddress:X12}");
-
-        Span<byte> head = stackalloc byte[0xA0];
-        if (ctx.Memory.TryRead(paramAddress, head))
-        {
-            DumpPointerStrings(ctx, paramAddress, head, "param", chaseNested: true);
-        }
-    }
-
-    private static void DumpPointerStrings(CpuContext ctx, ulong baseAddress, ReadOnlySpan<byte> bytes, string label, bool chaseNested)
-    {
-        Span<byte> nested = stackalloc byte[0x40];
-        for (var offset = 0; offset + 8 <= bytes.Length; offset += 8)
-        {
-            var value = System.Buffers.Binary.BinaryPrimitives.ReadUInt64LittleEndian(bytes[offset..]);
-            if (value < 0x10000 || value == baseAddress)
-            {
-                continue;
-            }
-
-            var text = TryReadPrintableText(ctx, value);
-            if (text is not null)
-            {
-                Console.Error.WriteLine($"[LOADER][INFO]   {label}+0x{offset:X2} -> 0x{value:X12} text=\"{text}\"");
-            }
-            else if (chaseNested && ctx.Memory.TryRead(value, nested))
-            {
-                DumpPointerStrings(ctx, value, nested, $"{label}+0x{offset:X2}", chaseNested: false);
-            }
-        }
-    }
-
-    private static string? TryReadPrintableText(CpuContext ctx, ulong address)
-    {
-        Span<byte> bytes = stackalloc byte[256];
-        if (!ctx.Memory.TryRead(address, bytes))
-        {
-            return null;
-        }
-
-        var nullIndex = bytes.IndexOf((byte)0);
-        if (nullIndex < 2)
-        {
-            return null;
-        }
-
-        var candidate = bytes[..nullIndex];
-        foreach (var b in candidate)
-        {
-            if (b is < 0x20 or > 0x7E && b != (byte)'\n' && b != (byte)'\r' && b != (byte)'\t')
-            {
-                return null;
-            }
-        }
-
-        return System.Text.Encoding.ASCII.GetString(candidate).Replace("\n", "\\n").Replace("\r", "\\r");
-    }
-
-    [SysAbiExport(
-        Nid = "CWVW78Qc3fI",
-        ExportName = "sceMsgDialogGetStatus",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogGetStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
-
-    [SysAbiExport(
-        Nid = "6fIC3XKt2k0",
-        ExportName = "sceMsgDialogUpdateStatus",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogUpdateStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
-
-    // With no host UI the dialog cannot wait for user input: the first status poll after
-    // Open observes the dialog as already dismissed. Advancing on both UpdateStatus and
-    // GetStatus keeps every guest polling pattern free of infinite RUNNING loops, while
-    // an Open -> Close sequence with no poll in between still exercises the close path.
-    private static int PollStatus()
-    {
-        Interlocked.CompareExchange(ref _status, StatusFinished, StatusRunning);
-        return Volatile.Read(ref _status);
-    }
-
-    [SysAbiExport(
-        Nid = "Lr8ovHH9l6A",
-        ExportName = "sceMsgDialogGetResult",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogGetResult(CpuContext ctx)
-    {
-        var resultAddress = ctx[CpuRegister.Rdi];
-        if (resultAddress == 0)
-        {
-            return ctx.SetReturn(ErrorArgNull);
-        }
-
-        if (Volatile.Read(ref _status) != StatusFinished)
-        {
-            return ctx.SetReturn(ErrorNotFinished);
-        }
-
-        // Report the affirmative button so yes/no prompts take the confirming branch;
-        // buttonId 0 is the "invalid" sentinel and games may treat it as an error.
-        Span<byte> result = stackalloc byte[ResultSize];
-        result.Clear();
-        BinaryPrimitives.WriteInt32LittleEndian(result[0x04..], 0);
-        BinaryPrimitives.WriteInt32LittleEndian(result[0x08..], ButtonIdAffirmative);
-
-        if (!ctx.Memory.TryWrite(resultAddress, result))
-        {
-            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
-
-        return ctx.SetReturn(ErrorOk);
-    }
-
-    [SysAbiExport(
-        Nid = "HTrcDKlFKuM",
-        ExportName = "sceMsgDialogClose",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogClose(CpuContext ctx)
-    {
-        if (Interlocked.CompareExchange(ref _status, StatusFinished, StatusRunning) != StatusRunning)
-        {
-            return ctx.SetReturn(ErrorNotRunning);
-        }
-
-        return ctx.SetReturn(ErrorOk);
-    }
-
-    [SysAbiExport(
-        Nid = "wTpfglkmv34",
-        ExportName = "sceMsgDialogProgressBarSetValue",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogProgressBarSetValue(CpuContext ctx) => ProgressBarNoOp(ctx);
-
-    [SysAbiExport(
-        Nid = "Gc5k1qcK4fs",
-        ExportName = "sceMsgDialogProgressBarInc",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogProgressBarInc(CpuContext ctx) => ProgressBarNoOp(ctx);
-
-    [SysAbiExport(
-        Nid = "6H-71OdrpXM",
-        ExportName = "sceMsgDialogProgressBarSetMsg",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMsgDialog")]
-    public static int MsgDialogProgressBarSetMsg(CpuContext ctx) => ProgressBarNoOp(ctx);
-
-    // There is no visible bar to update. Accept the call whenever the service is alive so
-    // save/install loops that report progress do not abort on an unexpected error.
-    private static int ProgressBarNoOp(CpuContext ctx)
-    {
-        if (Volatile.Read(ref _status) == StatusNone)
-        {
-            return ctx.SetReturn(ErrorNotInitialized);
-        }
-
-        return ctx.SetReturn(ErrorOk);
+        var result = Interlocked.Exchange(ref _initialized, 1) == 0
+            ? 0
+            : AlreadyInitialized;
+        ctx[CpuRegister.Rax] = unchecked((ulong)result);
+        return result;
     }
 }

src/SharpEmu.Libs/CxxAbiExports.cs

@@ -93,7 +93,7 @@ public static class CxaGuardExports
     }
 
     [SysAbiExport(
-        Nid = "9rAeANT2tyE",
+        Nid = "",
         ExportName = "__cxa_guard_release",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libc")]
@@ -142,7 +142,7 @@ public static class CxaGuardExports
     }
 
     [SysAbiExport(
-        Nid = "2emaaluWzUw",
+        Nid = "",
         ExportName = "__cxa_guard_abort",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libc")]

src/SharpEmu.Libs/DiscMap/DiscMapExports.cs

@@ -1,104 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.DiscMap;
-
-/// <summary>
-/// HLE implementation of libSceDiscMap, ported from Kyty's LibDiscMap.cpp
-/// (https://github.com/InoriRus/Kyty, MIT). Titles installed to internal
-/// storage query these entry points on nearly every file access to decide
-/// whether a read must be redirected to the Blu-ray drive. Reporting every
-/// request as already resident on HDD lets the regular file system path
-/// service the read.
-/// </summary>
-public static class DiscMapExports
-{
-    private const int DiscMapErrorInvalidArgument = unchecked((int)0x81100001);
-    private const int DiscMapErrorLocationNotMapped = unchecked((int)0x81100002);
-    private const int DiscMapErrorFileNotFound = unchecked((int)0x81100003);
-    private const int DiscMapErrorNoBitmapInfo = unchecked((int)0x81100004);
-
-    [SysAbiExport(
-        Nid = "lbQKqsERhtE",
-        ExportName = "sceDiscMapIsRequestOnHDD",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceDiscMap")]
-    public static int DiscMapIsRequestOnHDD(CpuContext ctx)
-    {
-        var pathAddress = ctx[CpuRegister.Rdi];
-        var offset = ctx[CpuRegister.Rsi];
-        var size = ctx[CpuRegister.Rdx];
-        var resultAddress = ctx[CpuRegister.Rcx];
-
-        if (pathAddress == 0 || resultAddress == 0)
-        {
-            return DiscMapErrorInvalidArgument;
-        }
-
-        if (!ctx.TryWriteInt32(resultAddress, 1))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        TraceDiscMap(ctx, "sceDiscMapIsRequestOnHDD", pathAddress, offset, size);
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "fJgP+wqifno",
-        ExportName = "sceDiscMapUnknownFJgP",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceDiscMap")]
-    public static int DiscMapUnknownFJgP(CpuContext ctx) => WriteMappingTriple(ctx, "sceDiscMapUnknownFJgP");
-
-    [SysAbiExport(
-        Nid = "ioKMruft1ek",
-        ExportName = "sceDiscMapUnknownIoKM",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceDiscMap")]
-    public static int DiscMapUnknownIoKM(CpuContext ctx) => WriteMappingTriple(ctx, "sceDiscMapUnknownIoKM");
-
-    private static int WriteMappingTriple(CpuContext ctx, string exportName)
-    {
-        var pathAddress = ctx[CpuRegister.Rdi];
-        var offset = ctx[CpuRegister.Rsi];
-        var size = ctx[CpuRegister.Rdx];
-        var flagsAddress = ctx[CpuRegister.Rcx];
-        var outAddress1 = ctx[CpuRegister.R8];
-        var outAddress2 = ctx[CpuRegister.R9];
-
-        if (pathAddress == 0 || flagsAddress == 0 || outAddress1 == 0 || outAddress2 == 0)
-        {
-            return DiscMapErrorInvalidArgument;
-        }
-
-        if (!ctx.TryWriteUInt64(flagsAddress, 0) ||
-            !ctx.TryWriteUInt64(outAddress1, 0) ||
-            !ctx.TryWriteUInt64(outAddress2, 0))
-        {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        TraceDiscMap(ctx, exportName, pathAddress, offset, size);
-
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static void TraceDiscMap(CpuContext ctx, string exportName, ulong pathAddress, ulong offset, ulong size)
-    {
-        if (!string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_DISCMAP"), "1", StringComparison.Ordinal))
-        {
-            return;
-        }
-
-        var path = ctx.TryReadNullTerminatedUtf8(pathAddress, 1024, out var value)
-            ? value
-            : $"<unreadable 0x{pathAddress:X16}>";
-        Console.Error.WriteLine($"[HLE][DISCMAP] {exportName} path={path} offset=0x{offset:X} size=0x{size:X}");
-    }
-}

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/Ime/ImeExports.cs

@@ -1,46 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Ime;
-
-public static class ImeExports
-{
-    // Quake (KEX) calls this from its main loop and from the audio bring-up path with
-    // an event-handler pointer. No IME session ever exists here, so report success
-    // without invoking the handler ("no pending IME events"). This NID was previously
-    // misbound as an sceNgs2VoiceControl alias, which fed the game NGS2 errors.
-    [SysAbiExport(
-        Nid = "-4GCfYdNF1s",
-        ExportName = "sceImeUpdate",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceIme")]
-    public static int ImeUpdate(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "eaFXjfJv3xs",
-        ExportName = "sceImeKeyboardOpen",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceIme")]
-    public static int ImeKeyboardOpen(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "dKadqZFgKKQ",
-        ExportName = "sceImeKeyboardGetResourceId",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceIme")]
-    public static int ImeKeyboardGetResourceId(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-}

src/SharpEmu.Libs/Json/JsonExports.cs

@@ -78,82 +78,6 @@ public static class JsonExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    // sce::Json::Initializer::setGlobalNullAccessCallback(const Value& (*)(ValueType, const Value*, void*), void*)
-    // Registers the guest hook invoked when a Value is accessed as the wrong type. Quake calls it
-    // during kexPSNWebAPI::Initialize and treats a non-zero return as a fatal init failure.
-    [SysAbiExport(
-        Nid = "+drDFyAS6u4",
-        ExportName = "_ZN3sce4Json11Initializer27setGlobalNullAccessCallbackEPFRKNS0_5ValueENS0_9ValueTypeEPS3_PvES7_",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceJson")]
-    public static int InitializerSetGlobalNullAccessCallback(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        if (thisAddress == 0)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        JsonObjectHeap.GlobalNullAccessCallback = ctx[CpuRegister.Rsi];
-        JsonObjectHeap.GlobalNullAccessCallbackContext = ctx[CpuRegister.Rdx];
-        TraceJson("Initializer.setGlobalNullAccessCallback", thisAddress, ctx[CpuRegister.Rsi]);
-        ctx[CpuRegister.Rax] = 0;
-        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/Json/JsonValueExports.cs

@@ -1,234 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Json;
-
-// sce::Json::Value and sce::Json::String constructors, setters and destructors. Prospero titles
-// (Quake among them) build a Value tree and populate it through these before serializing it for a
-// web request; without them the imports resolve to nothing and the guest faults on the call. The
-// payload is modelled in JsonObjectHeap; here we only translate the C++ ABI (registers in, `this`
-// back out) and never write the guest object, so a stack-allocated Value/String is left intact.
-//
-// Only the complete-object variants (C1/D1) are bound — those are what standalone locals emit and
-// what the observed Prospero imports use. The base-object variants (C2/D2) are left for a title
-// that actually imports them.
-public static class JsonValueExports
-{
-    private const int MaxStringLength = 0x10000;
-
-    private static int ReturnThis(CpuContext ctx, ulong thisAddress)
-    {
-        ctx[CpuRegister.Rax] = thisAddress;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static int ReturnVoid(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static double ReadDoubleArg(CpuContext ctx)
-    {
-        ctx.GetXmmRegister(0, out var low, out _);
-        return BitConverter.Int64BitsToDouble(unchecked((long)low));
-    }
-
-    private static string ReadCString(CpuContext ctx, ulong address) =>
-        ctx.TryReadNullTerminatedUtf8(address, MaxStringLength, out var text) ? text : string.Empty;
-
-    // ---- sce::Json::Value constructors ----
-
-    [SysAbiExport(Nid = "qBMjqyBn3OM", ExportName = "_ZN3sce4Json5ValueC1Ev",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueDefaultConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.Null);
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "UeuWT+yNdCQ", ExportName = "_ZN3sce4Json5ValueC1Eb",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueBooleanConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromBoolean((ctx[CpuRegister.Rsi] & 0xFF) != 0));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "0lLK8+kDqmE", ExportName = "_ZN3sce4Json5ValueC1El",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueIntegerConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromInteger(unchecked((long)ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "x4AUdbhpRB0", ExportName = "_ZN3sce4Json5ValueC1Em",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueUnsignedConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromUnsignedInteger(ctx[CpuRegister.Rsi]));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "sOmU4vnx3s0", ExportName = "_ZN3sce4Json5ValueC1Ed",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueRealConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromReal(ReadDoubleArg(ctx)));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "b9V6fmppLXY", ExportName = "_ZN3sce4Json5ValueC1EPKc",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueCStringConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromString(ReadCString(ctx, ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "CbrT3dwDILo", ExportName = "_ZN3sce4Json5ValueC1ENS0_9ValueTypeE",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueTypeConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromExplicitType(unchecked((uint)ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "sZIoMRGO+jk", ExportName = "_ZN3sce4Json5ValueC1ERKNS0_6StringE",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueStringConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromString(JsonObjectHeap.GetStringOrEmpty(ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "WTtYf+cNnXI", ExportName = "_ZN3sce4Json5ValueD1Ev",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueDestructor(CpuContext ctx)
-    {
-        JsonObjectHeap.RemoveValue(ctx[CpuRegister.Rdi]);
-        return ReturnVoid(ctx);
-    }
-
-    // ---- sce::Json::Value setters (return Value&, i.e. `this`) ----
-
-    [SysAbiExport(Nid = "5yHuiWXo2gg", ExportName = "_ZN3sce4Json5Value3setEb",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetBoolean(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromBoolean((ctx[CpuRegister.Rsi] & 0xFF) != 0));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "QxVVYhP-mvg", ExportName = "_ZN3sce4Json5Value3setEl",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetInteger(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromInteger(unchecked((long)ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "SIe1ZmW7e7s", ExportName = "_ZN3sce4Json5Value3setEm",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetUnsigned(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromUnsignedInteger(ctx[CpuRegister.Rsi]));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "BSmWDIkV4w4", ExportName = "_ZN3sce4Json5Value3setEd",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetReal(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromReal(ReadDoubleArg(ctx)));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "IKQimvG9Wqs", ExportName = "_ZN3sce4Json5Value3setENS0_9ValueTypeE",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetType(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromExplicitType(unchecked((uint)ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "n6FC+l9DU70", ExportName = "_ZN3sce4Json5Value3setEPKc",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetCString(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromString(ReadCString(ctx, ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "6l3Bv2gysNc", ExportName = "_ZN3sce4Json5Value3setERKNS0_6StringE",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueSetString(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.FromString(JsonObjectHeap.GetStringOrEmpty(ctx[CpuRegister.Rsi])));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "FIjXN2TkuTs", ExportName = "_ZN3sce4Json5Value5clearEv",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int ValueClear(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetValue(thisAddress, JsonValueState.Null);
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    // ---- sce::Json::String ----
-
-    [SysAbiExport(Nid = "9KUZFjI1IxA", ExportName = "_ZN3sce4Json6StringC1EPKc",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int StringCStringConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetString(thisAddress, ReadCString(ctx, ctx[CpuRegister.Rsi]));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "qSmqLXXCPas", ExportName = "_ZN3sce4Json6StringC1Ev",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int StringDefaultConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetString(thisAddress, string.Empty);
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "0CAesfH963Q", ExportName = "_ZN3sce4Json6StringC1ERKS1_",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int StringCopyConstructor(CpuContext ctx)
-    {
-        var thisAddress = ctx[CpuRegister.Rdi];
-        JsonObjectHeap.SetString(thisAddress, JsonObjectHeap.GetStringOrEmpty(ctx[CpuRegister.Rsi]));
-        return ReturnThis(ctx, thisAddress);
-    }
-
-    [SysAbiExport(Nid = "cG1VE2HMl6c", ExportName = "_ZN3sce4Json6StringD1Ev",
-        Target = Generation.Gen4 | Generation.Gen5, LibraryName = "libSceJson")]
-    public static int StringDestructor(CpuContext ctx)
-    {
-        JsonObjectHeap.RemoveString(ctx[CpuRegister.Rdi]);
-        return ReturnVoid(ctx);
-    }
-}

src/SharpEmu.Libs/Json/JsonValueModel.cs

@@ -1,110 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Collections.Concurrent;
-
-namespace SharpEmu.Libs.Json;
-
-// sce::Json::Value is an opaque variant type (null / bool / signed / unsigned / real / string /
-// array / object). Games build one, populate it through set()/ctors and later serialize it. We
-// model the payload host-side keyed by the guest `this` pointer instead of writing into the guest
-// object: the object is often stack-allocated and its real byte layout is unknown, so writing a
-// guessed layout risks smashing an adjacent stack canary (the same failure the AudioOut2 context
-// param sizing note in this project already ran into). The guest reaches the payload only through
-// libSceJson methods, so shadowing by address is enough for the build path.
-internal enum JsonValueKind : byte
-{
-    Null = 0,
-    Boolean = 1,
-    Integer = 2,
-    UInteger = 3,
-    Real = 4,
-    String = 5,
-
-    // set(ValueType) / Value(ValueType): the guest chose the type itself. We keep its raw enum
-    // value verbatim rather than mapping it, because the canonical ValueType constants are not
-    // known from clean-room evidence and round-tripping the guest's own value is what matters.
-    ExplicitType = 6,
-}
-
-internal readonly struct JsonValueState
-{
-    private JsonValueState(
-        JsonValueKind kind,
-        bool boolean = false,
-        long integer = 0,
-        ulong unsignedInteger = 0,
-        double real = 0,
-        string? text = null,
-        uint explicitType = 0)
-    {
-        Kind = kind;
-        Boolean = boolean;
-        Integer = integer;
-        UnsignedInteger = unsignedInteger;
-        Real = real;
-        Text = text;
-        ExplicitType = explicitType;
-    }
-
-    public JsonValueKind Kind { get; }
-    public bool Boolean { get; }
-    public long Integer { get; }
-    public ulong UnsignedInteger { get; }
-    public double Real { get; }
-    public string? Text { get; }
-    public uint ExplicitType { get; }
-
-    public static JsonValueState Null { get; } = new(JsonValueKind.Null);
-
-    public static JsonValueState FromBoolean(bool value) => new(JsonValueKind.Boolean, boolean: value);
-
-    public static JsonValueState FromInteger(long value) => new(JsonValueKind.Integer, integer: value);
-
-    public static JsonValueState FromUnsignedInteger(ulong value) =>
-        new(JsonValueKind.UInteger, unsignedInteger: value);
-
-    public static JsonValueState FromReal(double value) => new(JsonValueKind.Real, real: value);
-
-    public static JsonValueState FromString(string value) => new(JsonValueKind.String, text: value);
-
-    public static JsonValueState FromExplicitType(uint value) =>
-        new(JsonValueKind.ExplicitType, explicitType: value);
-}
-
-// Shared host-side heap for the libSceJson object shadows. Keyed by the guest object address;
-// constructors overwrite and destructors remove, so guest stack-address reuse stays correct.
-internal static class JsonObjectHeap
-{
-    public static ConcurrentDictionary<ulong, JsonValueState> Values { get; } = new();
-
-    public static ConcurrentDictionary<ulong, string> Strings { get; } = new();
-
-    // Guest function the library should call when a Value is read as the wrong type. This HLE
-    // never dereferences missing members (shadows degrade to defaults), so the hook is stored for
-    // fidelity but not invoked.
-    public static ulong GlobalNullAccessCallback;
-
-    public static ulong GlobalNullAccessCallbackContext;
-
-    public static void SetValue(ulong address, JsonValueState state) => Values[address] = state;
-
-    public static void RemoveValue(ulong address) => Values.TryRemove(address, out _);
-
-    public static void SetString(ulong address, string text) => Strings[address] = text;
-
-    public static void RemoveString(ulong address) => Strings.TryRemove(address, out _);
-
-    // A missing shadow (temporary the compiler built without an out-of-line ctor, or a copy we did
-    // not track) degrades to the empty string rather than faulting.
-    public static string GetStringOrEmpty(ulong address) =>
-        Strings.TryGetValue(address, out var text) ? text : string.Empty;
-
-    internal static void ResetForTests()
-    {
-        Values.Clear();
-        Strings.Clear();
-        GlobalNullAccessCallback = 0;
-        GlobalNullAccessCallbackContext = 0;
-    }
-}

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;
     }
 
@@ -143,19 +149,6 @@ public static class KernelAprCompatExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    // Success stub: the argument layout is unknown and callers tolerate the
-    // empty answer (Quake streams fine), so no output payload is written until
-    // the real signature is reversed.
-    [SysAbiExport(
-        Nid = "WvEu7yl3Ivg",
-        ExportName = "sceKernelAprGetFileSize",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libKernel")]
-    public static int KernelAprGetFileSize(CpuContext ctx)
-    {
-        return ctx.SetReturn(0);
-    }
-
     private static bool TryWriteAprResult(CpuContext ctx, ulong resultAddress)
     {
         Span<byte> result = stackalloc byte[sizeof(ulong)];
@@ -163,6 +156,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/KernelEventFlagCompatExports.cs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Text;
 using SharpEmu.HLE;
 using SharpEmu.Libs.Fiber;
@@ -34,11 +33,6 @@ public static class KernelEventFlagCompatExports
         public object Gate { get; } = new();
     }
 
-    private sealed class EventFlagWaiter
-    {
-        public OrbisGen2Result? Result { get; set; }
-    }
-
     [SysAbiExport(
         Nid = "BpFoboUJoZU",
         ExportName = "sceKernelCreateEventFlag",
@@ -239,47 +233,9 @@ public static class KernelEventFlagCompatExports
 
             if (timeoutAddress != 0)
             {
-                if (timeoutUsec == 0)
-                {
-                    _ = ctx.TryWriteUInt32(timeoutAddress, 0);
-                    _ = TryWriteResultPattern(ctx, resultAddress, state.Bits);
-                    TraceEventFlag($"wait-timeout handle=0x{handle:X16} pattern=0x{pattern:X16} timeout=0 ret=0x{returnRip:X16}");
-                    return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
-                }
-
-                var deadline = GuestThreadExecution.ComputeDeadlineTimestamp(
-                    TimeSpan.FromTicks((long)timeoutUsec * 10L));
-                var timedWaiter = new EventFlagWaiter();
-                if (GuestThreadExecution.RequestCurrentThreadBlock(
-                        ctx,
-                        "sceKernelWaitEventFlag",
-                        GetEventFlagWakeKey(handle),
-                        resumeHandler: () => CompleteBlockedTimedWait(
-                            ctx,
-                            state,
-                            timedWaiter,
-                            pattern,
-                            waitMode,
-                            resultAddress,
-                            timeoutAddress,
-                            deadline),
-                        wakeHandler: () => TryCompleteBlockedTimedWait(
-                            ctx,
-                            state,
-                            timedWaiter,
-                            pattern,
-                            waitMode,
-                            resultAddress),
-                        blockDeadlineTimestamp: deadline))
-                {
-                    state.WaitingThreads++;
-                    TraceEventFlag($"wait-block-timed handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} waiters={state.WaitingThreads} ret=0x{returnRip:X16}");
-                    return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
-                }
-
                 _ = ctx.TryWriteUInt32(timeoutAddress, 0);
                 _ = TryWriteResultPattern(ctx, resultAddress, state.Bits);
-                TraceEventFlag($"wait-timeout-host handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} ret=0x{returnRip:X16}");
+                TraceEventFlag($"wait-timeout handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} ret=0x{returnRip:X16}");
                 return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
             }
 
@@ -490,92 +446,6 @@ public static class KernelEventFlagCompatExports
         }
     }
 
-    private static bool TryCompleteBlockedTimedWait(
-        CpuContext ctx,
-        EventFlagState state,
-        EventFlagWaiter waiter,
-        ulong pattern,
-        uint waitMode,
-        ulong resultAddress)
-    {
-        lock (state.Gate)
-        {
-            if (waiter.Result is not null)
-            {
-                return true;
-            }
-
-            if (!IsSatisfied(state.Bits, pattern, waitMode))
-            {
-                return false;
-            }
-
-            waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
-                ? OrbisGen2Result.ORBIS_GEN2_OK
-                : OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            if (waiter.Result == OrbisGen2Result.ORBIS_GEN2_OK)
-            {
-                ApplyClearMode(state, pattern, waitMode);
-            }
-
-            state.WaitingThreads = Math.Max(0, state.WaitingThreads - 1);
-            return true;
-        }
-    }
-
-    private static int CompleteBlockedTimedWait(
-        CpuContext ctx,
-        EventFlagState state,
-        EventFlagWaiter waiter,
-        ulong pattern,
-        uint waitMode,
-        ulong resultAddress,
-        ulong timeoutAddress,
-        long deadlineTimestamp)
-    {
-        lock (state.Gate)
-        {
-            if (waiter.Result is null)
-            {
-                if (IsSatisfied(state.Bits, pattern, waitMode))
-                {
-                    waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
-                        ? OrbisGen2Result.ORBIS_GEN2_OK
-                        : OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-                    if (waiter.Result == OrbisGen2Result.ORBIS_GEN2_OK)
-                    {
-                        ApplyClearMode(state, pattern, waitMode);
-                    }
-                }
-                else
-                {
-                    waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
-                        ? OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT
-                        : OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-                }
-
-                state.WaitingThreads = Math.Max(0, state.WaitingThreads - 1);
-            }
-        }
-
-        if (waiter.Result == 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 (int)waiter.Result.Value;
-    }
-
     private static string GetEventFlagWakeKey(ulong handle) =>
         $"event_flag:0x{handle:X16}";
 

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

@@ -13,8 +13,6 @@ public static class KernelExports
     private static readonly object _coredumpGate = new();
     private static ulong _coredumpHandler;
     private static ulong _coredumpHandlerContext;
-    private const uint Gen4CompiledSdkVersion = 0x05000000;
-    private const uint Gen5CompiledSdkVersion = 0x09000000;
 
     private readonly record struct CxaDestructorEntry(
         ulong Function,
@@ -28,24 +26,7 @@ public static class KernelExports
         LibraryName = "libKernel")]
     public static int KernelGetCompiledSdkVersion(CpuContext ctx)
     {
-        var versionAddress = ctx[CpuRegister.Rdi];
-        if (versionAddress == 0)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        var sdkVersion = ctx.TargetGeneration == Generation.Gen5
-            ? Gen5CompiledSdkVersion
-            : Gen4CompiledSdkVersion;
-
-        if (!ctx.TryWriteUInt32(versionAddress, sdkVersion))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-        }
-
-        ctx[CpuRegister.Rax] = 0;
+        _ = ctx;
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
@@ -73,21 +54,6 @@ public static class KernelExports
         LibraryName = "libKernel")]
     public static int Exit(CpuContext ctx) => RequestProcessExit(ctx, "exit");
 
-    [SysAbiExport(
-        Nid = "L1SBTkC+Cvw",
-        ExportName = "abort",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Abort(CpuContext ctx)
-    {
-        // Route through the same graceful guest-entry-exit path as exit(): letting the call
-        // fall through to the host's native abort() does not unwind the guest thread cleanly.
-        Console.Error.WriteLine("[LOADER][INFO] abort() called by guest - terminating");
-        GuestThreadExecution.RequestCurrentEntryExit("abort", -1);
-        ctx[CpuRegister.Rax] = unchecked((ulong)(-1L));
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "XKRegsFpEpk",
         ExportName = "catchReturnFromMain",
@@ -278,14 +244,20 @@ public static class KernelExports
         ExportName = "pthread_create",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
-    public static int PosixPthreadCreate(CpuContext ctx) => PthreadCreate(ctx);
+    public static int PosixPthreadCreate(CpuContext ctx)
+    {
+        return PthreadCreate(ctx);
+    }
 
     [SysAbiExport(
         Nid = "Jmi+9w9u0E4",
         ExportName = "pthread_create_name_np",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
-    public static int PosixPthreadCreateNameNp(CpuContext ctx) => PthreadCreate(ctx);
+    public static int PosixPthreadCreateNameNp(CpuContext ctx)
+    {
+        return PthreadCreate(ctx);
+    }
 
     [SysAbiExport(
         Nid = "3kg7rT0NQIs",
@@ -362,7 +334,10 @@ public static class KernelExports
         ExportName = "pthread_join",
         Target = Generation.Gen4 | Generation.Gen5,
         LibraryName = "libKernel")]
-    public static int PosixPthreadJoin(CpuContext ctx) => PthreadJoin(ctx);
+    public static int PosixPthreadJoin(CpuContext ctx)
+    {
+        return PthreadJoin(ctx);
+    }
 
     [SysAbiExport(
         Nid = "wuCroIGjt2g",
@@ -460,11 +435,4 @@ public static class KernelExports
         ctx[CpuRegister.Rax] = unchecked((ulong)status);
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
-
-    // 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.
-
 }

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

@@ -14,22 +14,6 @@ namespace SharpEmu.Libs.Kernel;
 
 public static class KernelRuntimeCompatExports
 {
-    internal const int ClockRealtime = 0;
-    internal const int ClockVirtual = 1;
-    internal const int ClockProf = 2;
-    internal const int ClockMonotonic = 4;
-    internal const int ClockUptime = 5;
-    internal const int ClockUptimePrecise = 7;
-    internal const int ClockUptimeFast = 8;
-    internal const int ClockRealtimePrecise = 9;
-    internal const int ClockRealtimeFast = 10;
-    internal const int ClockMonotonicPrecise = 11;
-    internal const int ClockMonotonicFast = 12;
-    internal const int ClockSecond = 13;
-    internal const int ClockThreadCputimeId = 14;
-    internal const int ClockProcTime = 15;
-    private const int Efault = 14;
-    private const int Einval = 22;
     private const ulong TlsErrnoOffset = 0x40;
     private const ulong TlsStackChkGuardBaseOffset = 0x800;
     private const ulong StackChkGuardFieldOffset = 0x10;
@@ -80,98 +64,6 @@ public static class KernelRuntimeCompatExports
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     private delegate ulong RdtscDelegate();
 
-    [SysAbiExport(
-        Nid = "QvsZxomvUHs",
-        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)
-    {
-        var requestAddress = ctx[CpuRegister.Rdi];
-        var remainAddress = ctx[CpuRegister.Rsi];
-
-        if (requestAddress == 0)
-        {
-            return NanosleepFailure(ctx, posix, Einval, 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);
-        }
-
-        var tvSec = BinaryPrimitives.ReadInt64LittleEndian(timespecBuffer);
-        var tvNsec = BinaryPrimitives.ReadInt64LittleEndian(timespecBuffer[sizeof(long)..]);
-
-        if (tvSec < 0 || tvNsec < 0 || tvNsec >= 1_000_000_000L)
-        {
-            return NanosleepFailure(ctx, posix, Einval, OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        if (tvSec == 0 && tvNsec == 0)
-        {
-            WriteRemainingTime(ctx, remainAddress, 0, 0);
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-
-        GuestThreadExecution.Scheduler?.Pump(ctx, posix ? "nanosleep" : "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.
-        var totalTicks = tvSec * TimeSpan.TicksPerSecond + Math.Max(tvNsec / 100L, 1L);
-        try
-        {
-            Thread.Sleep(TimeSpan.FromTicks(totalTicks));
-        }
-        catch (ArgumentOutOfRangeException)
-        {
-            Thread.Sleep(TimeSpan.FromMilliseconds(int.MaxValue));
-        }
-
-        WriteRemainingTime(ctx, remainAddress, 0, 0);
-        ctx[CpuRegister.Rax] = 0;
-        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)
-        {
-            return;
-        }
-
-        Span<byte> remainBuffer = stackalloc byte[16];
-        BinaryPrimitives.WriteInt64LittleEndian(remainBuffer, seconds);
-        BinaryPrimitives.WriteInt64LittleEndian(remainBuffer[sizeof(long)..], nanoseconds);
-        ctx.Memory.TryWrite(remainAddress, remainBuffer);
-    }
-
     [SysAbiExport(
         Nid = "1jfXLRVzisc",
         ExportName = "sceKernelUsleep",
@@ -213,13 +105,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)
@@ -301,9 +186,15 @@ public static class KernelRuntimeCompatExports
 
         long seconds;
         long nanoseconds;
-        if (!ResolveClockTime(clockId, out seconds, out nanoseconds))
+        if (clockId == 0)
         {
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
+            var now = DateTimeOffset.UtcNow;
+            seconds = now.ToUnixTimeSeconds();
+            nanoseconds = (now.Ticks % TimeSpan.TicksPerSecond) * 100;
+        }
+        else
+        {
+            GetProcessMonotonicTime(out seconds, out nanoseconds);
         }
 
         Span<byte> timespecBuffer = stackalloc byte[16];
@@ -335,11 +226,8 @@ public static class KernelRuntimeCompatExports
         var now = DateTimeOffset.UtcNow;
         var seconds = now.ToUnixTimeSeconds();
         var microseconds = (now.Ticks % TimeSpan.TicksPerSecond) / 10;
-
-        Span<byte> timevalBuffer = stackalloc byte[16];
-        BinaryPrimitives.WriteInt64LittleEndian(timevalBuffer, seconds);
-        BinaryPrimitives.WriteInt64LittleEndian(timevalBuffer[sizeof(long)..], microseconds);
-        if (!ctx.Memory.TryWrite(timeAddress, timevalBuffer))
+        if (!ctx.TryWriteUInt64(timeAddress, unchecked((ulong)seconds)) ||
+            !ctx.TryWriteUInt64(timeAddress + sizeof(long), unchecked((ulong)microseconds)))
         {
             return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
         }
@@ -361,28 +249,18 @@ public static class KernelRuntimeCompatExports
         var seconds = now.ToUnixTimeSeconds();
         var microseconds = (now.Ticks % TimeSpan.TicksPerSecond) / 10;
 
-        if (timeAddress != 0)
+        if (timeAddress != 0 &&
+            (!ctx.TryWriteUInt64(timeAddress, unchecked((ulong)seconds)) ||
+             !ctx.TryWriteUInt64(timeAddress + sizeof(long), unchecked((ulong)microseconds))))
         {
-            Span<byte> timevalBuffer = stackalloc byte[16];
-            BinaryPrimitives.WriteInt64LittleEndian(timevalBuffer, seconds);
-            BinaryPrimitives.WriteInt64LittleEndian(timevalBuffer[sizeof(long)..], microseconds);
-            if (!ctx.Memory.TryWrite(timeAddress, timevalBuffer))
-            {
-                TrySetErrno(ctx, Efault);
-                return -1;
-            }
+            return -1;
         }
 
-        if (timezoneAddress != 0)
+        if (timezoneAddress != 0 &&
+            (!ctx.TryWriteInt32(timezoneAddress, 0) ||
+             !ctx.TryWriteInt32(timezoneAddress + sizeof(int), 0)))
         {
-            Span<byte> timezoneBuffer = stackalloc byte[8];
-            BinaryPrimitives.WriteInt32LittleEndian(timezoneBuffer, 0);
-            BinaryPrimitives.WriteInt32LittleEndian(timezoneBuffer[sizeof(int)..], 0);
-            if (!ctx.Memory.TryWrite(timezoneAddress, timezoneBuffer))
-            {
-                TrySetErrno(ctx, Efault);
-                return -1;
-            }
+            return -1;
         }
 
         ctx[CpuRegister.Rax] = 0;
@@ -431,18 +309,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",
@@ -752,50 +618,6 @@ public static class KernelRuntimeCompatExports
         return address != 0 && ctx.TryWriteInt32(address, value);
     }
 
-    internal static bool ResolveClockTime(int clockId, out long seconds, out long nanoseconds)
-    {
-        switch (clockId)
-        {
-            case ClockRealtime:
-            case ClockRealtimePrecise:
-            case ClockRealtimeFast:
-            case ClockVirtual:
-            case ClockProf:
-            {
-                var now = DateTimeOffset.UtcNow;
-                seconds = now.ToUnixTimeSeconds();
-                nanoseconds = (now.Ticks % TimeSpan.TicksPerSecond) * 100;
-                return true;
-            }
-
-            // CLOCK_SECOND is FreeBSD's cached whole-second realtime clock (Quake's
-            // audio_output_thread polls it and treated the previous EINVAL as a fatal
-            // init failure, exiting and getting respawned in a loop).
-            case ClockSecond:
-                seconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-                nanoseconds = 0;
-                return true;
-
-            case ClockMonotonic:
-            case ClockMonotonicPrecise:
-            case ClockMonotonicFast:
-            case ClockUptime:
-            case ClockUptimePrecise:
-            case ClockUptimeFast:
-            // Per-thread/process CPU time approximated with the monotonic clock; games
-            // use these for profiling deltas where monotonicity matters, not absolutes.
-            case ClockThreadCputimeId:
-            case ClockProcTime:
-                GetProcessMonotonicTime(out seconds, out nanoseconds);
-                return true;
-
-            default:
-                seconds = 0;
-                nanoseconds = 0;
-                return false;
-        }
-    }
-
     internal static void GetProcessMonotonicTime(out long seconds, out long nanoseconds)
     {
         var elapsedTicks = Stopwatch.GetTimestamp() - _processStartCounter;

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; }
@@ -23,23 +19,9 @@ public static class KernelSemaphoreCompatExports
         public required int MaxCount { get; init; }
         public int Count { get; set; }
         public int WaitingThreads { get; set; }
-        public int CancelEpoch { get; set; }
-        public bool Deleted { get; set; }
         public object Gate { get; } = new();
     }
 
-    private sealed class SemaphoreWaiter
-    {
-        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; }
-    }
-
-    private static string GetSemaphoreWakeKey(uint handle) => $"kernel_sema:0x{handle:X8}";
-
     [SysAbiExport(
         Nid = "188x57JYp0g",
         ExportName = "sceKernelCreateSema",
@@ -76,27 +58,17 @@ public static class KernelSemaphoreCompatExports
             handle = unchecked((uint)Interlocked.Increment(ref _nextSemaphoreHandle));
         }
 
-        var state = new KernelSemaphoreState
+        _semaphores[handle] = new KernelSemaphoreState
         {
             Name = name,
             InitialCount = initialCount,
             MaxCount = maxCount,
             Count = initialCount,
         };
-        _semaphores[handle] = state;
 
         if (!ctx.TryWriteUInt32(semaphoreAddress, handle))
         {
             _semaphores.TryRemove(handle, out _);
-            // Handles are sequential and guest-predictable, so a hostile guest can
-            // race a WaitSema onto the handle between publication above and this
-            // rollback. Strand-proof that waiter exactly like DeleteSema does.
-            lock (state.Gate)
-            {
-                state.Deleted = true;
-            }
-
-            _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(GetSemaphoreWakeKey(handle));
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
         }
 
@@ -125,7 +97,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 +108,26 @@ 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)
+            if (!GuestThreadExecution.RequestCurrentThreadBlock(ctx, "sceKernelWaitSema"))
             {
-                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);
+                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(
@@ -278,14 +193,8 @@ public static class KernelSemaphoreCompatExports
 
             semaphore.Count += signalCount;
             TraceSemaphore($"signal handle=0x{handle:X8} name='{semaphore.Name}' signal={signalCount} count={semaphore.Count} waiters={semaphore.WaitingThreads}");
+            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
         }
-
-        // Wake after releasing the gate (lock order: scheduler gate -> semaphore gate).
-        // Wake everyone; the wake handler consumes the count per waiter, so a waiter
-        // whose needCount exceeds the remaining count stays parked while a smaller
-        // waiter can proceed.
-        _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(GetSemaphoreWakeKey(handle));
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
     [SysAbiExport(
@@ -317,16 +226,10 @@ public static class KernelSemaphoreCompatExports
             }
 
             semaphore.Count = setCount < 0 ? semaphore.InitialCount : setCount;
-            semaphore.CancelEpoch++;
-            // WaitingThreads is NOT zeroed here: each canceled waiter decrements it
-            // exactly once in its wake handler. Zeroing here as well would double-count
-            // and silently absorb the increment of a waiter that parks between this
-            // gate release and the wake-all below.
+            semaphore.WaitingThreads = 0;
             TraceSemaphore($"cancel handle=0x{handle:X8} name='{semaphore.Name}' set={setCount} count={semaphore.Count}");
+            return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
         }
-
-        _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(GetSemaphoreWakeKey(handle));
-        return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
     [SysAbiExport(
@@ -342,120 +245,10 @@ public static class KernelSemaphoreCompatExports
             return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND);
         }
 
-        // Delete succeeds even with blocked waiters; they wake with the deleted
-        // result (the SCE kernel wakes waiters with the EACCES-class code).
-        lock (semaphore.Gate)
-        {
-            semaphore.Deleted = true;
-        }
-
-        _ = GuestThreadExecution.Scheduler?.WakeBlockedThreads(GetSemaphoreWakeKey(handle));
         TraceSemaphore($"delete handle=0x{handle:X8} name='{semaphore.Name}'");
         return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
     }
 
-    // Wake handler: runs under the scheduler's guest-thread gate (lock order:
-    // scheduler gate -> semaphore gate). Returns true iff the waiter has a final
-    // result and should be re-readied; false leaves it parked.
-    private static bool TryConsumeBlockedSemaWait(KernelSemaphoreState semaphore, SemaphoreWaiter waiter)
-    {
-        lock (semaphore.Gate)
-        {
-            return TryConsumeBlockedSemaWaitLocked(semaphore, waiter);
-        }
-    }
-
-    private static bool TryConsumeBlockedSemaWaitLocked(KernelSemaphoreState semaphore, SemaphoreWaiter waiter)
-    {
-        if (waiter.Result is not null)
-        {
-            return true;
-        }
-
-        if (semaphore.Deleted)
-        {
-            waiter.Result = (int)OrbisGen2Result.ORBIS_GEN2_ERROR_DELETED;
-            semaphore.WaitingThreads = Math.Max(0, semaphore.WaitingThreads - 1);
-            TraceSemaphore($"wake-deleted name='{semaphore.Name}' need={waiter.NeedCount}");
-            return true;
-        }
-
-        if (semaphore.CancelEpoch != waiter.CancelEpochAtBlock)
-        {
-            waiter.Result = (int)OrbisGen2Result.ORBIS_GEN2_ERROR_CANCELED;
-            semaphore.WaitingThreads = Math.Max(0, semaphore.WaitingThreads - 1);
-            TraceSemaphore($"wake-canceled name='{semaphore.Name}' need={waiter.NeedCount}");
-            return true;
-        }
-
-        if (semaphore.Count >= waiter.NeedCount)
-        {
-            semaphore.Count -= waiter.NeedCount;
-            waiter.Result = (int)OrbisGen2Result.ORBIS_GEN2_OK;
-            semaphore.WaitingThreads = Math.Max(0, semaphore.WaitingThreads - 1);
-            TraceSemaphore($"wake-consume name='{semaphore.Name}' need={waiter.NeedCount} count={semaphore.Count} waiters={semaphore.WaitingThreads}");
-            return true;
-        }
-
-        return false;
-    }
-
-    // Resume handler: runs on the woken guest thread outside the scheduler gate;
-    // its return value becomes the guest's RAX for the resumed sceKernelWaitSema.
-    private static int CompleteBlockedSemaWait(KernelSemaphoreState semaphore, SemaphoreWaiter waiter)
-    {
-        lock (semaphore.Gate)
-        {
-            if (waiter.Result is null && !TryConsumeBlockedSemaWaitLocked(semaphore, waiter))
-            {
-                // Nothing readies a parked semaphore waiter without the wake handler
-                // resolving it, so reaching here means the scheduler contract changed.
-                Console.Error.WriteLine(
-                    $"[LOADER][GAP] sema.resume-no-outcome name='{semaphore.Name}' need={waiter.NeedCount} count={semaphore.Count}");
-                waiter.Result = (int)OrbisGen2Result.ORBIS_GEN2_ERROR_TRY_AGAIN;
-                semaphore.WaitingThreads = Math.Max(0, semaphore.WaitingThreads - 1);
-            }
-
-            return waiter.Result!.Value;
-        }
-    }
-
-    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

@@ -1,820 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Buffers;
-using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-using SharpEmu.HLE;
-using SharpEmu.Libs.Kernel;
-
-namespace SharpEmu.Libs.LibcStdio;
-
-public static class LibcStdioExports
-{
-    private const int MaxPathLength = 4096;
-    private const int MaxModeLength = 16;
-    private const int ReadChunkSize = 1024 * 1024;
-
-    private static readonly ConcurrentDictionary<ulong, FileStream> _fileHandles = new();
-    private static long _nextHandle = 0x1000 - 8;
-
-    private static readonly bool _traceStdio =
-        string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_STDIO"), "1", StringComparison.Ordinal);
-
-    private const int CtypeTableLowerBound = -128;
-    private const int CtypeTableUpperBound = 255;
-    private const int CtypeTableEntryCount = CtypeTableUpperBound - CtypeTableLowerBound + 1; // 384 entries * 2 bytes = 768 bytes
-
-    // Mirrors the Dinkumware ctype bitmask layout (the CRT Sony's libc is based on;
-    // _Getpctype/_Getptolower/_Getptoupper are Dinkumware accessor names). This is NOT the
-    // MSVC/UCRT layout: e.g. Dinkumware puts digit at 0x20 where UCRT puts control, so
-    // serving a UCRT-shaped table made the game's bundled printf engine misparse every
-    // %-directive (fatal-error messages rendered empty) and made its mcpp preprocessor
-    // treat 'a'-'f' as control characters (UCRT _HEX=0x80 reads as Dinkumware _BB) and
-    // drop them from identifiers ("texture" -> "txtur"). Titles that bundle their own
-    // libc bypass this table entirely (see IsSafeLleLibcExport in DirectExecutionBackend);
-    // this fallback only serves titles that import _Getpctype without shipping one.
-    private const ushort CtypeXDigit = 0x001; // _XD  '0'-'9', 'A'-'F', 'a'-'f'
-    private const ushort CtypeUpper = 0x002; // _UP  'A'-'Z'
-    private const ushort CtypeSpace = 0x004; // _SP  ' ' (isspace = _CN|_SP|_XS)
-    private const ushort CtypePunct = 0x008; // _PU  punctuation
-    private const ushort CtypeLower = 0x010; // _LO  'a'-'z'
-    private const ushort CtypeDigit = 0x020; // _DI  '0'-'9'
-    private const ushort CtypeControlSpace = 0x040; // _CN  '\t','\n','\v','\f','\r'
-    private const ushort CtypeControl = 0x080; // _BB  other control characters
-    private const ushort CtypeBlank = 0x400; // _XB  ' ' and '\t'
-
-    private static readonly object _ctypeTableGate = new();
-    private static nint _ctypeTableBase;
-
-    [SysAbiExport(
-        Nid = "xeYO4u7uyJ0",
-        ExportName = "fopen",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fopen(CpuContext ctx)
-    {
-        var pathAddress = ctx[CpuRegister.Rdi];
-        var modeAddress = ctx[CpuRegister.Rsi];
-
-        if (pathAddress == 0 || modeAddress == 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;
-        }
-
-        var hostPath = KernelMemoryCompatExports.ResolveGuestPath(guestPath);
-        if (fileAccess != FileAccess.Read && KernelMemoryCompatExports.IsReadOnlyGuestMutationPath(guestPath))
-        {
-            if (_traceStdio)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][TRACE] fopen: guest='{guestPath}' host='{hostPath}' mode='{mode}' -> PERMISSION_DENIED (read-only path)");
-            }
-
-            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);
-            if (mode.StartsWith('a') && fileAccess == FileAccess.ReadWrite)
-            {
-                stream.Seek(0, SeekOrigin.End);
-            }
-
-            var handle = unchecked((ulong)Interlocked.Add(ref _nextHandle, 8));
-            _fileHandles[handle] = stream;
-
-            if (_traceStdio)
-            {
-                Console.Error.WriteLine(
-                    $"[LOADER][TRACE] fopen: guest='{guestPath}' host='{hostPath}' mode='{mode}' -> OK handle=0x{handle:X} length={stream.Length}");
-            }
-
-            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] fopen: 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 = "rQFVBXp-Cxg",
-        ExportName = "fseek",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fseek(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-        var offset = unchecked((long)ctx[CpuRegister.Rsi]);
-        var whence = unchecked((int)ctx[CpuRegister.Rdx]);
-
-        if (!_fileHandles.TryGetValue(handle, out var stream) || !TryGetSeekOrigin(whence, out var origin))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        try
-        {
-            stream.Seek(offset, origin);
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-    }
-
-    [SysAbiExport(
-        Nid = "Qazy8LmXTvw",
-        ExportName = "ftell",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Ftell(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-
-        if (!_fileHandles.TryGetValue(handle, out var stream))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(long)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        try
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)stream.Position);
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(long)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-    }
-
-    [SysAbiExport(
-        Nid = "uodLYyUip20",
-        ExportName = "fclose",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fclose(CpuContext ctx)
-    {
-        var handle = ctx[CpuRegister.Rdi];
-
-        if (!_fileHandles.TryRemove(handle, out var stream))
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        try
-        {
-            stream.Dispose();
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = unchecked((ulong)(int)-1);
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-    }
-
-    [SysAbiExport(
-        Nid = "lbB+UlZqVG0",
-        ExportName = "fread",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fread(CpuContext ctx)
-    {
-        var destination = 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;
-        }
-
-        if (destination == 0 || !_fileHandles.TryGetValue(handle, out var stream))
-        {
-            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 totalRead = 0;
-
-        try
-        {
-            while (totalRead < totalRequested)
-            {
-                var request = (int)Math.Min((ulong)buffer.Length, totalRequested - totalRead);
-                var read = stream.Read(buffer, 0, request);
-                if (read <= 0)
-                {
-                    break;
-                }
-
-                if (!ctx.Memory.TryWrite(destination + totalRead, buffer.AsSpan(0, read)))
-                {
-                    ctx[CpuRegister.Rax] = totalRead / elementSize;
-                    return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-                }
-
-                totalRead += (ulong)read;
-            }
-        }
-        catch (IOException)
-        {
-            ctx[CpuRegister.Rax] = totalRead / elementSize;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-
-        if (_traceStdio)
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][TRACE] fread: handle=0x{handle:X} requested={totalRequested} read={totalRead} pos={stream.Position}");
-        }
-
-        ctx[CpuRegister.Rax] = totalRead / elementSize;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "KdP-nULpuGw",
-        ExportName = "fgets",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int Fgets(CpuContext ctx)
-    {
-        var destination = ctx[CpuRegister.Rdi];
-        var maxCount = unchecked((int)ctx[CpuRegister.Rsi]);
-        var handle = ctx[CpuRegister.Rdx];
-
-        if (destination == 0 || maxCount <= 0 || !_fileHandles.TryGetValue(handle, out var stream))
-        {
-            ctx[CpuRegister.Rax] = 0;
-            return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT;
-        }
-
-        var buffer = ArrayPool<byte>.Shared.Rent(maxCount - 1);
-        var count = 0;
-
-        try
-        {
-            while (count < maxCount - 1)
-            {
-                var b = stream.ReadByte();
-                if (b < 0)
-                {
-                    break;
-                }
-
-                buffer[count++] = (byte)b;
-                if (b == '\n')
-                {
-                    break;
-                }
-            }
-
-            if (count == 0)
-            {
-                ctx[CpuRegister.Rax] = 0;
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_FOUND;
-            }
-
-            Span<byte> withNul = stackalloc byte[count + 1];
-            buffer.AsSpan(0, count).CopyTo(withNul);
-            withNul[count] = 0;
-
-            if (!ctx.Memory.TryWrite(destination, withNul))
-            {
-                ctx[CpuRegister.Rax] = 0;
-                return (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
-            }
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-
-        ctx[CpuRegister.Rax] = destination;
-        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",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libc")]
-    public static int GetPctype(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = unchecked((ulong)EnsureCtypeTable());
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    private static unsafe nint EnsureCtypeTable()
-    {
-        lock (_ctypeTableGate)
-        {
-            if (_ctypeTableBase != 0)
-            {
-                return _ctypeTableBase;
-            }
-
-            var storage = Marshal.AllocHGlobal(CtypeTableEntryCount * sizeof(ushort));
-            var entries = new Span<ushort>((void*)storage, CtypeTableEntryCount);
-            for (var i = 0; i < CtypeTableEntryCount; i++)
-            {
-                var c = i + CtypeTableLowerBound;
-                entries[i] = c is >= 0 and <= 0x7F ? ComputeCtypeFlags(c) : (ushort)0;
-            }
-
-            // Table is indexed as base[c] for c in [-128, 255], so the pointer handed to the
-            // guest must point at the c == 0 entry, not the start of the allocation.
-            _ctypeTableBase = storage - (CtypeTableLowerBound * sizeof(ushort));
-            return _ctypeTableBase;
-        }
-    }
-
-    private static ushort ComputeCtypeFlags(int c)
-    {
-        var isUpper = c is >= 'A' and <= 'Z';
-        var isLower = c is >= 'a' and <= 'z';
-        var isDigit = c is >= '0' and <= '9';
-        var isHex = isDigit || (c is >= 'A' and <= 'F') || (c is >= 'a' and <= 'f');
-        var isAlnum = isUpper || isLower || isDigit;
-        // In the Dinkumware table '\t'..'\r' carry _CN (isspace and iscntrl both match via
-        // _CN) while plain ' ' carries _SP; keeping them distinct is what keeps isprint(' ')
-        // true and isprint('\t') false.
-        var isControlSpace = c is >= 0x09 and <= 0x0D;
-        var isControl = (c is >= 0x00 and <= 0x08) || (c is >= 0x0E and <= 0x1F) || c == 0x7F;
-        var isPrintable = c is >= 0x20 and <= 0x7E;
-        var isPunct = isPrintable && !isAlnum && c != ' ';
-
-        ushort flags = 0;
-        if (isUpper) flags |= CtypeUpper;
-        if (isLower) flags |= CtypeLower;
-        if (isDigit) flags |= CtypeDigit;
-        if (isHex) flags |= CtypeXDigit;
-        if (c == ' ') flags |= CtypeSpace | CtypeBlank;
-        if (c == '\t') flags |= CtypeBlank;
-        if (isControlSpace) flags |= CtypeControlSpace;
-        if (isPunct) flags |= CtypePunct;
-        if (isControl) flags |= CtypeControl;
-        return flags;
-    }
-
-    private static bool TryParseFopenMode(string mode, out FileMode fileMode, out FileAccess fileAccess)
-    {
-        fileMode = FileMode.Open;
-        fileAccess = FileAccess.Read;
-
-        if (string.IsNullOrEmpty(mode))
-        {
-            return false;
-        }
-
-        var plus = mode.Contains('+');
-        switch (mode[0])
-        {
-            case 'r':
-                fileMode = FileMode.Open;
-                fileAccess = plus ? FileAccess.ReadWrite : FileAccess.Read;
-                return true;
-
-            case 'w':
-                fileMode = FileMode.Create;
-                fileAccess = plus ? FileAccess.ReadWrite : FileAccess.Write;
-                return true;
-
-            case 'a':
-                if (plus)
-                {
-                    fileMode = FileMode.OpenOrCreate;
-                    fileAccess = FileAccess.ReadWrite;
-                }
-                else
-                {
-                    fileMode = FileMode.Append;
-                    fileAccess = FileAccess.Write;
-                }
-
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    private static bool TryGetSeekOrigin(int whence, out SeekOrigin origin)
-    {
-        switch (whence)
-        {
-            case 0:
-                origin = SeekOrigin.Begin;
-                return true;
-
-            case 1:
-                origin = SeekOrigin.Current;
-                return true;
-
-            case 2:
-                origin = SeekOrigin.End;
-                return true;
-
-            default:
-                origin = default;
-                return false;
-        }
-    }
-}

src/SharpEmu.Libs/Mouse/MouseExports.cs

@@ -1,33 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Libs.Mouse;
-
-public static class MouseExports
-{
-    // Returns 0 read entries: no mouse is connected. This NID was previously misbound
-    // as an sceNgs2VoiceGetState alias.
-    [SysAbiExport(
-        Nid = "x8qnXqh-tiM",
-        ExportName = "sceMouseRead",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMouse")]
-    public static int MouseRead(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
-    [SysAbiExport(
-        Nid = "RaqxZIf6DvE",
-        ExportName = "sceMouseOpen",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceMouse")]
-    public static int MouseOpen(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-}

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/Ngs2/Ngs2Exports.cs

@@ -13,7 +13,7 @@ public static class Ngs2Exports
     private const int OrbisNgs2ErrorInvalidSystemHandle = unchecked((int)0x804A0230);
     private const int OrbisNgs2ErrorInvalidRackHandle = unchecked((int)0x804A0261);
     private const int OrbisNgs2ErrorInvalidVoiceHandle = unchecked((int)0x804A0300);
-    private const ulong HandleStorageSize = 0x1000;
+    private const ulong HandleStorageSize = 0x20;
     private const int RenderBufferInfoSize = 0x18;
     private const ulong MaximumRenderBufferSize = 16 * 1024 * 1024;
 
@@ -197,18 +197,12 @@ public static class Ngs2Exports
         lock (StateGate)
         {
             return ctx.SetReturn(
-                Voices.ContainsKey(ctx[CpuRegister.Rdi])
-                    ? 0
+                Voices.ContainsKey(ctx[CpuRegister.Rdi]) 
+                    ? 0 
                     : OrbisNgs2ErrorInvalidVoiceHandle);
         }
     }
 
-    // The earlier "alt NID" guesses here were wrong: an NID is the aerolib hash of one
-    // symbol name, and hashing scripts/ps5_names.txt shows the previous alt bindings
-    // actually belonged to sceImeUpdate (-4GCfYdNF1s), sceMouseRead (x8qnXqh-tiM) and
-    // sceSystemGestureUpdateAllTouchRecognizer (wPJGwI2RM2I) — Quake's audio thread was
-    // receiving an NGS2 error from what it thought was sceImeUpdate. Those now live in
-    // their real libraries; the NIDs below are verified against the hash.
     [SysAbiExport(
         Nid = "AbYvTOZ8Pts",
         ExportName = "sceNgs2VoiceRunCommands",
@@ -216,48 +210,6 @@ public static class Ngs2Exports
         LibraryName = "libSceNgs2")]
     public static int Ngs2VoiceRunCommands(CpuContext ctx) => Ngs2VoiceControl(ctx);
 
-    [SysAbiExport(
-        Nid = "-TOuuAQ-buE",
-        ExportName = "sceNgs2VoiceGetState",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2VoiceGetState(CpuContext ctx) => ctx.SetReturn(0);
-
-    [SysAbiExport(
-        Nid = "rEh728kXk3w",
-        ExportName = "sceNgs2VoiceGetStateFlags",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2VoiceGetStateFlags(CpuContext ctx) => ctx.SetReturn(0);
-
-    [SysAbiExport(
-        Nid = "xa8oL9dmXkM",
-        ExportName = "sceNgs2PanInit",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2PanInit(CpuContext ctx) => ctx.SetReturn(0);
-
-    [SysAbiExport(
-        Nid = "1WsleK-MTkE",
-        ExportName = "sceNgs2GeomCalcListener",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2GeomCalcListener(CpuContext ctx) => ctx.SetReturn(0);
-
-    [SysAbiExport(
-        Nid = "0lbbayqDNoE",
-        ExportName = "sceNgs2GeomResetSourceParam",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2GeomResetSourceParam(CpuContext ctx) => ctx.SetReturn(0);
-
-    [SysAbiExport(
-        Nid = "7Lcfo8SmpsU",
-        ExportName = "sceNgs2GeomResetListenerParam",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNgs2")]
-    public static int Ngs2GeomResetListenerParam(CpuContext ctx) => ctx.SetReturn(0);
-
     [SysAbiExport(
         Nid = "i0VnXM-C9fc",
         ExportName = "sceNgs2SystemRender",
@@ -311,6 +263,7 @@ public static class Ngs2Exports
 
     private static bool TryCreateHandle(CpuContext ctx, uint type, ulong ownerHandle, out ulong handle)
     {
+        handle = 0;
         if (!KernelMemoryCompatExports.TryAllocateHleData(ctx, HandleStorageSize, 16, out handle))
         {
             return false;
@@ -318,18 +271,11 @@ public static class Ngs2Exports
 
         Span<byte> data = stackalloc byte[(int)HandleStorageSize];
         data.Clear();
+        BinaryPrimitives.WriteUInt64LittleEndian(data[0..8], handle);
         BinaryPrimitives.WriteUInt64LittleEndian(data[8..16], ownerHandle);
         BinaryPrimitives.WriteUInt32LittleEndian(data[16..20], 1);
         BinaryPrimitives.WriteUInt32LittleEndian(data[24..28], type);
-        if (!ctx.Memory.TryWrite(handle, data))
-        {
-            return false;
-        }
-
-        // Offset 0 doubles as a vtable slot for guest code that treats this handle as a C++
-        // object; stamp it with the shared dummy vtable instead of a self-referential value.
-        KernelMemoryCompatExports.TryWriteDummyVtable(ctx, handle);
-        return true;
+        return ctx.Memory.TryWrite(handle, data);
     }
 
     private static bool TryClearGuestBuffer(CpuContext ctx, ulong address, ulong length)

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",
@@ -44,41 +33,6 @@ public static class NpManagerExports
         return (int)OrbisGen2Result.ORBIS_GEN2_OK;
     }
 
-    // Offline profile: the online id payload is left untouched and the call
-    // reports success, matching the other offline NpManager stubs here.
-    [SysAbiExport(
-        Nid = "XDncXQIJUSk",
-        ExportName = "sceNpGetOnlineId",
-        Target = Generation.Gen4 | Generation.Gen5,
-        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 = "sceNpGetAccountIdA",
-        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]);
-    }
-
-    [SysAbiExport(
-        Nid = "e-ZuhGEoeC4",
-        ExportName = "sceNpGetNpReachabilityState",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpManager")]
-    public static int NpGetNpReachabilityState(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 0;
-        return (int)OrbisGen2Result.ORBIS_GEN2_OK;
-    }
-
     [SysAbiExport(
         Nid = "VfRSmPmj8Q8",
         ExportName = "sceNpRegisterStateCallback",
@@ -180,19 +134,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/NpTrophy2Exports.cs

@@ -1,108 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-using System.Buffers.Binary;
-
-namespace SharpEmu.Libs.Np;
-
-public static class NpTrophy2Exports
-{
-    private static int _nextContext = 1;
-    private static int _nextHandle = 1;
-
-    [SysAbiExport(
-        Nid = "Bagshr7OQ6Q",
-        ExportName = "sceNpTrophy2CreateContext",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2CreateContext(CpuContext ctx)
-    {
-        return WriteIdAndReturn(ctx, ctx[CpuRegister.Rdi], ref _nextContext);
-    }
-
-    [SysAbiExport(
-        Nid = "Gz1rmUZpROM",
-        ExportName = "sceNpTrophy2CreateHandle",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2CreateHandle(CpuContext ctx)
-    {
-        return WriteIdAndReturn(ctx, ctx[CpuRegister.Rdi], ref _nextHandle);
-    }
-
-    [SysAbiExport(
-        Nid = "sysY2FHYff4",
-        ExportName = "sceNpTrophy2DestroyContext",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2DestroyContext(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "d8P11CI40KE",
-        ExportName = "sceNpTrophy2DestroyHandle",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2DestroyHandle(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "fYapWA9xVmA",
-        ExportName = "sceNpTrophy2AbortHandle",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2AbortHandle(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "bIDov3wBu5Q",
-        ExportName = "sceNpTrophy2RegisterContext",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2RegisterContext(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "sUXGfNMalIo",
-        ExportName = "sceNpTrophy2RegisterUnlockCallback",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2RegisterUnlockCallback(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "wVqxM58sIKs",
-        ExportName = "sceNpTrophy2UnregisterUnlockCallback",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2UnregisterUnlockCallback(CpuContext ctx) => ReturnOk(ctx);
-
-    [SysAbiExport(
-        Nid = "EHQEDVXZ0TI",
-        ExportName = "sceNpTrophy2ShowTrophyList",
-        Target = Generation.Gen5,
-        LibraryName = "libSceNpTrophy2")]
-    public static int NpTrophy2ShowTrophyList(CpuContext ctx) => ReturnOk(ctx);
-
-    private static int WriteIdAndReturn(CpuContext ctx, ulong outAddress, ref int nextId)
-    {
-        if (outAddress == 0)
-        {
-            return SetReturn(ctx, OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
-        }
-
-        Span<byte> idBytes = stackalloc byte[sizeof(int)];
-        BinaryPrimitives.WriteInt32LittleEndian(idBytes, nextId);
-        if (!ctx.Memory.TryWrite(outAddress, idBytes))
-        {
-            return SetReturn(ctx, OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
-        }
-
-        nextId++;
-        return SetReturn(ctx, OrbisGen2Result.ORBIS_GEN2_OK);
-    }
-
-    private static int ReturnOk(CpuContext ctx) => SetReturn(ctx, OrbisGen2Result.ORBIS_GEN2_OK);
-
-    private static int SetReturn(CpuContext ctx, OrbisGen2Result result)
-    {
-        ctx[CpuRegister.Rax] = unchecked((ulong)(int)result);
-        return (int)result;
-    }
-}

src/SharpEmu.Libs/Np/NpUniversalDataSystemExports.cs

@@ -9,10 +9,7 @@ namespace SharpEmu.Libs.Np;
 public static class NpUniversalDataSystemExports
 {
     private const int NpUniversalDataSystemErrorInvalidArgument = unchecked((int)0x80553102);
-    private static readonly object _eventGate = new();
-    private static readonly HashSet<int> _createdEvents = [];
     private static int _nextHandle = 1;
-    private static int _nextEvent = 1;
 
     [SysAbiExport(
         Nid = "sjaobBgqeB4",
@@ -70,114 +67,6 @@ public static class NpUniversalDataSystemExports
         return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
     }
 
-    [SysAbiExport(
-        Nid = "p+GcLqwpL9M",
-        ExportName = "sceNpUniversalDataSystemCreateEvent",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemCreateEvent(CpuContext ctx)
-    {
-        var parameterAddress = ctx[CpuRegister.Rdi];
-        if (parameterAddress == 0)
-        {
-            return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
-        }
-
-        var eventId = Interlocked.Increment(ref _nextEvent);
-        lock (_eventGate)
-        {
-            _createdEvents.Add(eventId);
-        }
-
-        if (ctx.TryWriteInt32(ctx[CpuRegister.Rdx], eventId, checkNil: true) ||
-            ctx.TryWriteInt32(ctx[CpuRegister.Rcx], eventId, checkNil: true))
-        {
-            return ctx.SetReturn(0, typeof(long));
-        }
-
-        lock (_eventGate)
-        {
-            _createdEvents.Remove(eventId);
-        }
-
-        return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
-    }
-
-    [SysAbiExport(
-        Nid = "wG+84pnNIuo",
-        ExportName = "sceNpUniversalDataSystemDestroyEvent",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemDestroyEvent(CpuContext ctx)
-    {
-        var eventId = unchecked((int)ctx[CpuRegister.Rdi]);
-        lock (_eventGate)
-        {
-            _createdEvents.Remove(eventId);
-        }
-
-        return ctx.SetReturn(0, typeof(long));
-    }
-
-    [SysAbiExport(
-        Nid = "MfDb+4Nln64",
-        ExportName = "sceNpUniversalDataSystemEventPropertyObjectSetString",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemEventPropertyObjectSetString(CpuContext ctx)
-    {
-        var propertyObjectAddress = ctx[CpuRegister.Rsi];
-        var valueAddress = ctx[CpuRegister.Rdx];
-        if (propertyObjectAddress == 0 || valueAddress == 0)
-        {
-            return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
-        }
-
-        Span<byte> probe = stackalloc byte[1];
-        return ctx.Memory.TryRead(propertyObjectAddress, probe) &&
-               ctx.Memory.TryRead(valueAddress, probe)
-            ? ctx.SetReturn(0, typeof(long))
-            : ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
-    }
-
-    [SysAbiExport(
-        Nid = "Wxbg5x3pTXA",
-        ExportName = "sceNpUniversalDataSystemEventPropertyObjectSetArray",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemEventPropertyObjectSetArray(CpuContext ctx)
-    {
-        var propertyObjectAddress = ctx[CpuRegister.Rsi];
-        var valueAddress = ctx[CpuRegister.Rdx];
-        if (propertyObjectAddress == 0)
-        {
-            return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
-        }
-
-        Span<byte> probe = stackalloc byte[1];
-        if (!ctx.Memory.TryRead(propertyObjectAddress, probe))
-        {
-            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
-        }
-
-        if (valueAddress != 0 && !ctx.Memory.TryRead(valueAddress, probe))
-        {
-            return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
-        }
-
-        return ctx.SetReturn(0, typeof(long));
-    }
-
-    [SysAbiExport(
-        Nid = "CzkKf7ahIyU",
-        ExportName = "sceNpUniversalDataSystemPostEvent",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemPostEvent(CpuContext ctx)
-    {
-        return ctx.SetReturn(0, typeof(long));
-    }
-
     [SysAbiExport(
         Nid = "tpFJ8LIKvPw",
         ExportName = "sceNpUniversalDataSystemRegisterContext",
@@ -187,14 +76,4 @@ public static class NpUniversalDataSystemExports
     {
         return ctx.SetReturn(0, typeof(long));
     }
-
-    [SysAbiExport(
-        Nid = "AUIHb7jUX3I",
-        ExportName = "sceNpUniversalDataSystemDestroyHandle",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceNpUniversalDataSystem")]
-    public static int NpUniversalDataSystemDestroyHandle(CpuContext ctx)
-    {
-        return ctx.SetReturn(0, typeof(long));
-    }
 }