[gpu-hotfix1] Cache improvements have been made (6x performance gain) (#18)

* [scePad] Just format code

* [sceSaveData] user folder sometimes appeared in the previous folder has been fixed.

.editorconfig

@@ -14,7 +14,7 @@ indent_size = 4
 indent_style = space
 tab_width = 4
 
-[*.{md,json,yml,xml,props,csproj}]
+[*.{md,json,yml,props,csproj}]
 
 indent_size = 2
 tab_width = 2

.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/pull_request_template.md

@@ -1,27 +0,0 @@
-## Before submitting
-
-Please read our contribution guidelines before opening a pull request:
-
-➡️ [**CONTRIBUTING.md**](https://github.com/sharpemu/sharpemu/blob/main/CONTRIBUTING.md)
-
-By opening this pull request, you confirm that you have read and agree to follow the contribution guidelines.
-
-## Testing
-
-If applicable, list the game(s) you tested and briefly describe the results.
-
-Example:
-
-- Demon's Souls (PPSA01341) – Boots to splash screen.
-- Dreaming Sarah – Save/load works correctly.
-
-If your changes do not affect runtime behavior (e.g. documentation, tooling, CI), write `N/A`.
-
-## Checklist
-
-By submitting this pull request, you confirm that:
-
-- [ ] I have read and followed `CONTRIBUTING.md`.
-- [ ] I tested my changes or marked the testing section as `N/A`.
-- [ ] I wrote this pull request description myself and did not paste AI-generated explanations.
-- [ ] I listed the game(s) I tested (or marked the testing section as `N/A`).

.github/workflows/notify-site.yml

@@ -1,31 +0,0 @@
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Tells the website repo to rebuild when a release is published, so
-# sharpemu.app/downloads lists the new build within a minute.
-name: Notify website
-
-on:
-  release:
-    types: [published, released, edited, deleted]
-  workflow_dispatch:
-
-jobs:
-  dispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger sharpemu-site rebuild
-        env:
-          TOKEN: ${{ secrets.SITE_DISPATCH_TOKEN }}
-        run: |
-          if [ -z "$TOKEN" ]; then
-            echo "SITE_DISPATCH_TOKEN is not set — skipping website rebuild."
-            exit 0
-          fi
-          curl -fsS -X POST \
-            -H "Authorization: Bearer $TOKEN" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/sharpemu/sharpemu-site/dispatches \
-            -d '{"event_type":"release-published"}'
-          echo "Website rebuild requested."

.github/workflows/pr-build-links.yml

@@ -1,120 +0,0 @@
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Posts (and keeps updated) a single PR comment linking the per-platform build
-# artifacts once "Build and Release" finishes.
-#
-# This is a workflow_run workflow on purpose: PRs from forks run "Build and
-# Release" with a read-only GITHUB_TOKEN and cannot comment. workflow_run runs
-# afterwards in the base-repo context with a read-write token and does not check
-# out untrusted fork code, so it can comment safely. Because of that, GitHub only
-# triggers it from the copy on the default branch — it does nothing until merged
-# to main.
-name: PR Build Links
-
-on:
-  workflow_run:
-    workflows: ["Build and Release"]
-    types:
-      - completed
-
-permissions:
-  contents: read
-  actions: read
-  pull-requests: write
-
-jobs:
-  comment:
-    name: Post artifact links
-    runs-on: ubuntu-latest
-    # Only for successful PR builds — artifacts exist only when the build passed.
-    if: >-
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success'
-    steps:
-      - name: Post or update the artifact-links comment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const run = context.payload.workflow_run;
-            const { owner, repo } = context.repo;
-
-            // Resolve the PR. Same-repo PRs are in workflow_run.pull_requests, but
-            // fork PRs leave it empty AND their head commit is not on a base-repo
-            // branch, so listPullRequestsAssociatedWithCommit misses them too. Match
-            // the open PR by its head "owner:branch" instead, which works for forks.
-            let prNumber;
-            if (run.pull_requests && run.pull_requests.length > 0) {
-              prNumber = run.pull_requests[0].number;
-            } else {
-              let candidates = [];
-              const headOwner = run.head_repository && run.head_repository.owner
-                ? run.head_repository.owner.login
-                : null;
-              if (headOwner && run.head_branch) {
-                const byHead = await github.rest.pulls.list({
-                  owner, repo, state: 'open',
-                  head: `${headOwner}:${run.head_branch}`, per_page: 10,
-                });
-                candidates = byHead.data;
-              }
-              if (candidates.length === 0) {
-                const byCommit = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-                  owner, repo, commit_sha: run.head_sha,
-                });
-                candidates = byCommit.data.filter(pr => pr.state === 'open');
-              }
-              if (candidates.length === 0) {
-                core.info('No open PR for this build; nothing to comment.');
-                return;
-              }
-              prNumber = candidates[0].number;
-            }
-
-            // Collect the per-platform artifacts the build produced.
-            const artifacts = await github.paginate(
-              github.rest.actions.listWorkflowRunArtifacts,
-              { owner, repo, run_id: run.id, per_page: 100 },
-            );
-            const platforms = [
-              { key: 'win-x64', label: 'Windows (win-x64)' },
-              { key: 'linux-x64', label: 'Linux (linux-x64)' },
-              { key: 'osx-x64', label: 'macOS (osx-x64)' },
-            ];
-            const rows = [];
-            for (const platform of platforms) {
-              const artifact = artifacts.find(a => a.name.includes(platform.key));
-              if (!artifact) {
-                continue;
-              }
-              const url = `https://github.com/${owner}/${repo}/actions/runs/${run.id}/artifacts/${artifact.id}`;
-              rows.push(`| ${platform.label} | [\`${artifact.name}\`](${url}) |`);
-            }
-            if (rows.length === 0) {
-              core.info('No platform artifacts on this run; nothing to comment.');
-              return;
-            }
-
-            const marker = '<!-- pr-build-links -->';
-            const body = [
-              marker,
-              `### 📦 Build artifacts — \`${run.head_sha.substring(0, 7)}\``,
-              '',
-              '| Platform | Download |',
-              '| --- | --- |',
-              ...rows,
-              '',
-              `From [build run #${run.run_number}](${run.html_url}). ` +
-                'Downloads require a GitHub login and expire after 90 days.',
-            ].join('\n');
-
-            // Upsert one comment so repeated builds refresh it in place.
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner, repo, issue_number: prNumber, per_page: 100,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({ owner, repo, comment_id: existing.id, body });
-            } else {
-              await github.rest.issues.createComment({ owner, repo, issue_number: prNumber, body });
-            }

.github/workflows/workflow.yml

@@ -7,8 +7,6 @@ on:
   push:
     branches:
       - "**"
-    tags:
-      - "v*"
     paths-ignore:
       - "**/*.md"
       - "**/*.png"
@@ -36,36 +34,29 @@ jobs:
     name: Init
     runs-on: ubuntu-latest
     outputs:
+      archive-name: ${{ steps.vars.outputs.archive-name }}
+      artifact-name: ${{ steps.vars.outputs.artifact-name }}
       release-name: ${{ steps.vars.outputs.release-name }}
       release-tag: ${{ steps.vars.outputs.release-tag }}
-      safe-ref: ${{ steps.vars.outputs.safe-ref }}
       short-sha: ${{ steps.vars.outputs.short-sha }}
-      version: ${{ steps.vars.outputs.version }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
       - name: Compute workflow variables
         id: vars
         shell: bash
         run: |
           short_sha="${GITHUB_SHA::7}"
           safe_ref="$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | sed 's#[^a-z0-9._-]#-#g')"
-          version="$(python3 -c 'import sys, xml.etree.ElementTree as ET; version = ET.parse("Directory.Build.props").getroot().findtext(".//SharpEmuVersion"); sys.exit("Directory.Build.props is missing SharpEmuVersion") if not version or not version.strip() else print(version.strip())')"
-          release_tag="v${version}"
-          release_name="SharpEmu v${version}"
-
-          if [ "${GITHUB_REF_TYPE}" = "tag" ] && [ "${GITHUB_REF_NAME}" != "${release_tag}" ]; then
-            echo "Release tag ${GITHUB_REF_NAME} does not match project version ${release_tag}." >&2
-            exit 1
-          fi
+          archive_name="sharpemu-win64-${short_sha}.zip"
+          artifact_name="sharpemu-win64-${short_sha}"
+          release_tag="win64-${safe_ref}-${short_sha}"
+          release_name="SharpEmu win64 ${short_sha}"
 
           {
             echo "short-sha=${short_sha}"
-            echo "safe-ref=${safe_ref}"
+            echo "archive-name=${archive_name}"
+            echo "artifact-name=${artifact_name}"
             echo "release-tag=${release_tag}"
             echo "release-name=${release_name}"
-            echo "version=${version}"
           } >> "$GITHUB_OUTPUT"
 
   reuse:
@@ -101,23 +92,14 @@ jobs:
           cache: true
           cache-dependency-path: |
             Directory.Packages.props
-            Directory.Build.props
+            src/**/packages.lock.json
 
       - name: Restore solution
-        run: dotnet restore SharpEmu.slnx
+        run: dotnet restore SharpEmu.slnx --locked-mode
 
       - name: Build solution
         run: dotnet build SharpEmu.slnx -c Release --no-restore
 
-      # Runs every test project in the solution; a test failure fails the build, as
-      # does an aerolib.bin generation failure in the build step above (the MSBuild
-      # task logs an error and returns false).
-      - name: Run tests
-        run: dotnet test SharpEmu.slnx -c Release --no-build --verbosity normal
-
-      - 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}"
 
@@ -125,8 +107,7 @@ jobs:
         run: |
           New-Item -ItemType Directory -Path $env:RELEASE_DIR -Force | Out-Null
 
-          $archiveName = "sharpemu-${{ needs.init.outputs.version }}-win-x64.zip"
-          $archivePath = Join-Path $env:RELEASE_DIR $archiveName
+          $archivePath = Join-Path $env:RELEASE_DIR "${{ needs.init.outputs.archive-name }}"
           if (Test-Path $archivePath) {
             Remove-Item $archivePath -Force
           }
@@ -136,72 +117,8 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v7
         with:
-          name: sharpemu-win-x64-${{ needs.init.outputs.short-sha }}
-          path: ${{ env.RELEASE_DIR }}\sharpemu-${{ needs.init.outputs.version }}-win-x64.zip
-          if-no-files-found: error
-
-  build-posix:
-    name: Build ${{ matrix.rid }}
-    needs:
-      - init
-      - reuse
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            rid: linux-x64
-          - os: macos-latest
-            rid: osx-x64
-    env:
-      DOTNET_NOLOGO: true
-      NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
-      PUBLISH_DIR: ${{ github.workspace }}/artifacts/publish/${{ matrix.rid }}
-      RELEASE_DIR: ${{ github.workspace }}/artifacts/release
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: 10.0.103
-          cache: true
-          cache-dependency-path: |
-            Directory.Packages.props
-            Directory.Build.props
-
-      - name: Restore solution
-        run: dotnet restore SharpEmu.slnx
-
-      - name: Build solution
-        run: dotnet build SharpEmu.slnx -c Release --no-restore
-
-      # Also runs on Linux/macOS: the aerolib.bin MSBuild task does platform-sensitive
-      # path handling, so a cross-platform generation regression surfaces here.
-      - name: Run tests
-        run: dotnet test SharpEmu.slnx -c Release --no-build --verbosity normal
-
-      - name: Publish ${{ matrix.rid }} CLI
-        run: dotnet publish src/SharpEmu.CLI/SharpEmu.CLI.csproj -c Release -r ${{ matrix.rid }} --self-contained true --no-restore -p:PublishDir="$PUBLISH_DIR"
-
-      - name: Stage MoltenVK next to the build
-        if: matrix.rid == 'osx-x64'
-        run: scripts/fetch-macos-moltenvk.sh "$PUBLISH_DIR"
-
-      - name: Create release archive
-        run: |
-          mkdir -p "$RELEASE_DIR"
-          # tar keeps the executable bit, which zip would drop.
-          tar -czf "$RELEASE_DIR/sharpemu-${{ needs.init.outputs.version }}-${{ matrix.rid }}.tar.gz" \
-            -C "$PUBLISH_DIR" .
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: sharpemu-${{ matrix.rid }}-${{ needs.init.outputs.short-sha }}
-          path: ${{ env.RELEASE_DIR }}/sharpemu-${{ needs.init.outputs.version }}-${{ matrix.rid }}.tar.gz
+          name: ${{ needs.init.outputs.artifact-name }}
+          path: ${{ env.RELEASE_DIR }}\${{ needs.init.outputs.archive-name }}
           if-no-files-found: error
 
   release:
@@ -209,42 +126,35 @@ jobs:
     needs:
       - init
       - build
-      - build-posix
-    # Versioned releases are immutable and tag-driven. Branch and manual runs
-    # still produce Actions artifacts without modifying a published release.
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - name: Download build artifacts
+      - name: Download build artifact
         uses: actions/download-artifact@v8
         with:
+          name: ${{ needs.init.outputs.artifact-name }}
           path: release
 
-      - name: Create release
+      - name: Create or update release
         shell: bash
         env:
+          ARCHIVE_NAME: ${{ needs.init.outputs.archive-name }}
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_NAME: ${{ needs.init.outputs.release-name }}
           RELEASE_TAG: ${{ needs.init.outputs.release-tag }}
-          VERSION: ${{ needs.init.outputs.version }}
         run: |
-          mapfile -t assets < <(find release -type f \( -name '*.zip' -o -name '*.tar.gz' \) | sort)
-          if [ "${#assets[@]}" -eq 0 ]; then
-            echo "No release assets found." >&2
-            exit 1
-          fi
-
-          notes="Automated SharpEmu v${VERSION} build for commit ${GITHUB_SHA}."
+          asset_path="release/${ARCHIVE_NAME}"
+          notes="Automated Windows build for commit ${GITHUB_SHA}."
 
           if gh release view "${RELEASE_TAG}" >/dev/null 2>&1; then
-            echo "Release ${RELEASE_TAG} already exists and will not be modified." >&2
-            exit 1
+            gh release upload "${RELEASE_TAG}" "${asset_path}" --clobber
+            gh release edit "${RELEASE_TAG}" --title "${RELEASE_NAME}" --notes "${notes}"
+          else
+            gh release create "${RELEASE_TAG}" "${asset_path}" \
+              --title "${RELEASE_NAME}" \
+              --notes "${notes}" \
+              --target "${GITHUB_SHA}"
           fi
-
-          gh release create "${RELEASE_TAG}" "${assets[@]}" \
-            --verify-tag \
-            --title "${RELEASE_NAME}" \
-            --notes "${notes}"

.gitignore

@@ -26,7 +26,6 @@ arm64/
 *.userosscache
 *.sln.docstates
 
-.packages
 packages/
 *.nupkg
 .nuget/
@@ -37,6 +36,3 @@ packages/
 Thumbs.db
 Desktop.ini
 ehthumbs.db
-
-.vs/
-.idea/

CONTRIBUTING.md

@@ -1,75 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-# Contributing
-
-> [!IMPORTANT]
-> The pull request template is mandatory.
->
-> Pull requests that do not follow the template or leave the required checklist incomplete will be closed without review, even if the proposed code is technically correct or beneficial. Please review these contribution guidelines before submitting a pull request.
-
-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.Build.props

@@ -9,8 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <SharpEmuVersion>0.0.2-beta.3</SharpEmuVersion>
-    <Version>$(SharpEmuVersion)</Version>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
     <RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)'))</RepoRoot>
 
@@ -33,18 +32,4 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
-
-  <!-- Build provenance surfaced by SharpEmu.Logging.BuildInfo as a banner at the
-       top of the log. Populated from GitHub Actions environment variables when
-       building in CI; empty locally. -->
-  <ItemGroup>
-    <AssemblyMetadata Include="SharpEmu.BuildConfiguration" Value="$(Configuration)" />
-    <AssemblyMetadata Condition="'$(GITHUB_SHA)' != ''" Include="SharpEmu.BuildSha" Value="$(GITHUB_SHA)" />
-    <AssemblyMetadata Condition="'$(GITHUB_REF_NAME)' != ''" Include="SharpEmu.BuildBranch" Value="$(GITHUB_REF_NAME)" />
-    <AssemblyMetadata Condition="'$(GITHUB_REF)' != ''" Include="SharpEmu.BuildRef" Value="$(GITHUB_REF)" />
-    <AssemblyMetadata Condition="'$(GITHUB_EVENT_NAME)' != ''" Include="SharpEmu.BuildEventName" Value="$(GITHUB_EVENT_NAME)" />
-    <AssemblyMetadata Condition="'$(GITHUB_REPOSITORY)' != ''" Include="SharpEmu.BuildRepository" Value="$(GITHUB_REPOSITORY)" />
-    <AssemblyMetadata Condition="'$(GITHUB_SERVER_URL)' != ''" Include="SharpEmu.BuildServerUrl" Value="$(GITHUB_SERVER_URL)" />
-    <AssemblyMetadata Condition="'$(GITHUB_RUN_ID)' != ''" Include="SharpEmu.BuildRunId" Value="$(GITHUB_RUN_ID)" />
-  </ItemGroup>
 </Project>

Directory.Packages.props

@@ -1,29 +1,16 @@
-<!--
+<!--
 Copyright (C) 2026 SharpEmu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->
+
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.3.18" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.18" />
-    <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.Build.Framework" Version="17.14.8" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="Silk.NET.Input" Version="2.23.0" />
     <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>

LICENSES/MIT.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Alex Barney
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

REUSE.toml

@@ -3,22 +3,13 @@ version = 1
 [[annotations]]
 path = [
     "REUSE.toml",
-    "nuget.config",
     "global.json",
     "**/packages.lock.json",
     "scripts/ps5_names.txt",
-    "src/SharpEmu.GUI/Languages/**",
+    "src/SharpEmu.HLE/Aerolib/aerolib.bin",
     "_logs/**",
-    ".github/images/**",
-    ".github/pull_request_template.md",
-    "assets/images/**"
+    ".github/images/**"
 ]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "SharpEmu Emulator Project"
 SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = "src/SharpEmu.GUI/Atrac9/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2018 Alex Barney"
-SPDX-License-Identifier = "MIT"

SharpEmu.slnx

@@ -7,16 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
   <Folder Name="/src/">
     <Project Path="src/SharpEmu.CLI/SharpEmu.CLI.csproj" />
     <Project Path="src/SharpEmu.Core/SharpEmu.Core.csproj" />
-    <Project Path="src/SharpEmu.GUI/SharpEmu.GUI.csproj" />
     <Project Path="src/SharpEmu.HLE/SharpEmu.HLE.csproj" />
     <Project Path="src/SharpEmu.Libs/SharpEmu.Libs.csproj" />
     <Project Path="src/SharpEmu.Logging/SharpEmu.Logging.csproj" />
-    <Project Path="src/SharpEmu.ShaderCompiler/SharpEmu.ShaderCompiler.csproj" />
-    <Project Path="src/SharpEmu.ShaderCompiler.Vulkan/SharpEmu.ShaderCompiler.Vulkan.csproj" />
-    <Project Path="src/SharpEmu.SourceGenerators/SharpEmu.SourceGenerators.csproj" />
-  </Folder>
-  <Folder Name="/tests/">
-    <Project Path="tests/SharpEmu.Libs.Tests/SharpEmu.Libs.Tests.csproj" />
-    <Project Path="tests/SharpEmu.SourceGenerators.Tests/SharpEmu.SourceGenerators.Tests.csproj" />
   </Folder>
 </Solution>

docs/bink2-bridge.md

@@ -1,46 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-# Bink 2 bridge
-
-Demon's Souls plays Bink 2 (.bk2) files through a Bink implementation linked
-directly into eboot.bin. It does not use libSceVideodec, therefore an HLE video
-decoder cannot observe or replace those frames.
-
-SharpEmu observes successful guest .bk2 opens and, when a Bink bridge is
-available, presents its decoded BGRA frames at the normal guest-flip boundary.
-This preserves the game's own timing and lets the host Vulkan presenter display
-the movie without trying to execute the PS5-specific Bink GPU decode path.
-
-Without an adapter, Bink movies are skipped by default: their open call returns
-not-found so games that mark cinematics as optional progress to their next
-state instead of waiting on an empty Bink GPU texture.
-
-Set SHARPEMU_BINK_MODE=dummy to retain the open and show a built-in,
-non-decoded placeholder frame. This requires no SDK, but is a visual diagnostic
-only; it does not decode the movie or alter its game logic. Set
-SHARPEMU_BINK_MODE=native to force native bridge mode.
-
-## Supplying the adapter
-
-Bink 2 is proprietary. Obtain a compatible Mac Bink 2 SDK from RAD Game Tools,
-then compile sharpemu_bink2_bridge.c against the SDK's bink.h and Mac library.
-The adapter deliberately contains only a three-function C ABI so the managed
-emulator never depends on RAD's private binary ABI.
-
-Place the resulting libsharpemu_bink2_bridge.dylib next to the SharpEmu
-executable, or point to it explicitly:
-
-    SHARPEMU_BINK2_BRIDGE=/absolute/path/libsharpemu_bink2_bridge.dylib \
-      ./SharpEmu /path/to/eboot.bin
-
-The expected exports are sharpemu_bink2_open_utf8,
-sharpemu_bink2_decode_next_bgra, and sharpemu_bink2_close. The supplied
-adapter opens one movie, exposes BGRA pixels, and advances after each decoded
-frame. The managed side validates dimensions and retains ownership of the
-destination buffer.
-
-If the bridge is absent in native mode, SharpEmu logs one informational line
-and retains the existing guest rendering path.

native/bink2-bridge/sharpemu_bink2_bridge.c

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2026 SharpEmu Emulator Project
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- * Build this small adapter with a licensed RAD Bink 2 SDK. The SDK and its
- * headers are not distributed by SharpEmu. See docs/bink2-bridge.md.
- */
-
-#include <stdint.h>
-#include "bink.h"
-
-typedef struct sharpemu_bink2_info {
-  uint32_t width;
-  uint32_t height;
-  uint32_t frames_per_second_numerator;
-  uint32_t frames_per_second_denominator;
-} sharpemu_bink2_info;
-
-int sharpemu_bink2_open_utf8(const char *path, HBINK *movie, sharpemu_bink2_info *info) {
-  HBINK bink;
-  if (!path || !movie || !info) return 0;
-
-  bink = BinkOpen(path, 0);
-  if (!bink) return 0;
-
-  *movie = bink;
-  info->width = bink->Width;
-  info->height = bink->Height;
-  info->frames_per_second_numerator = bink->FrameRate;
-  info->frames_per_second_denominator = bink->FrameRateDiv;
-  return 1;
-}
-
-int sharpemu_bink2_decode_next_bgra(HBINK movie, uint8_t *destination,
-                                    uint32_t stride, uint32_t destination_bytes) {
-  uint64_t needed;
-  if (!movie || !destination || stride < movie->Width * 4) return 0;
-  needed = (uint64_t)stride * movie->Height;
-  if (needed > destination_bytes) return 0;
-
-  /* Async Bink I/O has not filled the next frame yet; retry on the next host present. */
-  if (BinkWait(movie)) return 0;
-  BinkDoFrame(movie);
-  BinkCopyToBuffer(movie, destination, stride, movie->Height, 0, 0, BINKSURFACE32RA);
-  BinkNextFrame(movie);
-  return 1;
-}
-
-void sharpemu_bink2_close(HBINK movie) {
-  if (movie) BinkClose(movie);
-}

nuget.config

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <config>
-    <add key="globalPackagesFolder" value=".packages" />
-  </config>
-
-  <packageSources>
-    <clear />
-    <add key="Nuget" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-
-  <packageSourceMapping>
-    <packageSource key="Nuget">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>

scripts/RELEASE-USE.md

@@ -1,90 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-## Release Script
-
-SharpEmu releases are prepared and published using `scripts/release.py`.
-
-The release process consists of two steps:
-
-1. Prepare the version bump through a pull request.
-2. Create and push the release tag after the pull request has been merged.
-
-### Preparing a Release
-
-Run:
-
-```bash
-python scripts/release.py prepare 0.0.2-beta.2
-```
-
-This command will:
-
-- Verify that the working tree is clean.
-- Update the local `main` branch.
-- Create a new branch named `release/0.0.2-beta.2`.
-- Update `SharpEmuVersion` in `Directory.Build.props`.
-- Create a version bump commit.
-- Push the release branch to the remote repository.
-
-Afterwards, open a pull request from:
-
-```text
-release/0.0.2-beta.2
-```
-
-into:
-
-```text
-main
-```
-
-### Publishing a Release
-
-Once the pull request has been merged, update your local repository:
-
-```bash
-git switch main
-git pull --ff-only
-```
-
-Then create and push the release tag:
-
-```bash
-python scripts/release.py tag 0.0.2-beta.2
-```
-
-This command will:
-
-- Verify that the working tree is clean.
-- Confirm that `Directory.Build.props` contains the requested version.
-- Create an annotated Git tag (`v0.0.2-beta.2`).
-- Push the tag to the remote repository.
-
-Pushing the tag automatically triggers the GitHub Release workflow.
-
-### Version Format
-
-Specify the version **without** the `v` prefix.
-
-Examples:
-
-```text
-0.0.2
-0.0.2-alpha.1
-0.0.2-beta.1
-0.0.2-beta.2
-0.0.2-rc.1
-```
-
-The script automatically prefixes the Git tag with `v`.
-
-### Notes
-
-- Run `prepare` only from the `main` branch.
-- Run `tag` only after the version bump pull request has been merged.
-- Do not create release tags manually before merging the version bump.
-- Both commands require a clean working tree.
-- The version in `Directory.Build.props` must exactly match the version passed to the `tag` command.

scripts/fetch-macos-moltenvk.sh

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# Downloads the official (universal x86_64+arm64) MoltenVK dylib and stages
-# it next to a SharpEmu build as libvulkan.1.dylib. The macOS build runs as
-# an x86-64 process under Rosetta 2, so Homebrew's arm64-only Vulkan
-# libraries cannot be used; the presenter looks for this app-local copy.
-#
-# Usage: scripts/fetch-macos-moltenvk.sh [output-dir]
-#        (default output: artifacts/bin/Debug/net10.0/osx-x64)
-set -euo pipefail
-
-MVK_VERSION="${MVK_VERSION:-v1.4.0}"
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-OUT_DIR="${1:-$REPO_ROOT/artifacts/bin/Debug/net10.0/osx-x64}"
-
-if [[ ! -d "$OUT_DIR" ]]; then
-  echo "output directory does not exist: $OUT_DIR (build first?)" >&2
-  exit 2
-fi
-
-WORK_DIR="$(mktemp -d)"
-trap 'rm -rf "$WORK_DIR"' EXIT
-
-echo ">> Downloading MoltenVK $MVK_VERSION..."
-curl -sL -o "$WORK_DIR/mvk.tar" \
-  "https://github.com/KhronosGroup/MoltenVK/releases/download/$MVK_VERSION/MoltenVK-macos.tar"
-tar -xf "$WORK_DIR/mvk.tar" -C "$WORK_DIR" \
-  MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib
-
-DYLIB="$WORK_DIR/MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib"
-file "$DYLIB" | grep -q x86_64 || { echo "downloaded dylib lacks x86_64 slice" >&2; exit 3; }
-
-cp "$DYLIB" "$OUT_DIR/libMoltenVK.dylib"
-cp "$DYLIB" "$OUT_DIR/libvulkan.1.dylib"
-echo ">> Staged libMoltenVK.dylib + libvulkan.1.dylib in $OUT_DIR"

scripts/generate_aerolib_binary.py

@@ -0,0 +1,53 @@
+# Copyright (C) 2026 SharpEmu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+#!/usr/bin/env python3
+
+import struct
+import hashlib
+from base64 import b64encode as base64enc
+from binascii import unhexlify as uhx
+from pathlib import Path
+
+NAMES = 'scripts/ps5_names.txt'
+OUTPUT = 'src/SharpEmu.HLE/Aerolib/aerolib.bin'
+
+def name2nid(name):
+    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 generate():
+    names_path = Path(NAMES)
+    output_path = Path(OUTPUT)
+    
+    entries = []
+    with open(names_path, 'r', encoding='utf-8') as f:
+        for line in f:
+            name = line.strip()
+            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')
+        data.append(len(nid_bytes))
+        data.extend(nid_bytes)
+        data.extend(struct.pack('<H', len(name_bytes)))
+        data.extend(name_bytes)
+    
+    with open(output_path, 'wb') as f:
+        f.write(data)
+    
+    print(f"Generated: {output_path} ({len(data):,} bytes)")
+    print(f"Total entries: {len(entries)}")
+
+if __name__ == "__main__":
+    generate()

scripts/release.py

@@ -1,408 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-from __future__ import annotations
-
-import argparse
-import re
-import subprocess
-import sys
-from pathlib import Path
-
-
-VERSION_PATTERN = re.compile(r"^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$")
-VERSION_ELEMENT_PATTERN = re.compile(
-    r"(<SharpEmuVersion>)([^<]+)(</SharpEmuVersion>)"
-)
-
-
-class ReleaseError(RuntimeError):
-    pass
-
-
-def run_git(
-    *args: str,
-    cwd: Path,
-    capture_output: bool = False,
-) -> str:
-    command = ["git", *args]
-
-    try:
-        result = subprocess.run(
-            command,
-            cwd=cwd,
-            check=True,
-            text=True,
-            capture_output=capture_output,
-        )
-    except FileNotFoundError:
-        raise ReleaseError("Git was not found in PATH.") from None
-    except subprocess.CalledProcessError as error:
-        stderr = error.stderr.strip() if error.stderr else ""
-        detail = f"\n{stderr}" if stderr else ""
-
-        raise ReleaseError(
-            f"Git command failed: {' '.join(command)}{detail}"
-        ) from error
-
-    return result.stdout.strip() if capture_output else ""
-
-
-def find_repository_root(script_path: Path) -> Path:
-    root = run_git(
-        "rev-parse",
-        "--show-toplevel",
-        cwd=script_path.resolve().parent,
-        capture_output=True,
-    )
-
-    return Path(root)
-
-
-def get_status(repository_root: Path) -> str:
-    return run_git(
-        "status",
-        "--porcelain",
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-
-def ensure_clean_worktree(repository_root: Path) -> None:
-    status = get_status(repository_root)
-
-    if status:
-        raise ReleaseError(
-            "The working tree is not clean.\n\n"
-            f"{status}\n\n"
-            "Commit, stash, or remove these changes first."
-        )
-
-
-def get_current_branch(repository_root: Path) -> str:
-    branch = run_git(
-        "branch",
-        "--show-current",
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-    if not branch:
-        raise ReleaseError(
-            "HEAD is detached. Switch to a branch before continuing."
-        )
-
-    return branch
-
-
-def ensure_branch_does_not_exist(
-    repository_root: Path,
-    branch: str,
-    remote: str,
-) -> None:
-    local_branch = run_git(
-        "branch",
-        "--list",
-        branch,
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-    if local_branch:
-        raise ReleaseError(f"Branch {branch} already exists locally.")
-
-    remote_branch = run_git(
-        "ls-remote",
-        "--heads",
-        remote,
-        branch,
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-    if remote_branch:
-        raise ReleaseError(
-            f"Branch {branch} already exists on {remote}."
-        )
-
-
-def ensure_tag_does_not_exist(
-    repository_root: Path,
-    tag: str,
-    remote: str,
-) -> None:
-    local_tag = run_git(
-        "tag",
-        "--list",
-        tag,
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-    if local_tag:
-        raise ReleaseError(f"Tag {tag} already exists locally.")
-
-    remote_tag = run_git(
-        "ls-remote",
-        "--tags",
-        remote,
-        f"refs/tags/{tag}",
-        cwd=repository_root,
-        capture_output=True,
-    )
-
-    if remote_tag:
-        raise ReleaseError(f"Tag {tag} already exists on {remote}.")
-
-
-def read_version(props_path: Path) -> str:
-    if not props_path.exists():
-        raise ReleaseError(f"Version file not found: {props_path}")
-
-    content = props_path.read_text(encoding="utf-8")
-    match = VERSION_ELEMENT_PATTERN.search(content)
-
-    if match is None:
-        raise ReleaseError(
-            f"SharpEmuVersion was not found in {props_path.name}."
-        )
-
-    return match.group(2).strip()
-
-
-def update_version(props_path: Path, version: str) -> str:
-    content = props_path.read_text(encoding="utf-8")
-    current_version = read_version(props_path)
-
-    if current_version == version:
-        raise ReleaseError(
-            f"SharpEmuVersion is already set to {version}."
-        )
-
-    updated_content, replacement_count = VERSION_ELEMENT_PATTERN.subn(
-        rf"\g<1>{version}\g<3>",
-        content,
-        count=1,
-    )
-
-    if replacement_count != 1:
-        raise ReleaseError(
-            "Expected exactly one SharpEmuVersion element."
-        )
-
-    props_path.write_text(
-        updated_content,
-        encoding="utf-8",
-        newline="\n",
-    )
-
-    return current_version
-
-
-def prepare_release(
-    repository_root: Path,
-    props_path: Path,
-    version: str,
-    remote: str,
-) -> None:
-    ensure_clean_worktree(repository_root)
-
-    current_branch = get_current_branch(repository_root)
-
-    if current_branch != "main":
-        raise ReleaseError(
-            f"Prepare must be run from main, not {current_branch}."
-        )
-
-    run_git(
-        "pull",
-        "--ff-only",
-        remote,
-        "main",
-        cwd=repository_root,
-    )
-
-    branch = f"release/{version}"
-    ensure_branch_does_not_exist(
-        repository_root,
-        branch,
-        remote,
-    )
-
-    previous_version = read_version(props_path)
-
-    run_git(
-        "switch",
-        "-c",
-        branch,
-        cwd=repository_root,
-    )
-
-    try:
-        update_version(props_path, version)
-
-        relative_props_path = props_path.relative_to(repository_root)
-
-        run_git(
-            "add",
-            relative_props_path.as_posix(),
-            cwd=repository_root,
-        )
-        run_git(
-            "commit",
-            "-m",
-            f"chore: bump version to {version}",
-            cwd=repository_root,
-        )
-        run_git(
-            "push",
-            "-u",
-            remote,
-            branch,
-            cwd=repository_root,
-        )
-    except Exception:
-        print(
-            "\nPrepare failed. The release branch may still exist locally.",
-            file=sys.stderr,
-        )
-        raise
-
-    print()
-    print(f"Prepared release {previous_version} -> {version}")
-    print(f"Branch pushed: {branch}")
-    print()
-    print("Open a pull request from:")
-    print(f"  {branch}")
-    print("into:")
-    print("  main")
-    print()
-    print("After merging the PR, run:")
-    print(f"  python scripts/release.py tag {version}")
-
-
-def create_release_tag(
-    repository_root: Path,
-    props_path: Path,
-    version: str,
-    remote: str,
-) -> None:
-    ensure_clean_worktree(repository_root)
-
-    current_branch = get_current_branch(repository_root)
-
-    if current_branch != "main":
-        raise ReleaseError(
-            f"Tagging must be run from main, not {current_branch}."
-        )
-
-    run_git(
-        "pull",
-        "--ff-only",
-        remote,
-        "main",
-        cwd=repository_root,
-    )
-
-    current_version = read_version(props_path)
-
-    if current_version != version:
-        raise ReleaseError(
-            "Version mismatch:\n"
-            f"  Directory.Build.props: {current_version}\n"
-            f"  Requested tag:         {version}"
-        )
-
-    tag = f"v{version}"
-
-    ensure_tag_does_not_exist(
-        repository_root,
-        tag,
-        remote,
-    )
-
-    run_git(
-        "tag",
-        "-a",
-        tag,
-        "-m",
-        f"SharpEmu {version}",
-        cwd=repository_root,
-    )
-    run_git(
-        "push",
-        remote,
-        tag,
-        cwd=repository_root,
-    )
-
-    print()
-    print(f"Successfully pushed tag {tag}.")
-    print("The release workflow should start automatically.")
-
-
-def parse_arguments() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(
-        description="Prepare or tag a SharpEmu release."
-    )
-
-    subparsers = parser.add_subparsers(
-        dest="command",
-        required=True,
-    )
-
-    for command in ("prepare", "tag"):
-        subparser = subparsers.add_parser(command)
-        subparser.add_argument(
-            "version",
-            help="Version without the v prefix, e.g. 0.0.2-beta.2.",
-        )
-        subparser.add_argument(
-            "--remote",
-            default="origin",
-            help="Git remote. Default: origin.",
-        )
-
-    arguments = parser.parse_args()
-
-    if not VERSION_PATTERN.fullmatch(arguments.version):
-        parser.error(
-            "Version must look like 0.0.2, "
-            "0.0.2-beta.2, or 0.0.2-rc.1."
-        )
-
-    return arguments
-
-
-def main() -> int:
-    arguments = parse_arguments()
-
-    try:
-        repository_root = find_repository_root(Path(__file__))
-        props_path = repository_root / "Directory.Build.props"
-
-        if arguments.command == "prepare":
-            prepare_release(
-                repository_root,
-                props_path,
-                arguments.version,
-                arguments.remote,
-            )
-        else:
-            create_release_tag(
-                repository_root,
-                props_path,
-                arguments.version,
-                arguments.remote,
-            )
-    except ReleaseError as error:
-        print(f"Error: {error}", file=sys.stderr)
-        return 1
-
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

scripts/test-linux-docker.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# Smoke-tests the linux-x64 build inside an amd64 container. Useful from any
-# host (including Apple Silicon, where Docker runs the amd64 image under
-# emulation) to confirm the cross-platform layer keeps working on Linux.
-#
-# Usage: scripts/test-linux-docker.sh /path/to/eboot.bin
-set -euo pipefail
-
-GAME_PATH="${1:-}"
-if [[ -z "$GAME_PATH" || ! -f "$GAME_PATH" ]]; then
-  echo "usage: $0 <path-to-eboot.bin>" >&2
-  exit 2
-fi
-
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-GAME_DIR="$(cd "$(dirname "$GAME_PATH")" && pwd)"
-GAME_FILE="$(basename "$GAME_PATH")"
-PUBLISH_DIR="$REPO_ROOT/artifacts/publish/SharpEmu.CLI/Debug/net10.0/linux-x64"
-
-echo ">> Publishing linux-x64 self-contained build..."
-dotnet publish "$REPO_ROOT/src/SharpEmu.CLI" \
-  -c Debug -r linux-x64 --self-contained -p:PublishSingleFile=false
-
-echo ">> Running inside linux/amd64 container..."
-docker run --rm --platform linux/amd64 \
-  -v "$PUBLISH_DIR":/app:ro \
-  -v "$GAME_DIR":/game:ro \
-  mcr.microsoft.com/dotnet/runtime-deps:10.0 \
-  /app/SharpEmu --log-level=info "/game/$GAME_FILE"

src/SharpEmu.CLI/SharpEmu.CLI.csproj

@@ -7,41 +7,20 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
   <ItemGroup>
     <ProjectReference Include="..\SharpEmu.Core\SharpEmu.Core.csproj" />
-    <ProjectReference Include="..\SharpEmu.GUI\SharpEmu.GUI.csproj" />
     <ProjectReference Include="..\SharpEmu.Logging\SharpEmu.Logging.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- GUI subsystem so starting without arguments opens the frontend with no
-         console window; CLI mode re-attaches to the parent terminal's console. -->
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <AssemblyName>SharpEmu</AssemblyName>
-    <!-- osx-x64 is the macOS target: the CPU backend executes guest x86-64
-         natively, so on Apple Silicon it runs under Rosetta 2. -->
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Server GC reserves one large heap range per logical processor. On
-         high-core-count hosts those ranges can overlap fixed PS5 image bases
-         before the guest address space is established. Workstation GC avoids
-         that collision and keeps the emulator's required mappings available. -->
-    <ServerGarbageCollection>false</ServerGarbageCollection>
-    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TieredPGO>true</TieredPGO>
-  </PropertyGroup>
-
-  <!-- Background GC's write-watch revisit calls FlushProcessWriteBuffers,
-       which on macOS uses thread_get_register_pointer_values; under Rosetta 2
-       that Mach call can stall indefinitely on threads executing translated
-       guest code, wedging the whole runtime (every allocating thread then
-       blocks behind the never-finishing GC). Non-concurrent GC never takes
-       that path. Windows and Linux keep concurrent GC. -->
-  <PropertyGroup Condition="$([System.String]::Copy('$(RuntimeIdentifier)').StartsWith('osx'))">
-    <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
+    <Version>0.0.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -51,40 +30,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' Or '$(RuntimeIdentifier)' == ''">
-    <ApplicationIcon>..\..\assets\images\SharpEmu.ico</ApplicationIcon>
-    <Win32Icon>..\..\assets\images\SharpEmu.ico</Win32Icon>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-  </PropertyGroup>
-  
   <ItemGroup>
     <Content Include="..\..\LICENSE.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <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
-       library is embedded into the single-file bundle. -->
-  <Target Name="KeepGlfwOutsideSingleFile" AfterTargets="ComputeResolvedFilesToPublishList">
-    <ItemGroup>
-      <_GlfwPublishFiles Include="@(ResolvedFileToPublish)"
-                         Condition="$([System.String]::Copy('%(ResolvedFileToPublish.Filename)').StartsWith('glfw')) Or $([System.String]::Copy('%(ResolvedFileToPublish.Filename)').StartsWith('libglfw'))" />
-      <ResolvedFileToPublish Remove="@(_GlfwPublishFiles)" />
-      <ResolvedFileToPublish Include="@(_GlfwPublishFiles)">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      </ResolvedFileToPublish>
-    </ItemGroup>
-  </Target>
-
 </Project>

src/SharpEmu.CLI/app.manifest

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="SharpEmu" />
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Required by Avalonia NativeControlHost on Windows 10 and 11. -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-</assembly>

src/SharpEmu.CLI/packages.lock.json

@@ -8,105 +8,6 @@
         "resolved": "10.0.3",
         "contentHash": "0B6nZyCHWXnvmlB559oduOspVdNOnpNXPjhpWVMovLPAsDVG7A4jJR9rzECf67JUzxP8/ee/wA8clwIzJcWNFA=="
       },
-      "Avalonia.Angle.Windows.Natives": {
-        "type": "Transitive",
-        "resolved": "2.1.25547.20250602",
-        "contentHash": "ZL0VLc4s9rvNNFt19Pxm5UNAkmKNylugAwJPX9ulXZ6JWs/l6XZihPWWTyezaoNOVyEPU8YbURtW7XMAtqXH5A=="
-      },
-      "Avalonia.BuildServices": {
-        "type": "Transitive",
-        "resolved": "11.3.2",
-        "contentHash": "qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ=="
-      },
-      "Avalonia.FreeDesktop": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "aUwv8BNruRUOaUfMu4U3uibIUS60/rSHgGOhd8zBkLkpxY3JFJvgRbeq5ZzHIyKXCuKi18PO00YHAgCarp3wdw==",
-        "dependencies": {
-          "Avalonia": "11.3.18",
-          "Tmds.DBus.Protocol": "0.21.3"
-        }
-      },
-      "Avalonia.Native": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "8g53DROFW6wVJAnTsE1Iu5bdZO5r0oqxbdbMQODs1QDYCK2IU/y/x/vQVKCYOvqxl4tXkzU9tExv8XqSGPWthQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "Avalonia.Remote.Protocol": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "vw+6ZfgTuu72dA9aVWn6u56t2nrBd5MoMU0wo/qI9XJAl/c0oYYphIvwLvJP1JorubQY4UE3d0ac8ULBhrGBiA=="
-      },
-      "Avalonia.Skia": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "/B4aXmNRNjG8I5U/a1xJI+bIi0XO6DDzS3mBrIKlVnJRY2CyZiUeESRQXLnIU77Z9TvqkUROs+D47s085YjFtA==",
-        "dependencies": {
-          "Avalonia": "11.3.18",
-          "HarfBuzzSharp": "8.3.1.1",
-          "HarfBuzzSharp.NativeAssets.Linux": "8.3.1.1",
-          "HarfBuzzSharp.NativeAssets.WebAssembly": "8.3.1.1",
-          "SkiaSharp": "2.88.9",
-          "SkiaSharp.NativeAssets.Linux": "2.88.9",
-          "SkiaSharp.NativeAssets.WebAssembly": "2.88.9"
-        }
-      },
-      "Avalonia.Win32": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "eioUHkM2PeLPETd1aEks3rvb9plbba6buIrNdrqCpwE/qgHKUjvRNBd5mUQfAbGgTLiAes524gB8uUMDhrsJVQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18",
-          "Avalonia.Angle.Windows.Natives": "2.1.25547.20250602"
-        }
-      },
-      "Avalonia.X11": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "m4Ki/G5Dovnq+6QzfS0iGbK8V77Q6oTjToMLOB0CxPCCrl3Oxywh6kIjuGJDPaN6kopMmjxlNShyQf+vPYL+JA==",
-        "dependencies": {
-          "Avalonia": "11.3.18",
-          "Avalonia.FreeDesktop": "11.3.18",
-          "Avalonia.Skia": "11.3.18"
-        }
-      },
-      "HarfBuzzSharp": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "tLZN66oe/uiRPTZfrCU4i8ScVGwqHNh5MHrXj0yVf4l7Mz0FhTGnQ71RGySROTmdognAs0JtluHkL41pIabWuQ==",
-        "dependencies": {
-          "HarfBuzzSharp.NativeAssets.Win32": "8.3.1.1",
-          "HarfBuzzSharp.NativeAssets.macOS": "8.3.1.1"
-        }
-      },
-      "HarfBuzzSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
-      },
-      "HarfBuzzSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
-      },
-      "HarfBuzzSharp.NativeAssets.WebAssembly": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "loJweK2u/mH/3C2zBa0ggJlITIszOkK64HLAZB7FUT670dTg965whLFYHDQo69NmC4+d9UN0icLC9VHidXaVCA=="
-      },
-      "HarfBuzzSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
-      },
-      "MicroCom.Runtime": {
-        "type": "Transitive",
-        "resolved": "0.11.0",
-        "contentHash": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA=="
-      },
       "Microsoft.DotNet.PlatformAbstractions": {
         "type": "Transitive",
         "resolved": "3.1.6",
@@ -135,23 +36,6 @@
           "Ultz.Native.GLFW": "3.4.0"
         }
       },
-      "Silk.NET.Input.Common": {
-        "type": "Transitive",
-        "resolved": "2.23.0",
-        "contentHash": "QbJVV7kFBHEByayXCYdJtXXI9Sp4a+QAf0IdGV6uCWkFYcEmqBYW3aaNGvFOdSwTBDbHL5T/OtOCrGh4qYhk7A==",
-        "dependencies": {
-          "Silk.NET.Windowing.Common": "2.23.0"
-        }
-      },
-      "Silk.NET.Input.Glfw": {
-        "type": "Transitive",
-        "resolved": "2.23.0",
-        "contentHash": "KGHYqsv/IQRJtD6dloYh2tN4CkaM40vxM2kj0cGKBoCQiBDYHHhJiyDTyMPx0W7Fz5IgnhnG42ELmIAa0DH69A==",
-        "dependencies": {
-          "Silk.NET.Input.Common": "2.23.0",
-          "Silk.NET.Windowing.Glfw": "2.23.0"
-        }
-      },
       "Silk.NET.Maths": {
         "type": "Transitive",
         "resolved": "2.23.0",
@@ -175,38 +59,6 @@
           "Silk.NET.Windowing.Common": "2.23.0"
         }
       },
-      "SkiaSharp": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "3MD5VHjXXieSHCleRLuaTXmL2pD0mB7CcOB1x2kA1I4bhptf4e3R27iM93264ZYuAq6mkUyX5XbcxnZvMJYc1Q==",
-        "dependencies": {
-          "SkiaSharp.NativeAssets.Win32": "2.88.9",
-          "SkiaSharp.NativeAssets.macOS": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==",
-        "dependencies": {
-          "SkiaSharp": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
-      },
-      "SkiaSharp.NativeAssets.WebAssembly": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "kt06RccBHSnAs2wDYdBSfsjIDbY3EpsOVqnlDgKdgvyuRA8ZFDaHRdWNx1VHjGgYzmnFCGiTJBnXFl5BqGwGnA=="
-      },
-      "SkiaSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
-      },
       "Ultz.Native.GLFW": {
         "type": "Transitive",
         "resolved": "3.4.0",
@@ -216,39 +68,19 @@
         "type": "Project",
         "dependencies": {
           "Iced": "[1.21.0, )",
-          "SharpEmu.HLE": "[0.0.2-beta.2, )",
-          "SharpEmu.Libs": "[0.0.2-beta.2, )",
-          "SharpEmu.Logging": "[0.0.2-beta.2, )"
-        }
-      },
-      "sharpemu.gui": {
-        "type": "Project",
-        "dependencies": {
-          "Avalonia": "[11.3.18, )",
-          "Avalonia.Desktop": "[11.3.18, )",
-          "Avalonia.Fonts.Inter": "[11.3.18, )",
-          "Avalonia.Themes.Fluent": "[11.3.18, )",
-          "SharpEmu.Core": "[0.0.2-beta.2, )",
-          "SharpEmu.Libs": "[0.0.2-beta.2, )",
-          "SharpEmu.Logging": "[0.0.2-beta.2, )",
-          "Tmds.DBus.Protocol": "[0.21.3, )"
+          "SharpEmu.HLE": "[1.0.0, )",
+          "SharpEmu.Libs": "[1.0.0, )",
+          "SharpEmu.Logging": "[1.0.0, )"
         }
       },
       "sharpemu.hle": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.Logging": "[0.0.2-beta.2, )"
-        }
+        "type": "Project"
       },
       "sharpemu.libs": {
         "type": "Project",
         "dependencies": {
-          "SharpEmu.HLE": "[0.0.2-beta.2, )",
-          "SharpEmu.ShaderCompiler": "[0.0.2-beta.2, )",
-          "SharpEmu.ShaderCompiler.Vulkan": "[0.0.2-beta.2, )",
-          "Silk.NET.Input": "[2.23.0, )",
+          "SharpEmu.HLE": "[1.0.0, )",
           "Silk.NET.Vulkan": "[2.23.0, )",
-          "Silk.NET.Vulkan.Extensions.EXT": "[2.23.0, )",
           "Silk.NET.Vulkan.Extensions.KHR": "[2.23.0, )",
           "Silk.NET.Windowing": "[2.23.0, )"
         }
@@ -256,76 +88,12 @@
       "sharpemu.logging": {
         "type": "Project"
       },
-      "sharpemu.shadercompiler": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.HLE": "[0.0.2-beta.2, )"
-        }
-      },
-      "sharpemu.shadercompiler.vulkan": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.ShaderCompiler": "[0.0.2-beta.2, )"
-        }
-      },
-      "Avalonia": {
-        "type": "CentralTransitive",
-        "requested": "[11.3.18, )",
-        "resolved": "11.3.18",
-        "contentHash": "2C4UxhWUObWGgYKWic1x5BMMWGJP6SElb91WeOxs+X/iR26rtkqpxFFwwo50FXS9AyYnHfk8QKXDEfe7oT/kZA==",
-        "dependencies": {
-          "Avalonia.BuildServices": "11.3.2",
-          "Avalonia.Remote.Protocol": "11.3.18",
-          "MicroCom.Runtime": "0.11.0"
-        }
-      },
-      "Avalonia.Desktop": {
-        "type": "CentralTransitive",
-        "requested": "[11.3.18, )",
-        "resolved": "11.3.18",
-        "contentHash": "bilMPa5vYiis6fbNovb6esKytBnOCEGojBa1XFegLCRHCP6g6PvZwS0XF/YOAGkENRlHG8dI7lohOpQ9bIkq1g==",
-        "dependencies": {
-          "Avalonia": "11.3.18",
-          "Avalonia.Native": "11.3.18",
-          "Avalonia.Skia": "11.3.18",
-          "Avalonia.Win32": "11.3.18",
-          "Avalonia.X11": "11.3.18"
-        }
-      },
-      "Avalonia.Fonts.Inter": {
-        "type": "CentralTransitive",
-        "requested": "[11.3.18, )",
-        "resolved": "11.3.18",
-        "contentHash": "27u6hB3Y2Ue586yjfeVakberY73VNQXtuKwe/P927XG1QPlhsfmOyifLHDDpSHG85Zl1x/Xv9IZ3+tk9FnjcZQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "Avalonia.Themes.Fluent": {
-        "type": "CentralTransitive",
-        "requested": "[11.3.18, )",
-        "resolved": "11.3.18",
-        "contentHash": "+Q/TJoynD0zNuu5w2gD+xcTl7GNKJFxlPYAndRLs/mTDrNbbsvv/271WyIysbMPsXSjCyBDp7RCZzQkpD6x5Bg==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
       "Iced": {
         "type": "CentralTransitive",
         "requested": "[1.21.0, )",
         "resolved": "1.21.0",
         "contentHash": "dv5+81Q1TBQvVMSOOOmRcjJmvWcX3BZPZsIq31+RLc5cNft0IHAyNlkdb7ZarOWG913PyBoFDsDXoCIlKmLclg=="
       },
-      "Silk.NET.Input": {
-        "type": "CentralTransitive",
-        "requested": "[2.23.0, )",
-        "resolved": "2.23.0",
-        "contentHash": "Xzl+tVwAp2eEd8blmGQjmJrsZPnp3PWG0KJjiAQHaY2Zr/ELVWeAROKXmZdCAvexzmte2JVGEy/dxnMycbxlpg==",
-        "dependencies": {
-          "Silk.NET.Input.Common": "2.23.0",
-          "Silk.NET.Input.Glfw": "2.23.0"
-        }
-      },
       "Silk.NET.Vulkan": {
         "type": "CentralTransitive",
         "requested": "[2.23.0, )",
@@ -335,16 +103,6 @@
           "Silk.NET.Core": "2.23.0"
         }
       },
-      "Silk.NET.Vulkan.Extensions.EXT": {
-        "type": "CentralTransitive",
-        "requested": "[2.23.0, )",
-        "resolved": "2.23.0",
-        "contentHash": "+Oth189ksRiL6HvGCwIdnsYHawqrbO8y49u1H61z3wsfcHhQZeVDYe/wF5LD7fk3NcdgDvwFD3mLm1QWhdZySw==",
-        "dependencies": {
-          "Silk.NET.Core": "2.23.0",
-          "Silk.NET.Vulkan": "2.23.0"
-        }
-      },
       "Silk.NET.Vulkan.Extensions.KHR": {
         "type": "CentralTransitive",
         "requested": "[2.23.0, )",
@@ -364,61 +122,9 @@
           "Silk.NET.Windowing.Common": "2.23.0",
           "Silk.NET.Windowing.Glfw": "2.23.0"
         }
-      },
-      "Tmds.DBus.Protocol": {
-        "type": "CentralTransitive",
-        "requested": "[0.21.3, )",
-        "resolved": "0.21.3",
-        "contentHash": "hDwB8WsQoyALQKqIbwzS68UKdlnafDm4T/DkO/JrA/YIneP/rKv96SxYPVXeh3FP4i/SXfShrYftKLtciJAIlw=="
       }
     },
     "net10.0/linux-x64": {
-      "Avalonia.Angle.Windows.Natives": {
-        "type": "Transitive",
-        "resolved": "2.1.25547.20250602",
-        "contentHash": "ZL0VLc4s9rvNNFt19Pxm5UNAkmKNylugAwJPX9ulXZ6JWs/l6XZihPWWTyezaoNOVyEPU8YbURtW7XMAtqXH5A=="
-      },
-      "Avalonia.Native": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "8g53DROFW6wVJAnTsE1Iu5bdZO5r0oqxbdbMQODs1QDYCK2IU/y/x/vQVKCYOvqxl4tXkzU9tExv8XqSGPWthQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "HarfBuzzSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
-      },
-      "HarfBuzzSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
-      },
-      "HarfBuzzSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
-      },
-      "SkiaSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==",
-        "dependencies": {
-          "SkiaSharp": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
-      },
-      "SkiaSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
-      },
       "Ultz.Native.GLFW": {
         "type": "Transitive",
         "resolved": "3.4.0",
@@ -426,105 +132,6 @@
       }
     },
     "net10.0/osx-arm64": {
-      "Avalonia.Angle.Windows.Natives": {
-        "type": "Transitive",
-        "resolved": "2.1.25547.20250602",
-        "contentHash": "ZL0VLc4s9rvNNFt19Pxm5UNAkmKNylugAwJPX9ulXZ6JWs/l6XZihPWWTyezaoNOVyEPU8YbURtW7XMAtqXH5A=="
-      },
-      "Avalonia.Native": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "8g53DROFW6wVJAnTsE1Iu5bdZO5r0oqxbdbMQODs1QDYCK2IU/y/x/vQVKCYOvqxl4tXkzU9tExv8XqSGPWthQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "HarfBuzzSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
-      },
-      "HarfBuzzSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
-      },
-      "HarfBuzzSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
-      },
-      "SkiaSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==",
-        "dependencies": {
-          "SkiaSharp": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
-      },
-      "SkiaSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
-      },
-      "Ultz.Native.GLFW": {
-        "type": "Transitive",
-        "resolved": "3.4.0",
-        "contentHash": "Iy22JopynbOJ32vA0lBhFEzGi65GQJBuJHYBYRBpydrDpNoTiHnjIXfA65Gu+8qsOr/ZEoIF8r9aHCgAXuO6DA=="
-      }
-    },
-    "net10.0/osx-x64": {
-      "Avalonia.Angle.Windows.Natives": {
-        "type": "Transitive",
-        "resolved": "2.1.25547.20250602",
-        "contentHash": "ZL0VLc4s9rvNNFt19Pxm5UNAkmKNylugAwJPX9ulXZ6JWs/l6XZihPWWTyezaoNOVyEPU8YbURtW7XMAtqXH5A=="
-      },
-      "Avalonia.Native": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "8g53DROFW6wVJAnTsE1Iu5bdZO5r0oqxbdbMQODs1QDYCK2IU/y/x/vQVKCYOvqxl4tXkzU9tExv8XqSGPWthQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "HarfBuzzSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
-      },
-      "HarfBuzzSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
-      },
-      "HarfBuzzSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
-      },
-      "SkiaSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==",
-        "dependencies": {
-          "SkiaSharp": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
-      },
-      "SkiaSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
-      },
       "Ultz.Native.GLFW": {
         "type": "Transitive",
         "resolved": "3.4.0",
@@ -532,52 +139,6 @@
       }
     },
     "net10.0/win-x64": {
-      "Avalonia.Angle.Windows.Natives": {
-        "type": "Transitive",
-        "resolved": "2.1.25547.20250602",
-        "contentHash": "ZL0VLc4s9rvNNFt19Pxm5UNAkmKNylugAwJPX9ulXZ6JWs/l6XZihPWWTyezaoNOVyEPU8YbURtW7XMAtqXH5A=="
-      },
-      "Avalonia.Native": {
-        "type": "Transitive",
-        "resolved": "11.3.18",
-        "contentHash": "8g53DROFW6wVJAnTsE1Iu5bdZO5r0oqxbdbMQODs1QDYCK2IU/y/x/vQVKCYOvqxl4tXkzU9tExv8XqSGPWthQ==",
-        "dependencies": {
-          "Avalonia": "11.3.18"
-        }
-      },
-      "HarfBuzzSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "3EZ1mpIiKWRLL5hUYA82ZHteeDIVaEA/Z0rA/wU6tjx6crcAkJnBPwDXZugBSfo8+J3EznvRJf49uMsqYfKrHg=="
-      },
-      "HarfBuzzSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "jbtCsgftcaFLCA13tVKo5iWdElJScrulLTKJre36O4YQTIlwDtPPqhRZNk+Y0vv4D1gxbscasGRucUDfS44ofQ=="
-      },
-      "HarfBuzzSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "8.3.1.1",
-        "contentHash": "UsJtQsfAJoFDZrXc4hCUfRPMqccfKZ0iumJ/upcUjz/cmsTgVFGNEL5yaJWmkqsuFYdMWbj/En5/kS4PFl9hBA=="
-      },
-      "SkiaSharp.NativeAssets.Linux": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==",
-        "dependencies": {
-          "SkiaSharp": "2.88.9"
-        }
-      },
-      "SkiaSharp.NativeAssets.macOS": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA=="
-      },
-      "SkiaSharp.NativeAssets.Win32": {
-        "type": "Transitive",
-        "resolved": "2.88.9",
-        "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w=="
-      },
       "Ultz.Native.GLFW": {
         "type": "Transitive",
         "resolved": "3.4.0",

src/SharpEmu.Core/Cpu/CpuDispatcher.cs

@@ -18,22 +18,15 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
         ModuleInitializer,
     }
 
-    // The top of the x86-64 user address space (0x7FFD..0x7FFF) is only
-    // freely mappable on Windows; on macOS/Linux it hosts the dyld shared
-    // cache / vdso and (under Rosetta 2) the translator runtime, so POSIX
-    // hosts use the equivalent layout one slot lower at 0x6FFx.
-    private static readonly ulong StackBaseAddress = OperatingSystem.IsWindows() ? 0x7FFF_F000_0000UL : 0x6FFF_F000_0000UL;
+    private const ulong StackBaseAddress = 0x7FFF_F000_0000UL;
     private const ulong StackSize = 0x0020_0000UL;
-    private static readonly ulong TlsBaseAddress = OperatingSystem.IsWindows() ? 0x7FFE_0000_0000UL : 0x6FFE_0000_0000UL;
+    private const ulong TlsBaseAddress = 0x7FFE_0000_0000UL;
     private const ulong TlsSize = 0x0001_0000UL;
-    // The static TLS blocks live at negative offsets from the TCB (FreeBSD
-    // amd64 variant II). Keep every host in sync with GuestTlsTemplate's
-    // startup reservation; PS5 modules routinely reach beyond one host page.
-    private const ulong TlsPrefixSize = GuestTlsTemplate.StartupStaticTlsReservation;
-    private static readonly ulong BootstrapStubBaseAddress = OperatingSystem.IsWindows() ? 0x7FFD_F000_0000UL : 0x6FFD_F000_0000UL;
-    private static readonly ulong BootstrapPayloadBaseAddress = OperatingSystem.IsWindows() ? 0x7FFD_E000_0000UL : 0x6FFD_E000_0000UL;
-    private static readonly ulong DynlibFallbackStubBaseAddress = OperatingSystem.IsWindows() ? 0x7FFD_D000_0000UL : 0x6FFD_D000_0000UL;
-    private static readonly ulong ReturnToHostStubBaseAddress = OperatingSystem.IsWindows() ? 0x7FFD_C000_0000UL : 0x6FFD_C000_0000UL;
+    private const ulong TlsPrefixSize = 0x0000_1000UL;
+    private const ulong BootstrapStubBaseAddress = 0x7FFD_F000_0000UL;
+    private const ulong BootstrapPayloadBaseAddress = 0x7FFD_E000_0000UL;
+    private const ulong DynlibFallbackStubBaseAddress = 0x7FFD_D000_0000UL;
+    private const ulong ReturnToHostStubBaseAddress = 0x7FFD_C000_0000UL;
     private const ulong BootstrapRegionSize = 0x0000_1000UL;
     private const ulong ReturnToHostStubStride = 0x0100_0000UL;
     private const ulong BootstrapPayloadResultOffset = 0x28UL;
@@ -372,19 +365,11 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
 
     private static bool InitializeTls(CpuContext context, ulong tlsBase)
     {
-        if (!context.TryWriteUInt64(tlsBase - 0xF0, 0) ||
-            !context.TryWriteUInt64(tlsBase + 0x00, tlsBase) ||
-            !context.TryWriteUInt64(tlsBase + 0x10, tlsBase) ||
-            !context.TryWriteUInt64(tlsBase + 0x28, 0xC0DEC0DECAFEBA00UL) ||
-            !context.TryWriteUInt64(tlsBase + 0x60, tlsBase))
-        {
-            return false;
-        }
-
-        // Seed the static TLS block below the thread pointer with the main
-        // module's initialized thread-locals (variant II layout).
-        SharpEmu.HLE.GuestTlsTemplate.SeedThreadBlock(context, tlsBase);
-        return true;
+        return context.TryWriteUInt64(tlsBase - 0xF0, 0) &&
+               context.TryWriteUInt64(tlsBase + 0x00, tlsBase) &&
+               context.TryWriteUInt64(tlsBase + 0x10, tlsBase) &&
+               context.TryWriteUInt64(tlsBase + 0x28, 0xC0DEC0DECAFEBABEUL) &&
+               context.TryWriteUInt64(tlsBase + 0x60, tlsBase);
     }
 
     private static bool InitializeGuestFrameChainSentinel(CpuContext context)
@@ -410,52 +395,33 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
         ulong programExitHandlerAddress)
     {
         var imageName = string.IsNullOrWhiteSpace(processImageName) ? "eboot.bin" : processImageName;
-        var arguments = new List<string>(3) { imageName };
-        var configuredArguments = Environment.GetEnvironmentVariable("SHARPEMU_GUEST_ARGS");
-        if (!string.IsNullOrWhiteSpace(configuredArguments))
-        {
-            // The PS5 entry-parameter ABI exposes three inline argv pointers.
-            // Two compatibility arguments are therefore safe without changing
-            // the fixed 0x20-byte structure expected by existing titles.
-            var compatibilityArguments = configuredArguments.Split(
-                (char[]?)null,
-                StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-            arguments.AddRange(compatibilityArguments.Take(2));
-        }
-
-        var cursor = context[CpuRegister.Rsp];
-        var argumentAddresses = new ulong[arguments.Count];
-        for (var index = arguments.Count - 1; index >= 0; index--)
-        {
-            var encoded = Encoding.UTF8.GetBytes(arguments[index] + '\0');
-            cursor = AlignDown(cursor - (ulong)encoded.Length, 16);
-            if (!context.Memory.TryWrite(cursor, encoded))
-            {
-                return false;
-            }
-
-            argumentAddresses[index] = cursor;
-        }
-
-        const ulong entryParamsSize = 0x20;
-        var entryParamsAddress = AlignDown(cursor - entryParamsSize, 16);
-        if (!TryWriteUInt32(context, entryParamsAddress + 0x00, (uint)arguments.Count) ||
-            !TryWriteUInt32(context, entryParamsAddress + 0x04, 0) ||
-            !context.TryWriteUInt64(entryParamsAddress + 0x08, argumentAddresses[0]) ||
-            !context.TryWriteUInt64(
-                entryParamsAddress + 0x10,
-                argumentAddresses.Length > 1 ? argumentAddresses[1] : 0) ||
-            !context.TryWriteUInt64(
-                entryParamsAddress + 0x18,
-                argumentAddresses.Length > 2 ? argumentAddresses[2] : 0))
+        var encodedNameLength = Encoding.UTF8.GetByteCount(imageName);
+        Span<byte> argv0Buffer = encodedNameLength + 1 <= 512
+            ? stackalloc byte[encodedNameLength + 1]
+            : new byte[encodedNameLength + 1];
+        if (Encoding.UTF8.GetBytes(imageName.AsSpan(), argv0Buffer) != encodedNameLength)
         {
             return false;
         }
 
-        if (arguments.Count > 1)
+        argv0Buffer[encodedNameLength] = 0;
+        var cursor = context[CpuRegister.Rsp];
+
+        var argv0Address = AlignDown(cursor - (ulong)argv0Buffer.Length, 16);
+        if (!context.Memory.TryWrite(argv0Address, argv0Buffer))
         {
-            Console.Error.WriteLine(
-                $"[DISPATCHER] Guest arguments: {string.Join(' ', arguments.Skip(1))}");
+            return false;
+        }
+
+        const ulong entryParamsSize = 0x20;
+        var entryParamsAddress = AlignDown(argv0Address - entryParamsSize, 16);
+        if (!TryWriteUInt32(context, entryParamsAddress + 0x00, 1) ||
+            !TryWriteUInt32(context, entryParamsAddress + 0x04, 0) ||
+            !context.TryWriteUInt64(entryParamsAddress + 0x08, argv0Address) ||
+            !context.TryWriteUInt64(entryParamsAddress + 0x10, 0) ||
+            !context.TryWriteUInt64(entryParamsAddress + 0x18, 0))
+        {
+            return false;
         }
 
         var entryStackPointer = entryParamsAddress - sizeof(ulong);
@@ -693,13 +659,6 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
         return _virtualMemory.TryWrite(address, buffer);
     }
 
-    /// <summary>
-    /// True when the disposed native backend left its session state alive
-    /// because guest workers were still executing guest code. The guest
-    /// address space must then stay mapped as well.
-    /// </summary>
-    internal bool NativeSessionLeaked { get; private set; }
-
     public void Dispose()
     {
         if (_nativeCpuBackend is IDisposable disposableBackend)
@@ -707,7 +666,6 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
             disposableBackend.Dispose();
         }
 
-        NativeSessionLeaked = _nativeCpuBackend is DirectExecutionBackend { GuestSessionLeaked: true };
         _nativeCpuBackend = null;
     }
 }

src/SharpEmu.Core/Cpu/Emulation/BmiInstructionEmulator.cs

@@ -1,305 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Numerics;
-
-namespace SharpEmu.Core.Cpu.Emulation;
-
-/// <summary>
-/// Pure software implementations of the BMI1, BMI2 and ABM general-purpose-register
-/// bit-manipulation instructions.
-///
-/// The direct-execution backend runs guest PS5 code natively on the host CPU. The PS5's
-/// Zen 2 cores implement BMI1/BMI2/ABM, but a host CPU that predates those extensions raises
-/// #UD (STATUS_ILLEGAL_INSTRUCTION) when it meets one of these opcodes. This class provides the
-/// register-only arithmetic so the exception handler can finish the instruction in software and
-/// resume, instead of aborting the title.
-///
-/// The methods deliberately operate on plain integers rather than on the OS CONTEXT record so the
-/// semantics can be unit-tested in isolation; the unsafe register/memory plumbing lives in the
-/// backend adapter. Each method returns the result already masked to the operand width and, where
-/// the instruction is defined to touch flags, updates <paramref name="eflags"/> in place. Flags
-/// documented as "undefined" by the vendor manuals are left untouched so behaviour stays
-/// deterministic across hosts.
-/// </summary>
-public static class BmiInstructionEmulator
-{
-    private const uint FlagCarry = 1u << 0;
-    private const uint FlagZero = 1u << 6;
-    private const uint FlagSign = 1u << 7;
-    private const uint FlagOverflow = 1u << 11;
-
-    private static ulong WidthMask(GprOperandSize size) =>
-        size == GprOperandSize.Bits64 ? ulong.MaxValue : 0xFFFF_FFFFUL;
-
-    private static int WidthBits(GprOperandSize size) => (int)size;
-
-    private static bool SignSet(ulong value, GprOperandSize size) =>
-        size == GprOperandSize.Bits64 ? (value >> 63) != 0 : (value & 0x8000_0000UL) != 0;
-
-    private static uint WithFlag(uint eflags, uint flag, bool set) =>
-        set ? eflags | flag : eflags & ~flag;
-
-    // Applies the CF/ZF/SF/OF set shared by ANDN/BLS*/BZHI: OF is always cleared, ZF and SF follow
-    // the result, and the caller supplies CF because each instruction defines it differently.
-    private static uint ApplyLogicFlags(uint eflags, ulong result, GprOperandSize size, bool carry)
-    {
-        eflags = WithFlag(eflags, FlagCarry, carry);
-        eflags = WithFlag(eflags, FlagZero, result == 0);
-        eflags = WithFlag(eflags, FlagSign, SignSet(result, size));
-        eflags = WithFlag(eflags, FlagOverflow, false);
-        return eflags;
-    }
-
-    /// <summary>ANDN: <c>dest = (~src1) &amp; src2</c>. CF and OF are cleared.</summary>
-    public static ulong Andn(ulong src1, ulong src2, GprOperandSize size, ref uint eflags)
-    {
-        var result = (~src1 & src2) & WidthMask(size);
-        eflags = ApplyLogicFlags(eflags, result, size, carry: false);
-        return result;
-    }
-
-    /// <summary>BLSI: isolate the lowest set bit, <c>dest = (-src) &amp; src</c>. CF = (src != 0).</summary>
-    public static ulong Blsi(ulong src, GprOperandSize size, ref uint eflags)
-    {
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var result = ((0UL - s) & s) & mask;
-        eflags = ApplyLogicFlags(eflags, result, size, carry: s != 0);
-        return result;
-    }
-
-    /// <summary>BLSMSK: mask up to and including the lowest set bit, <c>dest = (src - 1) ^ src</c>. CF = (src == 0).</summary>
-    public static ulong Blsmsk(ulong src, GprOperandSize size, ref uint eflags)
-    {
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var result = ((s - 1) ^ s) & mask;
-        eflags = ApplyLogicFlags(eflags, result, size, carry: s == 0);
-        return result;
-    }
-
-    /// <summary>BLSR: reset the lowest set bit, <c>dest = (src - 1) &amp; src</c>. CF = (src == 0).</summary>
-    public static ulong Blsr(ulong src, GprOperandSize size, ref uint eflags)
-    {
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var result = ((s - 1) & s) & mask;
-        eflags = ApplyLogicFlags(eflags, result, size, carry: s == 0);
-        return result;
-    }
-
-    /// <summary>
-    /// BEXTR: extract <c>len</c> bits of <paramref name="src"/> starting at bit <c>start</c>, where
-    /// start = control[7:0] and len = control[15:8]. Only ZF (per result) and cleared CF/OF are defined.
-    /// </summary>
-    public static ulong Bextr(ulong src, ulong control, GprOperandSize size, ref uint eflags)
-    {
-        var bits = WidthBits(size);
-        var start = (int)(control & 0xFF);
-        var length = (int)((control >> 8) & 0xFF);
-
-        ulong result;
-        if (start >= bits)
-        {
-            result = 0;
-        }
-        else
-        {
-            var shifted = (src & WidthMask(size)) >> start;
-            if (length == 0)
-            {
-                result = 0;
-            }
-            else if (length >= bits)
-            {
-                result = shifted;
-            }
-            else
-            {
-                result = shifted & ((1UL << length) - 1);
-            }
-        }
-
-        result &= WidthMask(size);
-        eflags = WithFlag(eflags, FlagZero, result == 0);
-        eflags = WithFlag(eflags, FlagCarry, false);
-        eflags = WithFlag(eflags, FlagOverflow, false);
-        return result;
-    }
-
-    /// <summary>
-    /// BZHI: zero the bits of <paramref name="src"/> from bit position <c>index[7:0]</c> upward.
-    /// CF is set when the requested position is at or beyond the operand width.
-    /// </summary>
-    public static ulong Bzhi(ulong src, ulong index, GprOperandSize size, ref uint eflags)
-    {
-        var bits = WidthBits(size);
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var n = (int)(index & 0xFF);
-
-        ulong result;
-        bool carry;
-        if (n >= bits)
-        {
-            result = s;
-            carry = true;
-        }
-        else
-        {
-            result = s & ((1UL << n) - 1);
-            carry = false;
-        }
-
-        eflags = ApplyLogicFlags(eflags, result, size, carry);
-        return result;
-    }
-
-    /// <summary>TZCNT: count trailing zero bits. If src == 0 the result is the operand width and CF is set.</summary>
-    public static ulong Tzcnt(ulong src, GprOperandSize size, ref uint eflags)
-    {
-        var bits = WidthBits(size);
-        var s = src & WidthMask(size);
-
-        ulong result;
-        bool carry;
-        if (s == 0)
-        {
-            result = (ulong)bits;
-            carry = true;
-        }
-        else
-        {
-            result = (ulong)(size == GprOperandSize.Bits64
-                ? BitOperations.TrailingZeroCount(s)
-                : BitOperations.TrailingZeroCount((uint)s));
-            carry = false;
-        }
-
-        eflags = WithFlag(eflags, FlagCarry, carry);
-        eflags = WithFlag(eflags, FlagZero, result == 0);
-        return result;
-    }
-
-    /// <summary>LZCNT: count leading zero bits. If src == 0 the result is the operand width and CF is set.</summary>
-    public static ulong Lzcnt(ulong src, GprOperandSize size, ref uint eflags)
-    {
-        var bits = WidthBits(size);
-        var s = src & WidthMask(size);
-
-        ulong result;
-        bool carry;
-        if (s == 0)
-        {
-            result = (ulong)bits;
-            carry = true;
-        }
-        else
-        {
-            result = (ulong)(size == GprOperandSize.Bits64
-                ? BitOperations.LeadingZeroCount(s)
-                : BitOperations.LeadingZeroCount((uint)s));
-            carry = false;
-        }
-
-        eflags = WithFlag(eflags, FlagCarry, carry);
-        eflags = WithFlag(eflags, FlagZero, result == 0);
-        return result;
-    }
-
-    /// <summary>RORX: rotate <paramref name="src"/> right by <paramref name="count"/> (masked to the operand width). No flags.</summary>
-    public static ulong Rorx(ulong src, int count, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var rotate = count & (bits - 1);
-        if (rotate == 0)
-        {
-            return s;
-        }
-
-        return ((s >> rotate) | (s << (bits - rotate))) & mask;
-    }
-
-    /// <summary>SARX: arithmetic shift right by <paramref name="count"/> (masked to the operand width). No flags.</summary>
-    public static ulong Sarx(ulong src, int count, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var mask = WidthMask(size);
-        var shift = count & (bits - 1);
-        if (size == GprOperandSize.Bits64)
-        {
-            return (ulong)((long)src >> shift);
-        }
-
-        return (ulong)(uint)((int)(uint)src >> shift) & mask;
-    }
-
-    /// <summary>SHLX: logical shift left by <paramref name="count"/> (masked to the operand width). No flags.</summary>
-    public static ulong Shlx(ulong src, int count, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var mask = WidthMask(size);
-        var shift = count & (bits - 1);
-        return (src << shift) & mask;
-    }
-
-    /// <summary>SHRX: logical shift right by <paramref name="count"/> (masked to the operand width). No flags.</summary>
-    public static ulong Shrx(ulong src, int count, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var mask = WidthMask(size);
-        var s = src & mask;
-        var shift = count & (bits - 1);
-        return s >> shift;
-    }
-
-    /// <summary>PDEP: deposit contiguous low bits of <paramref name="src"/> into the positions selected by <paramref name="mask"/>. No flags.</summary>
-    public static ulong Pdep(ulong src, ulong mask, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var selector = mask & WidthMask(size);
-        ulong result = 0;
-        var bit = 0;
-        for (var i = 0; i < bits; i++)
-        {
-            var position = 1UL << i;
-            if ((selector & position) != 0)
-            {
-                if (((src >> bit) & 1UL) != 0)
-                {
-                    result |= position;
-                }
-
-                bit++;
-            }
-        }
-
-        return result & WidthMask(size);
-    }
-
-    /// <summary>PEXT: gather the bits of <paramref name="src"/> selected by <paramref name="mask"/> into contiguous low bits. No flags.</summary>
-    public static ulong Pext(ulong src, ulong mask, GprOperandSize size)
-    {
-        var bits = WidthBits(size);
-        var selector = mask & WidthMask(size);
-        ulong result = 0;
-        var bit = 0;
-        for (var i = 0; i < bits; i++)
-        {
-            if ((selector & (1UL << i)) != 0)
-            {
-                if (((src >> i) & 1UL) != 0)
-                {
-                    result |= 1UL << bit;
-                }
-
-                bit++;
-            }
-        }
-
-        return result & WidthMask(size);
-    }
-}

src/SharpEmu.Core/Cpu/Emulation/GprOperandSize.cs

@@ -1,14 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Core.Cpu.Emulation;
-
-/// <summary>
-/// Operand width for the emulated general-purpose-register instructions. The numeric value is the
-/// bit width, so it can double as the "count leading/trailing zeros of an all-zero source" result.
-/// </summary>
-public enum GprOperandSize
-{
-    Bits32 = 32,
-    Bits64 = 64,
-}

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

@@ -7,9 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
-using SharpEmu.Core.Cpu.Disasm;
 using SharpEmu.HLE;
-using SharpEmu.Logging;
 
 namespace SharpEmu.Core.Cpu.Native;
 
@@ -17,55 +15,6 @@ public sealed partial class DirectExecutionBackend
 {
 	private static readonly ConcurrentDictionary<ulong, byte> _knownExecutablePages = new();
 
-	private static readonly bool _perfHleHistogram =
-		string.Equals(System.Environment.GetEnvironmentVariable("SHARPEMU_PERF_HLE"), "1", System.StringComparison.Ordinal);
-	private static readonly System.Collections.Concurrent.ConcurrentDictionary<string, long> _perfHleCounts = new();
-	private static long _perfHleTotal;
-	private static long _perfHleDispatchTicks;
-
-	private static void RecordPerfHleDispatchTime(long ticks)
-	{
-		var total = System.Threading.Interlocked.Add(ref _perfHleDispatchTicks, ticks);
-		var calls = System.Threading.Interlocked.Read(ref _perfHleTotal);
-		if (calls > 0 && calls % 500000 == 0)
-		{
-			var avgUs = (double)total / System.Diagnostics.Stopwatch.Frequency * 1_000_000.0 / calls;
-			System.Console.Error.WriteLine($"[PERF][HLE] managed_dispatch_avg={avgUs:F3}us total_managed_s={(double)total / System.Diagnostics.Stopwatch.Frequency:F2}");
-		}
-	}
-
-	private static readonly bool _perfHleNoDict =
-		string.Equals(System.Environment.GetEnvironmentVariable("SHARPEMU_PERF_HLE_NODICT"), "1", System.StringComparison.Ordinal);
-
-	private static void RecordPerfHleCall(string name)
-	{
-		var total = System.Threading.Interlocked.Increment(ref _perfHleTotal);
-		if (!_perfHleNoDict)
-		{
-			_perfHleCounts.AddOrUpdate(name, 1, static (_, v) => v + 1);
-		}
-
-		if (total % 500000 == 0 && !_perfHleNoDict)
-		{
-			// Snapshot via foreach (a safe moving enumerator) before sorting.
-			// LINQ over a ConcurrentDictionary uses ICollection.CopyTo, which
-			// throws ArgumentException if another thread adds a key between the
-			// Count read and the copy — that exception was being swallowed into
-			// a CPU_TRAP return and crashing the guest.
-			var snapshot = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string, long>>(_perfHleCounts.Count + 16);
-			foreach (var kvp in _perfHleCounts)
-			{
-				snapshot.Add(kvp);
-			}
-
-			var top = snapshot
-				.OrderByDescending(kvp => kvp.Value)
-				.Take(20)
-				.Select(kvp => $"{kvp.Key}={kvp.Value}");
-			System.Console.Error.WriteLine($"[PERF][HLE] total={total} top: {string.Join(", ", top)}");
-		}
-	}
-
 	private void RecordRecentImportTrace(
 		long dispatchIndex,
 		string nid,
@@ -74,18 +23,15 @@ public sealed partial class DirectExecutionBackend
 		ulong arg1,
 		ulong arg2)
 	{
-		var trace = _recentImportTrace;
-		trace[_recentImportTraceWriteIndex] = new RecentImportTraceEntry(
+		_recentImportTrace[_recentImportTraceWriteIndex] = new RecentImportTraceEntry(
 			dispatchIndex,
 			nid,
 			returnRip,
 			arg0,
 			arg1,
-			arg2,
-			GuestThreadExecution.CurrentGuestThreadHandle,
-			Environment.CurrentManagedThreadId);
-		_recentImportTraceWriteIndex = (_recentImportTraceWriteIndex + 1) % trace.Length;
-		if (_recentImportTraceCount < trace.Length)
+			arg2);
+		_recentImportTraceWriteIndex = (_recentImportTraceWriteIndex + 1) % _recentImportTrace.Length;
+		if (_recentImportTraceCount < _recentImportTrace.Length)
 		{
 			_recentImportTraceCount++;
 		}
@@ -93,21 +39,20 @@ public sealed partial class DirectExecutionBackend
 
 	private void DumpRecentImportTrace()
 	{
-		var trace = _recentImportTrace;
-		if (trace is null || _recentImportTraceCount == 0)
+		if (_recentImportTraceCount == 0)
 		{
 			return;
 		}
-		Log.Info($"   Recent import calls for managed={Environment.CurrentManagedThreadId} guest=0x{GuestThreadExecution.CurrentGuestThreadHandle:X16} ({_recentImportTraceCount}):");
-		int num = (_recentImportTraceWriteIndex - _recentImportTraceCount + trace.Length) % trace.Length;
+		Console.Error.WriteLine($"[LOADER][INFO]   Recent import calls ({_recentImportTraceCount}):");
+		int num = (_recentImportTraceWriteIndex - _recentImportTraceCount + _recentImportTrace.Length) % _recentImportTrace.Length;
 		for (int i = 0; i < _recentImportTraceCount; i++)
 		{
-			int num2 = (num + i) % trace.Length;
-			var entry = trace[num2];
+			int num2 = (num + i) % _recentImportTrace.Length;
+			var entry = _recentImportTrace[num2];
 			if (!string.IsNullOrEmpty(entry.Nid))
 			{
-				Log.Info(
-					$"     #{entry.DispatchIndex} managed={entry.ManagedThreadId} guest=0x{entry.GuestThreadHandle:X16} 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}");
 			}
 		}
@@ -146,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;
 						}
 					}
@@ -161,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;
 	}
@@ -173,65 +118,21 @@ public sealed partial class DirectExecutionBackend
 		{
 			return;
 		}
-		const int preludeSize = 192;
-		Span<byte> prelude = stackalloc byte[preludeSize];
-		if (returnRip >= preludeSize && cpuContext.Memory.TryRead(returnRip - preludeSize, prelude))
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][TRACE] Import#{dispatchIndex} pre-return bytes @0x{returnRip - preludeSize:X16}: " +
-				BitConverter.ToString(prelude.ToArray()).Replace("-", " "));
-
-			List<DecodedInst>? bestCallChain = null;
-			var preludeAddress = returnRip - preludeSize;
-			for (var startOffset = 0; startOffset < preludeSize; startOffset++)
-			{
-				var cursor = preludeAddress + (ulong)startOffset;
-				var candidate = new List<DecodedInst>();
-				while (cursor < returnRip && candidate.Count < 96 &&
-					IcedDecoder.TryReadGuestBytes(cpuContext.Memory, cursor, 15, out var instructionBytes) &&
-					IcedDecoder.TryDecode(cursor, instructionBytes, out var instruction) &&
-					instruction.Length > 0 &&
-					cursor + (ulong)instruction.Length <= returnRip)
-				{
-					candidate.Add(instruction);
-					cursor += (ulong)instruction.Length;
-				}
-
-				if (cursor == returnRip &&
-					candidate.Count > 0 &&
-					string.Equals(candidate[^1].Mnemonic, "Call", StringComparison.OrdinalIgnoreCase) &&
-					(bestCallChain is null || candidate.Count > bestCallChain.Count))
-				{
-					bestCallChain = candidate;
-				}
-			}
-
-			if (bestCallChain is not null)
-			{
-				Console.Error.WriteLine($"[LOADER][TRACE] Import#{dispatchIndex} pre-return disassembly:");
-				foreach (var instruction in bestCallChain.TakeLast(32))
-				{
-					Console.Error.WriteLine(
-						$"[LOADER][TRACE]   0x{instruction.Rip:X16}: {instruction.Text} " +
-						$"bytes={IcedDecoder.FormatBytes(instruction.Bytes)}");
-				}
-			}
-		}
 		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)
@@ -240,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++)
@@ -252,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}");
 				}
 			}
 		}
@@ -267,7 +168,7 @@ 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}");
+			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)
@@ -278,21 +179,21 @@ public sealed partial class DirectExecutionBackend
 				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)
 				{
@@ -300,8 +201,8 @@ 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}");
+						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)
@@ -312,13 +213,13 @@ public sealed partial class DirectExecutionBackend
 							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;
 						}
@@ -333,28 +234,6 @@ public sealed partial class DirectExecutionBackend
 		return value == 65534 || value == 4294967294u || value == 18446744073709551614uL;
 	}
 
-	private static ulong ParseOptionalHexAddress(string? value)
-	{
-		if (string.IsNullOrWhiteSpace(value))
-		{
-			return 0;
-		}
-
-		var text = value.Trim();
-		if (text.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
-		{
-			text = text[2..];
-		}
-
-		return ulong.TryParse(
-			text,
-			System.Globalization.NumberStyles.HexNumber,
-			System.Globalization.CultureInfo.InvariantCulture,
-			out var address)
-			? address
-			: 0;
-	}
-
 	private static bool IsPlausibleReturnAddress(ulong address)
 	{
 		return address >= 12884901888L && address < 17592186044416L && !IsUnresolvedSentinel(address);

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

@@ -17,17 +17,9 @@ public sealed partial class DirectExecutionBackend
 {
 	private const ulong LazyCommitWindowBytes = 0x0200_0000UL;
 	private static int _lazyCommitTraceCount;
-	private static int _guestAllocatorHoleRecoveries;
-	private static int _auxiliaryThreadExecuteFaultRecoveries;
 
 	private unsafe void SetupExceptionHandler()
 	{
-		if (!OperatingSystem.IsWindows())
-		{
-			SetupPosixExceptionHandler();
-			return;
-		}
-
 		if (!string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_DISABLE_RAW_HANDLER"), "1", StringComparison.Ordinal))
 		{
 			_rawExceptionHandlerStub = CreateExceptionHandlerTrampoline(RawVectoredHandlerPtrManaged);
@@ -110,29 +102,11 @@ public sealed partial class DirectExecutionBackend
 
 			ulong rip = ReadCtxU64(contextRecord, 248);
 			ulong rsp = ReadCtxU64(contextRecord, 152);
-			if (TryRecoverGuestInt41(exceptionCode, contextRecord, rip))
-			{
-				return -1;
-			}
-			if (TryRecoverAuxiliaryThreadExecuteFault(exceptionRecord, contextRecord, rip))
-			{
-				return -1;
-			}
 
 			if (exceptionCode == 3221225477u && TryHandleLazyCommittedPage(exceptionRecord, rip, rsp))
 			{
 				return -1;
 			}
-			if (exceptionCode == 3221225477u &&
-				TryRecoverGuestAllocatorHole(exceptionRecord, contextRecord, rip))
-			{
-				return -1;
-			}
-			if (exceptionCode == StatusIllegalInstruction &&
-				TryRecoverIllegalInstruction(contextRecord, rip))
-			{
-				return -1;
-			}
 			if (IsBenignHostDebugException(exceptionCode))
 			{
 				return -1;
@@ -178,35 +152,6 @@ public sealed partial class DirectExecutionBackend
 			Console.Error.WriteLine($"[LOADER][INFO]   Code: 0x{exceptionCode:X8}");
 			Console.Error.WriteLine($"[LOADER][INFO]   Exception Address: 0x{exceptionAddress:X16}");
 			Console.Error.WriteLine($"[LOADER][INFO]   RIP: 0x{rip:X16}");
-			Console.Error.WriteLine(
-				$"[LOADER][INFO]   Host thread: managed={Environment.CurrentManagedThreadId} " +
-				$"name='{Thread.CurrentThread.Name ?? "<unnamed>"}'");
-			if (_activeGuestThreadState is { } activeGuestThread)
-			{
-				Console.Error.WriteLine(
-					$"[LOADER][INFO]   Guest thread: handle=0x{activeGuestThread.ThreadHandle:X16} " +
-					$"name='{activeGuestThread.Name}' state={activeGuestThread.State} " +
-					$"last_import={activeGuestThread.LastImportNid ?? "<none>"} " +
-					$"last_ret=0x{activeGuestThread.LastReturnRip:X16}");
-				Console.Error.WriteLine(
-					$"[LOADER][INFO]   Last import registers: " +
-					$"rax=0x{Volatile.Read(ref activeGuestThread.LastImportRax):X16} " +
-					$"result_valid={Volatile.Read(ref activeGuestThread.LastImportResultValid) != 0} " +
-					$"rdi=0x{activeGuestThread.LastImportRdi:X16} " +
-					$"rsi=0x{activeGuestThread.LastImportRsi:X16} " +
-					$"rdx=0x{activeGuestThread.LastImportRdx:X16} " +
-					$"rcx=0x{activeGuestThread.LastImportRcx:X16} " +
-					$"r8=0x{activeGuestThread.LastImportR8:X16} " +
-					$"r9=0x{activeGuestThread.LastImportR9:X16}");
-				Console.Error.WriteLine(
-					$"[LOADER][INFO]   Last import stack args: " +
-					$"0=0x{activeGuestThread.LastImportStack0:X16} " +
-					$"1=0x{activeGuestThread.LastImportStack1:X16} " +
-					$"2=0x{activeGuestThread.LastImportStack2:X16} " +
-					$"3=0x{activeGuestThread.LastImportStack3:X16} " +
-					$"4=0x{activeGuestThread.LastImportStack4:X16} " +
-					$"5=0x{activeGuestThread.LastImportStack5:X16}");
-			}
 			if (TryFormatNearestRuntimeSymbol(rip, out string symbol))
 			{
 				Console.Error.WriteLine("[LOADER][INFO]   RIP symbol: " + symbol);
@@ -251,50 +196,20 @@ public sealed partial class DirectExecutionBackend
 
 			}
 
-			Console.Error.WriteLine("[LOADER][INFO]   Stack qwords (RSP..):");
-			for (int i = 0; i < 16; i++)
+			try
 			{
-				ulong stackAddr = rsp + (ulong)(i * 8);
-				if (!TryReadHostQword(stackAddr, out ulong value))
+				Console.Error.WriteLine("[LOADER][INFO]   Stack qwords (RSP..):");
+				for (int i = 0; i < 16; i++)
 				{
-					Console.Error.WriteLine("[LOADER][WARNING]   Could not read stack qwords.");
-					break;
-				}
-				Console.Error.WriteLine($"[LOADER][INFO]     [rsp+0x{i * 8:X2}] @0x{stackAddr:X16} = 0x{value:X16}");
-			}
-
-			if (string.Equals(
-					Environment.GetEnvironmentVariable("SHARPEMU_DUMP_FAULT_STACK_WINDOW"),
-					"1",
-					StringComparison.Ordinal))
-			{
-				Console.Error.WriteLine("[LOADER][INFO]   Full fault stack window (RSP-0x300..RSP+0x100):");
-				var windowStart = rsp >= 0x300 ? rsp - 0x300 : 0;
-				for (var stackAddr = windowStart; stackAddr < rsp + 0x100; stackAddr += 8)
-				{
-					if (!TryReadHostQword(stackAddr, out var value))
-					{
-						continue;
-					}
-
-					var relative = unchecked((long)(stackAddr - rsp));
-					var relativeText = relative >= 0
-						? $"+0x{relative:X}"
-						: $"-0x{-relative:X}";
-					var symbolText = TryFormatNearestRuntimeSymbol(value, out var stackSymbol)
-						? $" [{stackSymbol}]"
-						: string.Empty;
-					Console.Error.WriteLine(
-						$"[LOADER][INFO]     [rsp{relativeText}] " +
-						$"@0x{stackAddr:X16} = 0x{value:X16}{symbolText}");
+					ulong stackAddr = rsp + (ulong)(i * 8);
+					ulong value = (ulong)Marshal.ReadInt64((nint)stackAddr);
+					Console.Error.WriteLine($"[LOADER][INFO]     [rsp+0x{i * 8:X2}] @0x{stackAddr:X16} = 0x{value:X16}");
 				}
 			}
-
-			DumpPointerWindow("fault-register-rbx", rbx, 0x60);
-			DumpPointerWindow("fault-register-rsi", rsi, 0x60);
-			DumpPointerWindow("fault-register-rdi", rdi, 0x60);
-			DumpPointerWindow("fault-register-r13", r13, 0x60);
-			DumpPointerWindow("fault-register-r14", r14, 0x60);
+			catch
+			{
+				Console.Error.WriteLine("[LOADER][WARNING]   Could not read stack qwords.");
+			}
 
 			try
 			{
@@ -302,15 +217,12 @@ public sealed partial class DirectExecutionBackend
 				ulong frame = rbp;
 				for (int i = 0; i < 12; i++)
 				{
-					if (frame < 0x10000)
+					if (frame < 140733193388032L || frame > 140737488355327L)
 					{
 						break;
 					}
-					if (!TryReadHostQword(frame, out ulong next) || !TryReadHostQword(frame + 8, out ulong ret))
-					{
-						Console.Error.WriteLine("[LOADER][WARNING]   Could not walk RBP frame chain.");
-						break;
-					}
+					ulong next = (ulong)Marshal.ReadInt64((nint)frame);
+					ulong ret = (ulong)Marshal.ReadInt64((nint)(frame + 8));
 					string extra = TryFormatNearestRuntimeSymbol(ret, out string retSym) ? $" [{retSym}]" : string.Empty;
 					Console.Error.WriteLine($"[LOADER][INFO]     frame#{i}: rbp=0x{frame:X16} ret=0x{ret:X16}{extra} next=0x{next:X16}");
 					if (next <= frame)
@@ -333,9 +245,10 @@ public sealed partial class DirectExecutionBackend
 					Console.Error.WriteLine("[LOADER][ERROR]     - Guest code called an unmapped import");
 					Console.Error.WriteLine("[LOADER][ERROR]     - Guest code accessed unmapped memory");
 					Console.Error.WriteLine("[LOADER][ERROR]     - Need to implement HLE for this NID");
-					byte[] code = new byte[16];
-					if (TryReadHostBytes(rip, code))
+					try
 					{
+						byte[] code = new byte[16];
+						Marshal.Copy((nint)rip, code, 0, code.Length);
 						Console.Error.WriteLine("[LOADER][INFO]   Code at RIP: " + BitConverter.ToString(code).Replace("-", " "));
 						if (code[0] == 100)
 						{
@@ -351,46 +264,25 @@ public sealed partial class DirectExecutionBackend
 							Console.Error.WriteLine($"[LOADER][INFO]   RBP: 0x{rbp:X16} (mod 16 = {rbp % 16})");
 							Console.Error.WriteLine($"[LOADER][INFO]   RSP: 0x{rsp:X16} (mod 16 = {rsp % 16})");
 						}
-						byte[] before = new byte[16];
-						if (rip > 16 && TryReadHostBytes(rip - 16, before))
+						if (rip > 16)
 						{
+							byte[] before = new byte[16];
+							Marshal.Copy((nint)(rip - 16), before, 0, before.Length);
 							Console.Error.WriteLine("[LOADER][INFO]   Code before RIP: " + BitConverter.ToString(before).Replace("-", " "));
 						}
-						byte[] window = new byte[64];
-						if (rip > 32 && TryReadHostBytes(rip - 32, window))
+						if (rip > 32)
 						{
+							byte[] window = new byte[64];
+							Marshal.Copy((nint)(rip - 32), window, 0, window.Length);
 							Console.Error.WriteLine("[LOADER][INFO]   Code window [RIP-0x20..]: " + BitConverter.ToString(window).Replace("-", " "));
 						}
-						for (var stackIndex = 0; stackIndex < 16; stackIndex++)
-						{
-							byte[] stackSlot = new byte[8];
-							if (!TryReadHostBytes(rsp + (ulong)(stackIndex * 8), stackSlot))
-							{
-								continue;
-							}
-							var candidate = BitConverter.ToUInt64(stackSlot);
-							if (candidate < _entryPoint || candidate >= _entryPoint + 0x10000000 || candidate < 24)
-							{
-								continue;
-							}
-							byte[] callSiteWindow = new byte[48];
-							if (TryReadHostBytes(candidate - 24, callSiteWindow))
-							{
-								Console.Error.WriteLine(
-									$"[LOADER][INFO]   Stack guest-code candidate [rsp+0x{stackIndex * 8:X2}]=0x{candidate:X16}, bytes [-0x18..]: " +
-									BitConverter.ToString(callSiteWindow).Replace("-", " "));
-							}
-						}
 					}
-					else
+					catch
 					{
 						Console.Error.WriteLine("[LOADER][ERROR]   Could not read code at RIP");
 					}
 					DumpRecentImportTrace();
-					DumpGuestDisasmDiagnostics(rip, rbp, rsp);
-					DumpGuestRegisterWindowDiagnostics(
-						rax, rbx, rcx, rdx, rsi, rdi, rbp, rsp,
-						r8, r9, r10, r11, r12, r13, r14, r15);
+					DumpGuestDisasmDiagnostics(rip, rbp);
 					DumpGuestReferenceDiagnostics();
 					DumpGuestPointerWindowDiagnostics();
 					break;
@@ -398,20 +290,8 @@ public sealed partial class DirectExecutionBackend
 					Console.Error.WriteLine("[LOADER][WARNING]   Type: Breakpoint (int3)");
 					Console.Error.WriteLine("[LOADER][WARNING]   Unexpected breakpoint in direct-bridge mode");
 					break;
-				case 1073741845u:
-					Console.Error.WriteLine("[LOADER][ERROR]   Type: Abort (SIGABRT)");
-					DumpRecentImportTrace();
-					DumpGuestDisasmDiagnostics(rip, rbp, rsp);
-					break;
 				case 3221225501u:
 					Console.Error.WriteLine("[LOADER][INFO]   Type: Illegal Instruction");
-					byte[] illegalCode = new byte[16];
-					if (TryReadHostBytes(rip, illegalCode))
-					{
-						Console.Error.WriteLine("[LOADER][INFO]   Code at RIP: " + BitConverter.ToString(illegalCode).Replace("-", " "));
-					}
-					DumpRecentImportTrace();
-					DumpGuestDisasmDiagnostics(rip, rbp, rsp);
 					break;
 			}
 
@@ -425,108 +305,6 @@ public sealed partial class DirectExecutionBackend
 		}
 	}
 
-	private unsafe bool TryRecoverAuxiliaryThreadExecuteFault(
-		EXCEPTION_RECORD* exceptionRecord,
-		void* contextRecord,
-		ulong rip)
-	{
-		if (exceptionRecord->ExceptionCode != 3221225477u ||
-			rip >= 0x0000000800000000UL ||
-			_activeGuestThreadState is not { Name: "tbb_thead" } activeThread)
-		{
-			return false;
-		}
-
-		var hostExit = ActiveEntryReturnSentinelRip;
-		if (hostExit < 0x10000)
-		{
-			hostExit = unchecked((ulong)_guestReturnStub);
-		}
-		if (hostExit < 0x10000)
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][WARN] Could not recover auxiliary TBB execute fault: target=0x{rip:X16} " +
-				$"active_exit=0x{ActiveEntryReturnSentinelRip:X16} guest_return_stub=0x{unchecked((ulong)_guestReturnStub):X16}");
-			return false;
-		}
-
-		_ = TryPatchActiveGuestReturnSlot(hostExit);
-		WriteCtxU64(contextRecord, 120, 0);
-		WriteCtxU64(contextRecord, 248, hostExit);
-		var recovery = Interlocked.Increment(ref _auxiliaryThreadExecuteFaultRecoveries);
-		Console.Error.WriteLine(
-			$"[LOADER][WARN] Recovered auxiliary TBB execute fault #{recovery}: " +
-			$"thread=0x{activeThread.ThreadHandle:X16} target=0x{rip:X16} -> host_exit=0x{hostExit:X16}");
-		return true;
-	}
-
-	private unsafe bool TryRecoverGuestInt41(uint exceptionCode, void* contextRecord, ulong rip)
-	{
-		if (!_ignoreGuestInt41 || exceptionCode != 3221225477u || rip < 0x10000)
-		{
-			return false;
-		}
-
-		byte[] opcode = new byte[2];
-		if (!TryReadHostBytes(rip, opcode) || opcode[0] != 0xCD || opcode[1] != 0x41)
-		{
-			return false;
-		}
-
-		var count = Interlocked.Increment(ref _ignoredGuestInt41Count);
-		WriteCtxU64(contextRecord, 248, rip + 2);
-		if (count <= 16 || count % 65536 == 0)
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][WARN] Ignored guest int 0x41 trap #{count} at 0x{rip:X16} (SHARPEMU_IGNORE_INT41=1)");
-			Console.Error.Flush();
-		}
-		return true;
-	}
-
-	private unsafe static bool TryRecoverGuestAllocatorHole(
-		EXCEPTION_RECORD* exceptionRecord,
-		void* contextRecord,
-		ulong rip)
-	{
-		if (string.Equals(
-				Environment.GetEnvironmentVariable("SHARPEMU_DISABLE_GUEST_ALLOCATOR_HOLE_RECOVERY"),
-				"1",
-				StringComparison.Ordinal) ||
-			exceptionRecord->NumberParameters < 2 ||
-			exceptionRecord->ExceptionInformation[0] != 0 ||
-			exceptionRecord->ExceptionInformation[1] != 8 ||
-			ReadCtxU64(contextRecord, CTX_RDI) != 0 ||
-			rip < 0x10000)
-		{
-			return false;
-		}
-
-		// Demon's Souls occasionally leaves an empty payload in a locked pool
-		// tree node. The allocator dereferences payload+8 before reaching its
-		// existing empty-pool fallback. Match the instruction stream instead of
-		// a title-specific absolute address, then resume at that fallback so the
-		// lock is released and the allocator can try its next backing pool.
-		const ulong allocatorHoleSignature = 0x634CFF568D08778BUL;
-		if (*(ulong*)rip != allocatorHoleSignature || *((byte*)rip + 8) != 0xF2)
-		{
-			return false;
-		}
-
-		const ulong emptyPoolFallbackDelta = 0x8E;
-		WriteCtxU64(contextRecord, CTX_RIP, rip + emptyPoolFallbackDelta);
-		var recovery = Interlocked.Increment(ref _guestAllocatorHoleRecoveries);
-		if (recovery <= 16 || (recovery & (recovery - 1)) == 0)
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][WARN] Guest allocator empty-node adapter recovery #{recovery}: " +
-				$"rip=0x{rip:X16} -> 0x{rip + emptyPoolFallbackDelta:X16}");
-			Console.Error.Flush();
-		}
-
-		return true;
-	}
-
 	private static bool IsBenignHostDebugException(uint exceptionCode)
 	{
 		return exceptionCode is DBG_PRINTEXCEPTION_C or DBG_PRINTEXCEPTION_WIDE_C or MS_VC_THREADNAME_EXCEPTION;
@@ -606,7 +384,7 @@ public sealed partial class DirectExecutionBackend
 		}
 	}
 
-	private void DumpGuestDisasmDiagnostics(ulong rip, ulong rbp, ulong rsp)
+	private void DumpGuestDisasmDiagnostics(ulong rip, ulong rbp)
 	{
 		if (!string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_DISASM"), "1", StringComparison.Ordinal))
 		{
@@ -618,20 +396,12 @@ public sealed partial class DirectExecutionBackend
 			DumpGuestInstructionStream("fault-prelude", rip - 0x20, 24);
 		}
 
-		// Optimized guest code frequently omits frame pointers. The return
-		// address at RSP is then more useful than an RBP walk and identifies the
-		// exact call site that supplied the faulting arguments.
-		if (TryReadHostQword(rsp, out var stackReturn) && stackReturn >= 0x60)
-		{
-			DumpGuestInstructionStream("stack-return-prelude", stackReturn - 0x60, 40);
-		}
-
 		try
 		{
 			ulong frame = rbp;
 			for (int i = 0; i < 3; i++)
 			{
-				if (frame < 0x10000)
+				if (frame < 140733193388032L || frame > 140737488355327L)
 				{
 					break;
 				}
@@ -775,55 +545,6 @@ public sealed partial class DirectExecutionBackend
 		}
 	}
 
-	private void DumpGuestRegisterWindowDiagnostics(
-		ulong rax,
-		ulong rbx,
-		ulong rcx,
-		ulong rdx,
-		ulong rsi,
-		ulong rdi,
-		ulong rbp,
-		ulong rsp,
-		ulong r8,
-		ulong r9,
-		ulong r10,
-		ulong r11,
-		ulong r12,
-		ulong r13,
-		ulong r14,
-		ulong r15)
-	{
-		if (!string.Equals(
-				Environment.GetEnvironmentVariable("SHARPEMU_LOG_REGISTER_WINDOWS"),
-				"1",
-				StringComparison.Ordinal))
-		{
-			return;
-		}
-
-		// A register can be the only surviving reference to the object or
-		// argument array that caused a native guest fault. Capture a compact
-		// window while the process is alive so the post-mortem log can
-		// distinguish an absent object from a partially initialized one.
-		var registers = new (string Name, ulong Value)[]
-		{
-			("rax", rax), ("rbx", rbx), ("rcx", rcx), ("rdx", rdx),
-			("rsi", rsi), ("rdi", rdi), ("rbp", rbp), ("rsp", rsp),
-			("r8", r8), ("r9", r9), ("r10", r10), ("r11", r11),
-			("r12", r12), ("r13", r13), ("r14", r14), ("r15", r15),
-		};
-		var seen = new HashSet<ulong>();
-		foreach (var (name, value) in registers)
-		{
-			if (value < 0x10000 || !seen.Add(value))
-			{
-				continue;
-			}
-
-			DumpPointerWindow($"register-{name}", value, 0x80);
-		}
-	}
-
 	private void ScanExecutableRegionForTargetReferences(
 		ulong regionBase,
 		ulong regionEnd,
@@ -1091,61 +812,6 @@ public sealed partial class DirectExecutionBackend
 		}
 	}
 
-	private static bool TryReadHostQword(ulong address, out ulong value)
-	{
-		if (!OperatingSystem.IsWindows())
-		{
-			// A stray read inside the signal handler would raise a nested
-			// SIGSEGV and kill the process before diagnostics finish, so
-			// probe the region table instead of relying on try/catch.
-			return TryReadStackU64(address, out value);
-		}
-
-		value = 0;
-		try
-		{
-			value = (ulong)Marshal.ReadInt64((nint)address);
-			return true;
-		}
-		catch
-		{
-			return false;
-		}
-	}
-
-	private unsafe static bool TryReadHostBytes(ulong address, byte[] buffer)
-	{
-		if (address < 65536)
-		{
-			return false;
-		}
-
-		if (!OperatingSystem.IsWindows())
-		{
-			// See TryReadHostQword: probe every touched page before reading.
-			ulong end = address + (ulong)buffer.Length;
-			for (ulong page = address & 0xFFFFFFFFFFFFF000uL; page < end; page += 4096)
-			{
-				if (VirtualQuery((void*)page, out var mbi, (nuint)sizeof(MEMORY_BASIC_INFORMATION64)) == 0 ||
-					mbi.State != MEM_COMMIT ||
-					!IsReadableProtection(mbi.Protect))
-				{
-					return false;
-				}
-			}
-		}
-
-		try
-		{
-			Marshal.Copy((nint)address, buffer, 0, buffer.Length);
-			return true;
-		}
-		catch
-		{
-			return false;
-		}
-	}
-
 	private string FormatPointerWithNearestSymbol(ulong value)
 	{
 		string text = $"0x{value:X16}";

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

@@ -1,362 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Buffers.Binary;
-using System.Threading;
-using Iced.Intel;
-using SharpEmu.Core.Cpu.Emulation;
-
-namespace SharpEmu.Core.Cpu.Native;
-
-// Software fallback for the BMI1/BMI2/ABM general-purpose-register instructions.
-//
-// Guest code runs natively, so the guest and host share the same virtual address space and the
-// same registers (the OS delivers them in the CONTEXT record on a fault). When the host CPU lacks
-// one of these extensions it raises #UD instead of executing the opcode; without this the title
-// simply aborts. Here we decode the faulting instruction, evaluate it against the trapped register
-// and memory state, write the result back into the CONTEXT, step RIP past the instruction and ask
-// the OS to continue. Only the register-only BMI/ABM forms are handled; anything else returns false
-// and falls through to the existing diagnostics unchanged, so this can never mis-handle an opcode it
-// does not fully model.
-public sealed partial class DirectExecutionBackend
-{
-    // Windows x64 CONTEXT.EFlags lives just past the segment selectors. The GPR offsets it shares
-    // with the rest of the backend are the CTX_* constants declared in DirectExecutionBackend.cs.
-    private const int CTX_EFLAGS = 68;
-
-    // STATUS_ILLEGAL_INSTRUCTION (#UD surfaced by the Windows vectored handler).
-    private const uint StatusIllegalInstruction = 0xC000001Du;
-
-    private const int MaxInstructionBytes = 15;
-
-    // Instruction-window sizes tried in turn so a fault near a page boundary still decodes.
-    private static readonly int[] DecodeWindowSizes = { MaxInstructionBytes, 11, 8, 4, 2 };
-
-    private static int _bmiSoftwareFallbackAnnounced;
-    private static long _bmiInstructionsEmulated;
-
-    private unsafe bool TryRecoverIllegalInstruction(void* contextRecord, ulong rip)
-    {
-        if (!TryReadFaultingInstruction(rip, out var instruction))
-        {
-            return false;
-        }
-
-        if (instruction.Op0Kind != OpKind.Register ||
-            !TryGetGprSlot(instruction.Op0Register, out var destOffset, out var size))
-        {
-            return false;
-        }
-
-        if (!TryEvaluate(contextRecord, in instruction, size, out var result, out var flagsChanged, out var eflags))
-        {
-            return false;
-        }
-
-        WriteCtxU64(contextRecord, destOffset, result);
-        if (flagsChanged)
-        {
-            WriteCtxU32(contextRecord, CTX_EFLAGS, eflags);
-        }
-
-        WriteCtxU64(contextRecord, CTX_RIP, rip + (ulong)instruction.Length);
-
-        Interlocked.Increment(ref _bmiInstructionsEmulated);
-        if (Interlocked.Exchange(ref _bmiSoftwareFallbackAnnounced, 1) == 0)
-        {
-            Console.Error.WriteLine(
-                "[LOADER][INFO] Host lacks a BMI/ABM extension used by the guest; " +
-                "emulating those instructions in software.");
-        }
-
-        return true;
-    }
-
-    private unsafe bool TryEvaluate(
-        void* contextRecord,
-        in Instruction instruction,
-        GprOperandSize size,
-        out ulong result,
-        out bool flagsChanged,
-        out uint eflags)
-    {
-        result = 0;
-        flagsChanged = false;
-        eflags = ReadCtxU32(contextRecord, CTX_EFLAGS);
-
-        switch (instruction.Mnemonic)
-        {
-            case Mnemonic.Andn:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var andnSrc1) ||
-                    !TryReadOperand(contextRecord, in instruction, 2, size, out var andnSrc2))
-                {
-                    return false;
-                }
-
-                result = BmiInstructionEmulator.Andn(andnSrc1, andnSrc2, size, ref eflags);
-                flagsChanged = true;
-                return true;
-
-            case Mnemonic.Blsi:
-            case Mnemonic.Blsmsk:
-            case Mnemonic.Blsr:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var blsSrc))
-                {
-                    return false;
-                }
-
-                result = instruction.Mnemonic switch
-                {
-                    Mnemonic.Blsi => BmiInstructionEmulator.Blsi(blsSrc, size, ref eflags),
-                    Mnemonic.Blsmsk => BmiInstructionEmulator.Blsmsk(blsSrc, size, ref eflags),
-                    _ => BmiInstructionEmulator.Blsr(blsSrc, size, ref eflags),
-                };
-                flagsChanged = true;
-                return true;
-
-            case Mnemonic.Bextr:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var bextrSrc) ||
-                    !TryReadOperand(contextRecord, in instruction, 2, size, out var bextrControl))
-                {
-                    return false;
-                }
-
-                result = BmiInstructionEmulator.Bextr(bextrSrc, bextrControl, size, ref eflags);
-                flagsChanged = true;
-                return true;
-
-            case Mnemonic.Bzhi:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var bzhiSrc) ||
-                    !TryReadOperand(contextRecord, in instruction, 2, size, out var bzhiIndex))
-                {
-                    return false;
-                }
-
-                result = BmiInstructionEmulator.Bzhi(bzhiSrc, bzhiIndex, size, ref eflags);
-                flagsChanged = true;
-                return true;
-
-            case Mnemonic.Tzcnt:
-            case Mnemonic.Lzcnt:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var cntSrc))
-                {
-                    return false;
-                }
-
-                result = instruction.Mnemonic == Mnemonic.Tzcnt
-                    ? BmiInstructionEmulator.Tzcnt(cntSrc, size, ref eflags)
-                    : BmiInstructionEmulator.Lzcnt(cntSrc, size, ref eflags);
-                flagsChanged = true;
-                return true;
-
-            case Mnemonic.Rorx:
-                if (instruction.Op2Kind != OpKind.Immediate8 ||
-                    !TryReadOperand(contextRecord, in instruction, 1, size, out var rorxSrc))
-                {
-                    return false;
-                }
-
-                result = BmiInstructionEmulator.Rorx(rorxSrc, instruction.Immediate8, size);
-                return true;
-
-            case Mnemonic.Sarx:
-            case Mnemonic.Shlx:
-            case Mnemonic.Shrx:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var shiftSrc) ||
-                    !TryReadOperand(contextRecord, in instruction, 2, size, out var shiftCount))
-                {
-                    return false;
-                }
-
-                result = instruction.Mnemonic switch
-                {
-                    Mnemonic.Sarx => BmiInstructionEmulator.Sarx(shiftSrc, (int)shiftCount, size),
-                    Mnemonic.Shlx => BmiInstructionEmulator.Shlx(shiftSrc, (int)shiftCount, size),
-                    _ => BmiInstructionEmulator.Shrx(shiftSrc, (int)shiftCount, size),
-                };
-                return true;
-
-            case Mnemonic.Pdep:
-            case Mnemonic.Pext:
-                if (!TryReadOperand(contextRecord, in instruction, 1, size, out var packSrc) ||
-                    !TryReadOperand(contextRecord, in instruction, 2, size, out var packMask))
-                {
-                    return false;
-                }
-
-                result = instruction.Mnemonic == Mnemonic.Pdep
-                    ? BmiInstructionEmulator.Pdep(packSrc, packMask, size)
-                    : BmiInstructionEmulator.Pext(packSrc, packMask, size);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    private unsafe bool TryReadFaultingInstruction(ulong rip, out Instruction instruction)
-    {
-        // Try the full instruction window first, then shrink so a fault near the end of a mapped
-        // page (where fewer than 15 bytes are readable) still decodes.
-        foreach (var attempt in DecodeWindowSizes)
-        {
-            var buffer = new byte[attempt];
-            if (!TryReadHostBytes(rip, buffer))
-            {
-                continue;
-            }
-
-            var decoder = Decoder.Create(64, new ByteArrayCodeReader(buffer));
-            decoder.IP = rip;
-            decoder.Decode(out instruction);
-            if (instruction.Code != Code.INVALID && instruction.Length > 0 && instruction.Length <= attempt)
-            {
-                return true;
-            }
-        }
-
-        instruction = default;
-        return false;
-    }
-
-    private unsafe bool TryReadOperand(
-        void* contextRecord,
-        in Instruction instruction,
-        int operandIndex,
-        GprOperandSize size,
-        out ulong value)
-    {
-        value = 0;
-        switch (instruction.GetOpKind(operandIndex))
-        {
-            case OpKind.Register:
-                if (!TryGetGprSlot(instruction.GetOpRegister(operandIndex), out var offset, out _))
-                {
-                    return false;
-                }
-
-                var raw = ReadCtxU64(contextRecord, offset);
-                value = size == GprOperandSize.Bits64 ? raw : raw & 0xFFFF_FFFFUL;
-                return true;
-
-            case OpKind.Memory:
-                if (!TryComputeMemoryAddress(contextRecord, in instruction, out var address))
-                {
-                    return false;
-                }
-
-                var byteCount = size == GprOperandSize.Bits64 ? 8 : 4;
-                var buffer = new byte[byteCount];
-                if (!TryReadHostBytes(address, buffer))
-                {
-                    return false;
-                }
-
-                value = byteCount == 8
-                    ? BinaryPrimitives.ReadUInt64LittleEndian(buffer)
-                    : BinaryPrimitives.ReadUInt32LittleEndian(buffer);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    private unsafe bool TryComputeMemoryAddress(void* contextRecord, in Instruction instruction, out ulong address)
-    {
-        address = 0;
-
-        // FS/GS-relative operands need the guest segment base, which is not modelled here.
-        if (instruction.SegmentPrefix != Register.None)
-        {
-            return false;
-        }
-
-        if (instruction.IsIPRelativeMemoryOperand)
-        {
-            address = instruction.IPRelativeMemoryAddress;
-            return true;
-        }
-
-        var effective = instruction.MemoryDisplacement64;
-        if (instruction.MemoryBase != Register.None)
-        {
-            if (!TryGetGpr64Offset(instruction.MemoryBase, out var baseOffset))
-            {
-                return false;
-            }
-
-            effective += ReadCtxU64(contextRecord, baseOffset);
-        }
-
-        if (instruction.MemoryIndex != Register.None)
-        {
-            if (!TryGetGpr64Offset(instruction.MemoryIndex, out var indexOffset))
-            {
-                return false;
-            }
-
-            effective += ReadCtxU64(contextRecord, indexOffset) * (ulong)instruction.MemoryIndexScale;
-        }
-
-        address = effective;
-        return true;
-    }
-
-    // Maps a 32- or 64-bit GPR to its CONTEXT offset and reports the operand width it implies.
-    private static bool TryGetGprSlot(Register register, out int offset, out GprOperandSize size)
-    {
-        switch (register)
-        {
-            case Register.EAX: offset = CTX_RAX; size = GprOperandSize.Bits32; return true;
-            case Register.ECX: offset = CTX_RCX; size = GprOperandSize.Bits32; return true;
-            case Register.EDX: offset = CTX_RDX; size = GprOperandSize.Bits32; return true;
-            case Register.EBX: offset = CTX_RBX; size = GprOperandSize.Bits32; return true;
-            case Register.ESP: offset = CTX_RSP; size = GprOperandSize.Bits32; return true;
-            case Register.EBP: offset = CTX_RBP; size = GprOperandSize.Bits32; return true;
-            case Register.ESI: offset = CTX_RSI; size = GprOperandSize.Bits32; return true;
-            case Register.EDI: offset = CTX_RDI; size = GprOperandSize.Bits32; return true;
-            case Register.R8D: offset = CTX_R8; size = GprOperandSize.Bits32; return true;
-            case Register.R9D: offset = CTX_R9; size = GprOperandSize.Bits32; return true;
-            case Register.R10D: offset = CTX_R10; size = GprOperandSize.Bits32; return true;
-            case Register.R11D: offset = CTX_R11; size = GprOperandSize.Bits32; return true;
-            case Register.R12D: offset = CTX_R12; size = GprOperandSize.Bits32; return true;
-            case Register.R13D: offset = CTX_R13; size = GprOperandSize.Bits32; return true;
-            case Register.R14D: offset = CTX_R14; size = GprOperandSize.Bits32; return true;
-            case Register.R15D: offset = CTX_R15; size = GprOperandSize.Bits32; return true;
-            default:
-                if (TryGetGpr64Offset(register, out offset))
-                {
-                    size = GprOperandSize.Bits64;
-                    return true;
-                }
-
-                size = GprOperandSize.Bits32;
-                return false;
-        }
-    }
-
-    private static bool TryGetGpr64Offset(Register register, out int offset)
-    {
-        switch (register)
-        {
-            case Register.RAX: offset = CTX_RAX; return true;
-            case Register.RCX: offset = CTX_RCX; return true;
-            case Register.RDX: offset = CTX_RDX; return true;
-            case Register.RBX: offset = CTX_RBX; return true;
-            case Register.RSP: offset = CTX_RSP; return true;
-            case Register.RBP: offset = CTX_RBP; return true;
-            case Register.RSI: offset = CTX_RSI; return true;
-            case Register.RDI: offset = CTX_RDI; return true;
-            case Register.R8: offset = CTX_R8; return true;
-            case Register.R9: offset = CTX_R9; return true;
-            case Register.R10: offset = CTX_R10; return true;
-            case Register.R11: offset = CTX_R11; return true;
-            case Register.R12: offset = CTX_R12; return true;
-            case Register.R13: offset = CTX_R13; return true;
-            case Register.R14: offset = CTX_R14; return true;
-            case Register.R15: offset = CTX_R15; return true;
-            default: offset = 0; return false;
-        }
-    }
-}

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

@@ -1,660 +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()
-	{
-		// NativeGuestExecutor emits a Win32 wait loop and creates it with
-		// kernel32!CreateThread. POSIX hosts use the established inline entry
-		// path until the worker loop has a pthread/eventfd implementation.
-		if (!OperatingSystem.IsWindows() || 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;
-		// Windows uses AutoResetEvent (its SafeWaitHandle is a real kernel
-		// event the emitted loop can wait on); POSIX uses worker-event
-		// semaphores shared the same way via PosixHostStubs.
-		private readonly AutoResetEvent? _workAvailable;
-		private readonly AutoResetEvent? _workCompleted;
-		private nint _workSemaphore;
-		private nint _doneSemaphore;
-
-		// RunPrologue/RunEpilogue compile to the host ABI (SysV on POSIX); the
-		// emitted loop calls them with Win64 registers, so POSIX routes the
-		// calls through register-shuffling thunks (shared by all workers).
-		private static nint _posixPrologueThunk;
-		private static nint _posixEpilogueThunk;
-		private static readonly object PosixThunkGate = new();
-		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;
-			if (OperatingSystem.IsWindows())
-			{
-				_workAvailable = new AutoResetEvent(false);
-				_workCompleted = new AutoResetEvent(false);
-			}
-		}
-
-		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);
-			nint workHandle;
-			nint doneHandle;
-			if (OperatingSystem.IsWindows())
-			{
-				workHandle = _workAvailable!.SafeWaitHandle.DangerousGetHandle();
-				doneHandle = _workCompleted!.SafeWaitHandle.DangerousGetHandle();
-			}
-			else
-			{
-				lock (PosixThunkGate)
-				{
-					if (_posixPrologueThunk == 0)
-					{
-						_posixPrologueThunk = PosixHostStubs.CreateWin64ToSysVThunk(prologuePtr);
-						_posixEpilogueThunk = PosixHostStubs.CreateWin64ToSysVThunk(epiloguePtr);
-					}
-				}
-				prologuePtr = _posixPrologueThunk;
-				epiloguePtr = _posixEpilogueThunk;
-				_workSemaphore = PosixHostStubs.CreateWorkerEvent();
-				_doneSemaphore = PosixHostStubs.CreateWorkerEvent();
-				if (_workSemaphore == 0 || _doneSemaphore == 0)
-				{
-					return false;
-				}
-				workHandle = _workSemaphore;
-				doneHandle = _doneSemaphore;
-			}
-
-			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;
-			SignalWorkAvailable();
-			WaitWorkCompleted();
-			_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;
-		}
-
-		private void SignalWorkAvailable()
-		{
-			if (_workAvailable is not null)
-			{
-				_workAvailable.Set();
-				return;
-			}
-
-			_ = PosixHostStubs.SignalWorkerEvent(_workSemaphore);
-		}
-
-		private void WaitWorkCompleted()
-		{
-			if (_workCompleted is not null)
-			{
-				_workCompleted.WaitOne();
-				return;
-			}
-
-			_ = PosixHostStubs.WaitWorkerEvent(_doneSemaphore, -1);
-		}
-
-		[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
-			{
-				SignalWorkAvailable();
-			}
-			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();
-			if (_workSemaphore != 0)
-			{
-				PosixHostStubs.DestroyWorkerEvent(_workSemaphore);
-				_workSemaphore = 0;
-			}
-			if (_doneSemaphore != 0)
-			{
-				PosixHostStubs.DestroyWorkerEvent(_doneSemaphore);
-				_doneSemaphore = 0;
-			}
-		}
-	}
-}

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

@@ -1,409 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Native;
-
-public sealed unsafe partial class DirectExecutionBackend
-{
-	// POSIX bridge for the Windows vectored-exception-handler logic. A
-	// sigaction(SIGSEGV/SIGBUS/SIGILL) handler rebuilds the EXCEPTION_POINTERS
-	// view the shared handlers expect (Win64 CONTEXT register offsets) from
-	// the signal's mcontext, runs the same recovery chain the VEH path uses
-	// (unresolved-import trap sentinels, demand-paging of lazily-committed
-	// guest pages, fault diagnostics), and writes register changes back into
-	// the mcontext so sigreturn resumes the repaired guest. Unrecovered
-	// faults are forwarded to the previously installed handler so the .NET
-	// runtime keeps turning its own faults into managed exceptions.
-
-	private const int PosixSigIll = 4;
-	private const int PosixSigTrap = 5;
-	private const int PosixSigAbort = 6;
-	private const int PosixSigSegv = 11;
-	private static readonly int PosixSigBus = OperatingSystem.IsMacOS() ? 10 : 7;
-
-	// struct sigaction: the handler pointer leads on both platforms; Darwin
-	// packs { handler(8), mask(4), flags(4) }, Linux glibc/musl packs
-	// { handler(8), mask(128), flags(4), restorer(8) }.
-	private static readonly int PosixSigactionSize = OperatingSystem.IsMacOS() ? 16 : 152;
-	private static readonly int PosixSigactionFlagsOffset = OperatingSystem.IsMacOS() ? 12 : 136;
-
-	private static readonly int PosixSaSigInfo = OperatingSystem.IsMacOS() ? 0x0040 : 0x0004;
-	private static readonly int PosixSaNoDefer = OperatingSystem.IsMacOS() ? 0x0010 : 0x40000000;
-
-	// siginfo_t.si_addr: Darwin { signo, errno, code, pid, uid, status, addr },
-	// Linux { signo, errno, code, pad32, addr }.
-	private static readonly int PosixSigInfoAddressOffset = OperatingSystem.IsMacOS() ? 24 : 16;
-
-	// Darwin ucontext_t stores a pointer to __darwin_mcontext64 at +48; the
-	// general registers live in its __ss thread state after the 16-byte
-	// exception state. Linux glibc embeds mcontext_t inline at +40 with the
-	// registers in gregs[23]. Rosetta 2 delivers the regular x86-64 layout
-	// to translated processes.
-	private const int DarwinUcontextMcontextOffset = 48;
-	private const int DarwinMcontextErrOffset = 4;
-	private const int DarwinMcontextFaultAddressOffset = 8;
-	private const int LinuxUcontextGregsOffset = 40;
-	private const int LinuxGregsErrOffset = 19 * 8;
-
-	// Byte offsets of the general registers relative to GetPosixRegisterBase,
-	// ordered to match the contiguous Win64 CONTEXT block CTX_RAX..CTX_RIP
-	// (rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi, r8..r15, rip). Verified
-	// against the x86-64 platform headers.
-	private static readonly int[] PosixRegisterOffsets = OperatingSystem.IsMacOS()
-		? new[] { 16, 32, 40, 24, 72, 64, 56, 48, 80, 88, 96, 104, 112, 120, 128, 136, 144 }
-		: new[] { 104, 112, 96, 88, 120, 80, 72, 64, 0, 8, 16, 24, 32, 40, 48, 56, 128 };
-
-	private static DirectExecutionBackend? _posixSignalBackend;
-	private static bool _posixSignalHandlersInstalled;
-	private static bool _posixRawRecoveryEnabled;
-	private static bool _posixSignalWarmup;
-	private static readonly nint[] _posixPreviousActions = new nint[32];
-	private static int _posixSignalTraceCount;
-	private static long _perfSignalCount;
-	private static readonly bool _perfSignalCounter =
-		string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_PERF_MEM"), "1", StringComparison.Ordinal);
-
-	[ThreadStatic]
-	private static int _posixSignalHandlerDepth;
-
-	private void SetupPosixExceptionHandler()
-	{
-		if (string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_DISABLE_POSIX_SIGNALS"), "1", StringComparison.Ordinal))
-		{
-			Console.Error.WriteLine("[LOADER][WARN] POSIX signal exception bridge disabled by SHARPEMU_DISABLE_POSIX_SIGNALS=1; guest faults will not be recovered.");
-			return;
-		}
-
-		_posixSignalBackend = this;
-		if (_posixSignalHandlersInstalled)
-		{
-			return;
-		}
-
-		_posixRawRecoveryEnabled = !string.Equals(
-			Environment.GetEnvironmentVariable("SHARPEMU_DISABLE_RAW_HANDLER"), "1", StringComparison.Ordinal);
-		if (!_posixRawRecoveryEnabled)
-		{
-			Console.Error.WriteLine("[LOADER][INFO] Raw sentinel recovery disabled by SHARPEMU_DISABLE_RAW_HANDLER=1");
-		}
-
-		WarmUpPosixSignalPath();
-		SharpEmu.HLE.GuestImageWriteTracker.WarmUp();
-
-		if (!InstallPosixSignalHandler(PosixSigSegv) ||
-			!InstallPosixSignalHandler(PosixSigBus) ||
-			!InstallPosixSignalHandler(PosixSigIll) ||
-			!InstallPosixSignalHandler(PosixSigTrap) ||
-			!InstallPosixSignalHandler(PosixSigAbort))
-		{
-			throw new InvalidOperationException("Failed to install POSIX fault signal handlers");
-		}
-
-		_posixSignalHandlersInstalled = true;
-		Console.Error.WriteLine("[LOADER][INFO] POSIX signal exception bridge installed (SIGSEGV/SIGBUS/SIGILL)");
-	}
-
-	/// <summary>
-	/// Runs the signal-recovery path once with fabricated inputs before the
-	/// handlers are installed. The first entry into the handler must not
-	/// require JIT compilation (a fault can interrupt arbitrary runtime
-	/// states), and under Rosetta 2 the signal trampoline cannot enter x86
-	/// code that has never been executed (and therefore never translated): a
-	/// cold handler is silently never invoked and the faulting instruction
-	/// retries forever.
-	/// </summary>
-	private void WarmUpPosixSignalPath()
-	{
-		byte* fakeUcontext = stackalloc byte[512];
-		new Span<byte>(fakeUcontext, 512).Clear();
-		byte* fakeMcontext = stackalloc byte[512];
-		new Span<byte>(fakeMcontext, 512).Clear();
-		if (OperatingSystem.IsMacOS())
-		{
-			*(byte**)(fakeUcontext + DarwinUcontextMcontextOffset) = fakeMcontext;
-		}
-
-		_posixSignalWarmup = true;
-		try
-		{
-			((delegate* unmanaged<int, nint, nint, void>)&HandlePosixSignal)(PosixSigSegv, 0, (nint)fakeUcontext);
-
-			// Warm the branches the fabricated fault above skips without
-			// spamming diagnostics: the benign-exception path through
-			// VectoredHandler, the lazy-commit probe (fault address 0 bails
-			// out immediately), and the chain helper (signal 0 has no saved
-			// action and sigaction(0, ...) fails with EINVAL).
-			EXCEPTION_RECORD record = default;
-			record.ExceptionCode = DBG_PRINTEXCEPTION_C;
-			byte* contextRecord = stackalloc byte[Win64ContextSize];
-			new Span<byte>(contextRecord, Win64ContextSize).Clear();
-			EXCEPTION_POINTERS pointers;
-			pointers.ExceptionRecord = &record;
-			pointers.ContextRecord = contextRecord;
-			_ = VectoredHandler(&pointers);
-
-			record.ExceptionCode = 3221225477u;
-			record.NumberParameters = 2;
-			// 0x70000 is never guest-owned, so this walks the vmem region
-			// scan and the PRT range check, then bails out silently.
-			record.ExceptionInformation[1] = 0x70000;
-			_ = TryHandleLazyCommittedPage(&record, 0, 0);
-			ChainPreviousPosixAction(0, 0, 0);
-		}
-		finally
-		{
-			_posixSignalWarmup = false;
-		}
-	}
-
-	private static bool InstallPosixSignalHandler(int signal)
-	{
-		byte* action = stackalloc byte[PosixSigactionSize];
-		new Span<byte>(action, PosixSigactionSize).Clear();
-		*(nint*)action = (nint)(delegate* unmanaged<int, nint, nint, void>)&HandlePosixSignal;
-		// No SA_ONSTACK: the runtime's alternate stacks are far too small for
-		// the recovery/diagnostic path (JIT compilation of cold handler code
-		// can run inside the signal frame). Guest faults deliver onto the 2MB
-		// guest stack, host faults onto the regular thread stack — the same
-		// stacks Windows dispatches exceptions on.
-		*(int*)(action + PosixSigactionFlagsOffset) = PosixSaSigInfo | PosixSaNoDefer;
-
-		var previous = (byte*)NativeMemory.AllocZeroed((nuint)PosixSigactionSize);
-		if (sigaction(signal, action, previous) != 0)
-		{
-			NativeMemory.Free(previous);
-			Console.Error.WriteLine($"[LOADER][ERROR] sigaction({signal}) failed: errno={Marshal.GetLastPInvokeError()}");
-			return false;
-		}
-
-		_posixPreviousActions[signal] = (nint)previous;
-		return true;
-	}
-
-	[UnmanagedCallersOnly]
-	private static void HandlePosixSignal(int signal, nint siginfo, nint ucontext)
-	{
-		if (_posixSignalHandlerDepth > 0)
-		{
-			// A fault inside our own fault handler (diagnostics touched an
-			// unmapped address): restore the default action and return so the
-			// re-executed instruction terminates the process.
-			RestoreDefaultPosixAction(signal);
-			return;
-		}
-
-		_posixSignalHandlerDepth++;
-		if (_perfSignalCounter)
-		{
-			var n = Interlocked.Increment(ref _perfSignalCount);
-			if (n % 100000 == 0)
-			{
-				Console.Error.WriteLine($"[PERF][MEM] posix_faults={n}");
-			}
-		}
-		try
-		{
-			// Guest-image write tracking runs first: it only needs the fault
-			// address (safe for host and guest threads alike) and must resume
-			// the faulting write immediately after restoring write access.
-			if (signal != PosixSigIll &&
-				siginfo != 0 &&
-				SharpEmu.HLE.GuestImageWriteTracker.TryHandleWriteFault(
-					*(ulong*)((byte*)siginfo + PosixSigInfoAddressOffset)))
-			{
-				return;
-			}
-
-			if (TryHandlePosixFault(signal, siginfo, ucontext))
-			{
-				return;
-			}
-		}
-		catch
-		{
-			// A managed exception must never unwind out of a signal frame.
-		}
-		finally
-		{
-			_posixSignalHandlerDepth--;
-		}
-
-		ChainPreviousPosixAction(signal, siginfo, ucontext);
-	}
-
-	private static bool TryHandlePosixFault(int signal, nint siginfo, nint ucontext)
-	{
-		byte* registers = GetPosixRegisterBase(ucontext);
-		if (registers == null)
-		{
-			return false;
-		}
-
-		byte* contextRecord = stackalloc byte[Win64ContextSize];
-		new Span<byte>(contextRecord, Win64ContextSize).Clear();
-		int[] offsets = PosixRegisterOffsets;
-		for (int i = 0; i < offsets.Length; i++)
-		{
-			WriteCtxU64(contextRecord, CTX_RAX + i * 8, *(ulong*)(registers + offsets[i]));
-		}
-
-		EXCEPTION_RECORD record = default;
-		record.ExceptionAddress = (void*)ReadCtxU64(contextRecord, CTX_RIP);
-		if (signal == PosixSigIll)
-		{
-			record.ExceptionCode = 3221225501u;
-		}
-		else if (signal == PosixSigTrap)
-		{
-			record.ExceptionCode = 2147483651u;
-		}
-		else if (signal == PosixSigAbort)
-		{
-			record.ExceptionCode = 1073741845u;
-		}
-		else
-		{
-			ulong faultAddress = GetPosixFaultAddress(siginfo, registers);
-			record.ExceptionCode = 3221225477u;
-			record.NumberParameters = 2;
-			record.ExceptionInformation[0] = GetPosixAccessType(registers, faultAddress, ReadCtxU64(contextRecord, CTX_RIP));
-			record.ExceptionInformation[1] = faultAddress;
-		}
-
-		EXCEPTION_POINTERS pointers;
-		pointers.ExceptionRecord = &record;
-		pointers.ContextRecord = contextRecord;
-
-		int traceIndex = _posixSignalWarmup ? 0 : Interlocked.Increment(ref _posixSignalTraceCount);
-		bool traceSignal = traceIndex > 0 && (traceIndex <= 16 || traceIndex % 1024 == 0 ||
-			string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_POSIX_SIGNALS"), "1", StringComparison.Ordinal));
-		if (traceSignal)
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][TRACE] posix-signal#{traceIndex}: sig={signal} rip=0x{ReadCtxU64(contextRecord, CTX_RIP):X16} " +
-				$"fault=0x{record.ExceptionInformation[1]:X16} access={record.ExceptionInformation[0]} rsp=0x{ReadCtxU64(contextRecord, CTX_RSP):X16}");
-			Console.Error.Flush();
-		}
-
-		// Sentinel recovery runs first: on Windows both vectored handlers see
-		// every fault anyway, and recovering here avoids dumping the full
-		// VectoredHandler diagnostics for each recoverable trap.
-		int disposition = 0;
-		if (_posixRawRecoveryEnabled)
-		{
-			disposition = TryRecoverUnresolvedSentinel(&pointers);
-		}
-		if (disposition != -1 && !_posixSignalWarmup && _posixSignalBackend is { } backend)
-		{
-			disposition = backend.VectoredHandler(&pointers);
-		}
-		if (traceSignal)
-		{
-			Console.Error.WriteLine(
-				$"[LOADER][TRACE] posix-signal#{traceIndex}: recovered={disposition == -1} new_rip=0x{ReadCtxU64(contextRecord, CTX_RIP):X16}");
-			Console.Error.Flush();
-		}
-		if (disposition != -1 && !_posixSignalWarmup)
-		{
-			return false;
-		}
-
-		for (int i = 0; i < offsets.Length; i++)
-		{
-			*(ulong*)(registers + offsets[i]) = ReadCtxU64(contextRecord, CTX_RAX + i * 8);
-		}
-		return true;
-	}
-
-	private static byte* GetPosixRegisterBase(nint ucontext)
-	{
-		if (ucontext == 0)
-		{
-			return null;
-		}
-
-		if (OperatingSystem.IsMacOS())
-		{
-			return *(byte**)((byte*)ucontext + DarwinUcontextMcontextOffset);
-		}
-
-		return (byte*)ucontext + LinuxUcontextGregsOffset;
-	}
-
-	private static ulong GetPosixFaultAddress(nint siginfo, byte* registers)
-	{
-		ulong address = siginfo != 0 ? *(ulong*)((byte*)siginfo + PosixSigInfoAddressOffset) : 0;
-		if (address == 0 && OperatingSystem.IsMacOS())
-		{
-			address = *(ulong*)(registers + DarwinMcontextFaultAddressOffset);
-		}
-
-		return address;
-	}
-
-	private static ulong GetPosixAccessType(byte* registers, ulong faultAddress, ulong rip)
-	{
-		// x86 page-fault error code: bit 1 = write access, bit 4 = instruction
-		// fetch. Fall back to comparing the fault address against RIP when
-		// the error code is not populated (e.g. under Rosetta 2 translation).
-		ulong error = OperatingSystem.IsMacOS()
-			? *(uint*)(registers + DarwinMcontextErrOffset)
-			: *(ulong*)(registers + LinuxGregsErrOffset);
-		if ((error & 0x10) != 0)
-		{
-			return 8;
-		}
-		if ((error & 0x2) != 0)
-		{
-			return 1;
-		}
-
-		return faultAddress != 0 && faultAddress == rip ? 8u : 0u;
-	}
-
-	private static void RestoreDefaultPosixAction(int signal)
-	{
-		byte* action = stackalloc byte[PosixSigactionSize];
-		new Span<byte>(action, PosixSigactionSize).Clear();
-		_ = sigaction(signal, action, null);
-	}
-
-	private static void ChainPreviousPosixAction(int signal, nint siginfo, nint ucontext)
-	{
-		byte* previous = (uint)signal < (uint)_posixPreviousActions.Length
-			? (byte*)_posixPreviousActions[signal]
-			: null;
-		nint handler = previous != null ? *(nint*)previous : 0;
-		if (handler == 0)
-		{
-			// SIG_DFL (or nothing saved): reinstate the default action and
-			// return, so re-executing the faulting instruction terminates the
-			// process with the original fault context intact.
-			RestoreDefaultPosixAction(signal);
-			return;
-		}
-		if (handler == 1)
-		{
-			// SIG_IGN
-			return;
-		}
-
-		int flags = *(int*)(previous + PosixSigactionFlagsOffset);
-		if ((flags & PosixSaSigInfo) != 0)
-		{
-			((delegate* unmanaged<int, nint, nint, void>)handler)(signal, siginfo, ucontext);
-		}
-		else
-		{
-			((delegate* unmanaged<int, void>)handler)(signal);
-		}
-	}
-
-	[DllImport("libc", SetLastError = true)]
-	private static extern int sigaction(int signum, void* act, void* oldact);
-}

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

@@ -1,49 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE.Host;
-
-namespace SharpEmu.Core.Cpu.Native;
-
-/// <summary>
-/// Placeholder for hosts whose fault bridge is installed directly by the
-/// execution backend. POSIX uses its sigaction bridge and never calls these
-/// Windows-shaped registration methods.
-/// </summary>
-internal sealed class NullHostFaultHandling : IHostFaultHandling
-{
-    public static NullHostFaultHandling Instance { get; } = new();
-
-    private NullHostFaultHandling()
-    {
-    }
-
-    public nint CreateHandlerThunk(nint managedCallback, uint hostRspSwitchTlsSlot, nint tlsGetValueAddress)
-    {
-        _ = managedCallback;
-        _ = hostRspSwitchTlsSlot;
-        _ = tlsGetValueAddress;
-        return 0;
-    }
-
-    public void FreeThunk(nint thunk)
-    {
-        _ = thunk;
-    }
-
-    public nint AddFirstChanceHandler(nint thunk)
-    {
-        _ = thunk;
-        return 0;
-    }
-
-    public void RemoveHandler(nint handle)
-    {
-        _ = handle;
-    }
-
-    public void SetUnhandledFilter(nint thunk)
-    {
-        _ = thunk;
-    }
-}

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

@@ -1,425 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Runtime.InteropServices;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Native;
-
-/// <summary>
-/// POSIX replacements for the kernel32 helpers the native backend embeds in
-/// emitted x86-64 code. Every stub exposed here follows the Win64 calling
-/// convention the emitted call sites were written for (first argument in
-/// ECX, result in RAX, Win64 non-volatile registers preserved), so the
-/// emission code stays identical across platforms.
-/// </summary>
-internal static unsafe class PosixHostStubs
-{
-    private static readonly object Gate = new();
-    private static bool _initialized;
-    private static nint _tlsGetValueStub;
-    private static nint _queryPerformanceCounterStub;
-    private static nint _switchToThreadStub;
-    private static nint _sleepStub;
-
-    public static nint TlsGetValueStubAddress
-    {
-        get { EnsureInitialized(); return _tlsGetValueStub; }
-    }
-
-    public static nint QueryPerformanceCounterStubAddress
-    {
-        get { EnsureInitialized(); return _queryPerformanceCounterStub; }
-    }
-
-    public static nint SwitchToThreadStubAddress
-    {
-        get { EnsureInitialized(); return _switchToThreadStub; }
-    }
-
-    public static nint SleepStubAddress
-    {
-        get { EnsureInitialized(); return _sleepStub; }
-    }
-
-    public static nint CreateWorkerEvent()
-    {
-        if (OperatingSystem.IsMacOS())
-        {
-            return dispatch_semaphore_create(0);
-        }
-
-        var semaphore = Marshal.AllocHGlobal(64);
-        if (sem_init(semaphore, 0, 0) != 0)
-        {
-            Marshal.FreeHGlobal(semaphore);
-            return 0;
-        }
-
-        return semaphore;
-    }
-
-    public static bool SignalWorkerEvent(nint handle)
-    {
-        if (OperatingSystem.IsMacOS())
-        {
-            _ = dispatch_semaphore_signal(handle);
-            return true;
-        }
-
-        return sem_post(handle) == 0;
-    }
-
-    public static bool WaitWorkerEvent(nint handle, int timeoutMilliseconds)
-    {
-        if (OperatingSystem.IsMacOS())
-        {
-            if (timeoutMilliseconds < 0)
-            {
-                return dispatch_semaphore_wait(handle, ulong.MaxValue) == 0;
-            }
-
-            var deadline = dispatch_time(0, timeoutMilliseconds * 1_000_000L);
-            return dispatch_semaphore_wait(handle, deadline) == 0;
-        }
-
-        if (timeoutMilliseconds < 0)
-        {
-            while (sem_wait(handle) != 0)
-            {
-            }
-
-            return true;
-        }
-
-        var deadlineTicks = Environment.TickCount64 + timeoutMilliseconds;
-        while (sem_trywait(handle) != 0)
-        {
-            if (Environment.TickCount64 >= deadlineTicks)
-            {
-                return false;
-            }
-
-            Thread.Sleep(1);
-        }
-
-        return true;
-    }
-
-    public static void DestroyWorkerEvent(nint handle)
-    {
-        if (handle == 0)
-        {
-            return;
-        }
-
-        if (OperatingSystem.IsMacOS())
-        {
-            dispatch_release(handle);
-            return;
-        }
-
-        _ = sem_destroy(handle);
-        Marshal.FreeHGlobal(handle);
-    }
-
-    /// <summary>Allocates a pthread TLS key, mirroring kernel32!TlsAlloc.</summary>
-    public static uint TlsAlloc()
-    {
-        if (OperatingSystem.IsMacOS())
-        {
-            nuint key;
-            return pthread_key_create_mac(&key, 0) == 0 ? (uint)key : uint.MaxValue;
-        }
-
-        uint key32;
-        return pthread_key_create_linux(&key32, 0) == 0 ? key32 : uint.MaxValue;
-    }
-
-    public static bool TlsFree(uint key)
-    {
-        return OperatingSystem.IsMacOS()
-            ? pthread_key_delete_mac((nuint)key) == 0
-            : pthread_key_delete_linux(key) == 0;
-    }
-
-    public static bool TlsSetValue(uint key, nint value)
-    {
-        return OperatingSystem.IsMacOS()
-            ? pthread_setspecific_mac((nuint)key, value) == 0
-            : pthread_setspecific_linux(key, value) == 0;
-    }
-
-    public static nint TlsGetValue(uint key)
-    {
-        return OperatingSystem.IsMacOS()
-            ? pthread_getspecific_mac((nuint)key)
-            : pthread_getspecific_linux(key);
-    }
-
-    /// <summary>Stable numeric id of the calling thread (kernel32!GetCurrentThreadId).</summary>
-    public static uint GetCurrentThreadId()
-    {
-        if (OperatingSystem.IsMacOS())
-        {
-            ulong tid;
-            return pthread_threadid_np(0, &tid) == 0 ? unchecked((uint)tid) : 0u;
-        }
-
-        return unchecked((uint)gettid());
-    }
-
-    /// <summary>
-    /// Wraps a managed callback (compiled for the SysV ABI on POSIX .NET) in a
-    /// thunk that accepts up to four integer arguments in the Win64 ABI the
-    /// emitted x86-64 call sites use. Win64 passes args in rcx/rdx/r8/r9 and
-    /// treats rdi/rsi as non-volatile; SysV expects rdi/rsi/rdx/rcx and
-    /// clobbers them, so the thunk saves rdi/rsi, shuffles the registers, keeps
-    /// the stack 16-byte aligned for the call, and forwards the rax result.
-    /// </summary>
-    public static nint CreateWin64ToSysVThunk(nint sysvTarget)
-    {
-        var page = (byte*)HostMemory.Alloc(
-            null,
-            4096,
-            HostMemory.MEM_COMMIT | HostMemory.MEM_RESERVE,
-            HostMemory.PAGE_EXECUTE_READWRITE);
-        if (page == null)
-        {
-            throw new OutOfMemoryException("Failed to allocate Win64->SysV thunk page");
-        }
-
-        var offset = 0;
-        Emit(page, ref offset, 0x57);                   // push rdi
-        Emit(page, ref offset, 0x56);                   // push rsi
-        Emit(page, ref offset, 0x48, 0x89, 0xCF);       // mov rdi, rcx
-        Emit(page, ref offset, 0x48, 0x89, 0xD6);       // mov rsi, rdx
-        Emit(page, ref offset, 0x4C, 0x89, 0xC2);       // mov rdx, r8
-        Emit(page, ref offset, 0x4C, 0x89, 0xC9);       // mov rcx, r9
-        Emit(page, ref offset, 0x48, 0x83, 0xEC, 0x08); // sub rsp, 8 (realign to 16)
-        EmitMovRaxImm64(page, ref offset, sysvTarget);  // mov rax, target
-        Emit(page, ref offset, 0xFF, 0xD0);             // call rax
-        Emit(page, ref offset, 0x48, 0x83, 0xC4, 0x08); // add rsp, 8
-        Emit(page, ref offset, 0x5E);                   // pop rsi
-        Emit(page, ref offset, 0x5F);                   // pop rdi
-        Emit(page, ref offset, 0xC3);                   // ret
-
-        if (!HostMemory.Protect(page, 4096, HostMemory.PAGE_EXECUTE_READ, out _))
-        {
-            throw new InvalidOperationException("Failed to protect Win64->SysV thunk page");
-        }
-
-        HostMemory.FlushInstructionCache(page, (nuint)offset);
-        return (nint)page;
-    }
-
-    private static void EnsureInitialized()
-    {
-        if (_initialized)
-        {
-            return;
-        }
-
-        lock (Gate)
-        {
-            if (_initialized)
-            {
-                return;
-            }
-
-            BuildStubs();
-            _initialized = true;
-        }
-    }
-
-    private static void BuildStubs()
-    {
-        var page = (byte*)HostMemory.Alloc(
-            null,
-            4096,
-            HostMemory.MEM_COMMIT | HostMemory.MEM_RESERVE,
-            HostMemory.PAGE_EXECUTE_READWRITE);
-        if (page == null)
-        {
-            throw new OutOfMemoryException("Failed to allocate POSIX host helper stub page");
-        }
-
-        var offset = 0;
-        _tlsGetValueStub = EmitTlsGetValue(page, ref offset);
-        _queryPerformanceCounterStub = EmitQueryPerformanceCounter(page, ref offset);
-        _switchToThreadStub = EmitSwitchToThread(page, ref offset);
-        _sleepStub = EmitSleep(page, ref offset);
-
-        if (!HostMemory.Protect(page, 4096, HostMemory.PAGE_EXECUTE_READ, out _))
-        {
-            throw new InvalidOperationException("Failed to protect POSIX host helper stub page");
-        }
-
-        HostMemory.FlushInstructionCache(page, (nuint)offset);
-    }
-
-    private static nint EmitTlsGetValue(byte* page, ref int offset)
-    {
-        var start = (nint)(page + offset);
-        if (OperatingSystem.IsMacOS())
-        {
-            // On macOS x86-64 pthread keys index the gs-based thread specific
-            // data array directly, so TlsGetValue(index in ecx) collapses to a
-            // single load that clobbers nothing but RAX.
-            Emit(page, ref offset, 0x89, 0xC8);                                     // mov eax, ecx
-            Emit(page, ref offset, 0x65, 0x48, 0x8B, 0x04, 0xC5, 0, 0, 0, 0);       // mov rax, gs:[rax*8]
-            Emit(page, ref offset, 0xC3);                                           // ret
-            return start;
-        }
-
-        // Linux: call pthread_getspecific, preserving the registers that are
-        // volatile in SysV but non-volatile in Win64 (rsi, rdi).
-        var pthreadGetSpecific = ResolveLibcExport("pthread_getspecific");
-        Emit(page, ref offset, 0x56);                                               // push rsi
-        Emit(page, ref offset, 0x57);                                               // push rdi
-        Emit(page, ref offset, 0x48, 0x83, 0xEC, 0x08);                             // sub rsp, 8
-        Emit(page, ref offset, 0x89, 0xCF);                                         // mov edi, ecx
-        EmitMovRaxImm64(page, ref offset, pthreadGetSpecific);                      // mov rax, imm64
-        Emit(page, ref offset, 0xFF, 0xD0);                                         // call rax
-        Emit(page, ref offset, 0x48, 0x83, 0xC4, 0x08);                             // add rsp, 8
-        Emit(page, ref offset, 0x5F);                                               // pop rdi
-        Emit(page, ref offset, 0x5E);                                               // pop rsi
-        Emit(page, ref offset, 0xC3);                                               // ret
-        return start;
-    }
-
-    private static nint EmitQueryPerformanceCounter(byte* page, ref int offset)
-    {
-        // BOOL QueryPerformanceCounter(LARGE_INTEGER* out in rcx): the emitted
-        // consumers only need a monotonically increasing counter, which rdtsc
-        // provides without leaving Win64-safe registers.
-        var start = (nint)(page + offset);
-        Emit(page, ref offset, 0x0F, 0x31);                                         // rdtsc
-        Emit(page, ref offset, 0x48, 0xC1, 0xE2, 0x20);                             // shl rdx, 32
-        Emit(page, ref offset, 0x48, 0x09, 0xD0);                                   // or rax, rdx
-        Emit(page, ref offset, 0x48, 0x89, 0x01);                                   // mov [rcx], rax
-        Emit(page, ref offset, 0xB8, 0x01, 0x00, 0x00, 0x00);                       // mov eax, 1
-        Emit(page, ref offset, 0xC3);                                               // ret
-        return start;
-    }
-
-    private static nint EmitSwitchToThread(byte* page, ref int offset)
-    {
-        var schedYield = ResolveLibcExport("sched_yield");
-        var start = (nint)(page + offset);
-        Emit(page, ref offset, 0x56);                                               // push rsi
-        Emit(page, ref offset, 0x57);                                               // push rdi
-        Emit(page, ref offset, 0x48, 0x83, 0xEC, 0x08);                             // sub rsp, 8
-        EmitMovRaxImm64(page, ref offset, schedYield);                              // mov rax, imm64
-        Emit(page, ref offset, 0xFF, 0xD0);                                         // call rax
-        Emit(page, ref offset, 0x48, 0x83, 0xC4, 0x08);                             // add rsp, 8
-        Emit(page, ref offset, 0x5F);                                               // pop rdi
-        Emit(page, ref offset, 0x5E);                                               // pop rsi
-        Emit(page, ref offset, 0xB8, 0x01, 0x00, 0x00, 0x00);                       // mov eax, 1
-        Emit(page, ref offset, 0xC3);                                               // ret
-        return start;
-    }
-
-    private static nint EmitSleep(byte* page, ref int offset)
-    {
-        // void Sleep(DWORD milliseconds in ecx) -> usleep(microseconds in edi).
-        var usleep = ResolveLibcExport("usleep");
-        var start = (nint)(page + offset);
-        Emit(page, ref offset, 0x56);                                               // push rsi
-        Emit(page, ref offset, 0x57);                                               // push rdi
-        Emit(page, ref offset, 0x48, 0x83, 0xEC, 0x08);                             // sub rsp, 8
-        Emit(page, ref offset, 0x89, 0xCF);                                         // mov edi, ecx
-        Emit(page, ref offset, 0x81, 0xFF, 0xFF, 0x0F, 0x00, 0x00);                 // cmp edi, 0xFFF
-        Emit(page, ref offset, 0x76, 0x05);                                         // jbe +5
-        Emit(page, ref offset, 0xBF, 0xFF, 0x0F, 0x00, 0x00);                       // mov edi, 0xFFF (cap at ~4s)
-        Emit(page, ref offset, 0x69, 0xFF, 0xE8, 0x03, 0x00, 0x00);                 // imul edi, edi, 1000
-        EmitMovRaxImm64(page, ref offset, usleep);                                  // mov rax, imm64
-        Emit(page, ref offset, 0xFF, 0xD0);                                         // call rax
-        Emit(page, ref offset, 0x48, 0x83, 0xC4, 0x08);                             // add rsp, 8
-        Emit(page, ref offset, 0x5F);                                               // pop rdi
-        Emit(page, ref offset, 0x5E);                                               // pop rsi
-        Emit(page, ref offset, 0xC3);                                               // ret
-        return start;
-    }
-
-    private static nint ResolveLibcExport(string name)
-    {
-        var libc = NativeLibrary.Load(OperatingSystem.IsMacOS() ? "libSystem.dylib" : "libc.so.6");
-        return NativeLibrary.GetExport(libc, name);
-    }
-
-    private static void Emit(byte* page, ref int offset, params byte[] bytes)
-    {
-        foreach (var value in bytes)
-        {
-            page[offset++] = value;
-        }
-    }
-
-    private static void EmitMovRaxImm64(byte* page, ref int offset, nint value)
-    {
-        Emit(page, ref offset, 0x48, 0xB8);
-        *(long*)(page + offset) = value;
-        offset += sizeof(long);
-    }
-
-    [DllImport("libc", EntryPoint = "pthread_key_create", SetLastError = true)]
-    private static extern int pthread_key_create_mac(nuint* key, nint destructor);
-
-    [DllImport("libc", EntryPoint = "pthread_key_create", SetLastError = true)]
-    private static extern int pthread_key_create_linux(uint* key, nint destructor);
-
-    [DllImport("libc", EntryPoint = "pthread_key_delete")]
-    private static extern int pthread_key_delete_mac(nuint key);
-
-    [DllImport("libc", EntryPoint = "pthread_key_delete")]
-    private static extern int pthread_key_delete_linux(uint key);
-
-    [DllImport("libc", EntryPoint = "pthread_setspecific")]
-    private static extern int pthread_setspecific_mac(nuint key, nint value);
-
-    [DllImport("libc", EntryPoint = "pthread_setspecific")]
-    private static extern int pthread_setspecific_linux(uint key, nint value);
-
-    [DllImport("libc", EntryPoint = "pthread_getspecific")]
-    private static extern nint pthread_getspecific_mac(nuint key);
-
-    [DllImport("libc", EntryPoint = "pthread_getspecific")]
-    private static extern nint pthread_getspecific_linux(uint key);
-
-    [DllImport("libc")]
-    private static extern int pthread_threadid_np(nint thread, ulong* threadId);
-
-    [DllImport("libc")]
-    private static extern int gettid();
-
-    [DllImport("libc")]
-    private static extern nint dispatch_semaphore_create(long value);
-
-    [DllImport("libc")]
-    private static extern nint dispatch_semaphore_signal(nint semaphore);
-
-    [DllImport("libc")]
-    private static extern nint dispatch_semaphore_wait(nint semaphore, ulong timeout);
-
-    [DllImport("libc")]
-    private static extern ulong dispatch_time(ulong when, long deltaNanoseconds);
-
-    [DllImport("libc")]
-    private static extern void dispatch_release(nint handle);
-
-    [DllImport("libc")]
-    private static extern int sem_init(nint semaphore, int shared, uint value);
-
-    [DllImport("libc")]
-    private static extern int sem_post(nint semaphore);
-
-    [DllImport("libc")]
-    private static extern int sem_wait(nint semaphore);
-
-    [DllImport("libc")]
-    private static extern int sem_trywait(nint semaphore);
-
-    [DllImport("libc")]
-    private static extern int sem_destroy(nint semaphore);
-}

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

@@ -194,11 +194,11 @@ public sealed unsafe class StubManager : IDisposable
         _stubAddresses.Clear();
     }
 
-    private static void* VirtualAlloc(void* lpAddress, nuint dwSize, AllocationType flAllocationType, MemoryProtection flProtect) =>
-        HostMemory.Alloc(lpAddress, dwSize, (uint)flAllocationType, (uint)flProtect);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern void* VirtualAlloc(void* lpAddress, nuint dwSize, AllocationType flAllocationType, MemoryProtection flProtect);
 
-    private static bool VirtualFree(void* lpAddress, nuint dwSize, FreeType dwFreeType) =>
-        HostMemory.Free(lpAddress, dwSize, (uint)dwFreeType);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern bool VirtualFree(void* lpAddress, nuint dwSize, FreeType dwFreeType);
 
     [Flags]
     private enum AllocationType : uint

src/SharpEmu.Core/Cpu/Native/Windows/Win64ContextOffsets.cs

@@ -1,33 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Core.Cpu.Native.Windows;
-
-/// <summary>
-/// Byte offsets into the Win64 CONTEXT record delivered to vectored exception
-/// handlers. The handlers read/write guest registers directly at these offsets
-/// (no managed CONTEXT struct exists); a future POSIX backend gets a sibling
-/// class for its mcontext layout.
-/// </summary>
-internal static class Win64ContextOffsets
-{
-    public const int Size = 0x4D0;
-    public const int Mxcsr = 52;
-    public const int Rax = 120;
-    public const int Rcx = 128;
-    public const int Rdx = 136;
-    public const int Rbx = 144;
-    public const int Rsp = 152;
-    public const int Rbp = 160;
-    public const int Rsi = 168;
-    public const int Rdi = 176;
-    public const int R8 = 184;
-    public const int R9 = 192;
-    public const int R10 = 200;
-    public const int R11 = 208;
-    public const int R12 = 216;
-    public const int R13 = 224;
-    public const int R14 = 232;
-    public const int R15 = 240;
-    public const int Rip = 248;
-}

src/SharpEmu.Core/Cpu/Native/Windows/WindowsFaultCodes.cs

@@ -1,24 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Core.Cpu.Native.Windows;
-
-/// <summary>
-/// Windows NTSTATUS exception codes and EXCEPTION_RECORD access-type values the
-/// fault handlers filter on. Values are the same numbers the handlers previously
-/// compared as bare literals; only the spelling changed.
-/// </summary>
-internal static class WindowsFaultCodes
-{
-    public const uint AccessViolation = 0xC0000005u;         // 3221225477
-    public const uint Breakpoint = 0x80000003u;              // 2147483651
-    public const uint IllegalInstruction = 0xC000001Du;      // 3221225501
-    public const uint FastFail = 0xC0000409u;                // 3221226505
-    public const uint StackOverflow = 0xC00000FDu;
-    public const uint ClrManagedException = 0xE0434352u;
-
-    // EXCEPTION_RECORD.ExceptionInformation[0] for access violations.
-    public const ulong AccessRead = 0;
-    public const ulong AccessWrite = 1;
-    public const ulong AccessExecute = 8;
-}

src/SharpEmu.Core/Cpu/Native/Windows/WindowsFaultHandling.cs

@@ -1,191 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Runtime.InteropServices;
-using SharpEmu.HLE.Host;
-
-namespace SharpEmu.Core.Cpu.Native.Windows;
-
-/// <summary>
-/// Vectored-exception-handler installation and the handler pre-filter thunk.
-/// The thunk is inherently Windows-shaped (TEB stack-limit reads via gs:,
-/// NTSTATUS pre-filtering, Win64 calling convention) and moved here whole from
-/// DirectExecutionBackend; a POSIX backend supplies a sibling built around
-/// sigaction/sigaltstack instead.
-/// </summary>
-internal sealed unsafe partial class WindowsFaultHandling : IHostFaultHandling
-{
-    private readonly IHostMemory _memory;
-
-    public WindowsFaultHandling(IHostMemory memory)
-    {
-        _memory = memory;
-    }
-
-    public nint CreateHandlerThunk(nint managedCallback, uint hostRspSwitchTlsSlot, nint tlsGetValueAddress)
-    {
-        const uint stubSize = 256u;
-        void* ptr = (void*)_memory.Allocate(0, stubSize, HostPageProtection.ReadWriteExecute);
-        if (ptr == null)
-        {
-            return 0;
-        }
-
-        byte* code = (byte*)ptr;
-        int offset = 0;
-        // Native pre-filter: these exception codes are raised while the thread can be in
-        // cooperative GC mode (a C# throw is RaiseException(0xE0434352) on the throwing
-        // thread; FailFast/stack-overflow arrive mid-runtime-failure). Entering the managed
-        // handler then trips the CLR's reverse-P/Invoke check and kills the process with
-        // "Invalid Program: attempted to call a UnmanagedCallersOnly method from managed
-        // code" — this is why no managed throw (even one with a catch handler) ever
-        // survived inside the emulator. Continue the handler search without touching
-        // managed code; the CLR's own VEH handles its exceptions. MSVC C++ exceptions
-        // (Vulkan drivers, host CRT) are excluded too: the managed handler only ever
-        // returned CONTINUE_SEARCH for them.
-        ReadOnlySpan<uint> nonManagedExceptionCodes =
-            [WindowsFaultCodes.ClrManagedException, 0xE06D7363u, WindowsFaultCodes.FastFail, WindowsFaultCodes.StackOverflow];
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x8B); EmitByte(code, ref offset, 0x01); // mov rax, [rcx] (ExceptionRecord*)
-        EmitByte(code, ref offset, 0x8B); EmitByte(code, ref offset, 0x00);                                   // mov eax, [rax] (ExceptionCode)
-        var passJumpOffsets = stackalloc int[nonManagedExceptionCodes.Length];
-        for (int i = 0; i < nonManagedExceptionCodes.Length; i++)
-        {
-            EmitByte(code, ref offset, 0x3D);                                                                 // cmp eax, imm32
-            EmitUInt32(code, ref offset, nonManagedExceptionCodes[i]);
-            EmitByte(code, ref offset, 0x74);                                                                 // je pass
-            passJumpOffsets[i] = offset;
-            EmitByte(code, ref offset, 0x00);
-        }
-        EmitByte(code, ref offset, 0xEB); EmitByte(code, ref offset, 0x03);                                   // jmp over pass block
-        int passOffset = offset;
-        EmitByte(code, ref offset, 0x31); EmitByte(code, ref offset, 0xC0);                                   // pass: xor eax, eax (EXCEPTION_CONTINUE_SEARCH)
-        EmitByte(code, ref offset, 0xC3);                                                                     // ret
-        for (int i = 0; i < nonManagedExceptionCodes.Length; i++)
-        {
-            code[passJumpOffsets[i]] = checked((byte)(passOffset - (passJumpOffsets[i] + 1)));
-        }
-        EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x54); // push r12
-        EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x55); // push r13
-        EmitByte(code, ref offset, 0x49); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xE4); // mov r12, rsp
-        EmitByte(code, ref offset, 0x49); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xCD); // mov r13, rcx
-        EmitByte(code, ref offset, 0x65); EmitByte(code, ref offset, 0x48); // mov rax, gs:[8]
-        EmitByte(code, ref offset, 0x8B); EmitByte(code, ref offset, 0x04); EmitByte(code, ref offset, 0x25);
-        EmitUInt32(code, ref offset, 8u);
-        EmitByte(code, ref offset, 0x49); EmitByte(code, ref offset, 0x39); EmitByte(code, ref offset, 0xC4); // cmp r12, rax
-        EmitByte(code, ref offset, 0x0F); EmitByte(code, ref offset, 0x83); // jae guestStack
-        int aboveStackJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-        EmitByte(code, ref offset, 0x65); EmitByte(code, ref offset, 0x48); // mov rax, gs:[0x10]
-        EmitByte(code, ref offset, 0x8B); EmitByte(code, ref offset, 0x04); EmitByte(code, ref offset, 0x25);
-        EmitUInt32(code, ref offset, 0x10u);
-        EmitByte(code, ref offset, 0x49); EmitByte(code, ref offset, 0x39); EmitByte(code, ref offset, 0xC4); // cmp r12, rax
-        EmitByte(code, ref offset, 0x0F); EmitByte(code, ref offset, 0x82); // jb guestStack
-        int belowStackJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xEC); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0x4C); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xE9); // mov rcx, r13
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0xB8);
-        *(nint*)(code + offset) = managedCallback;
-        offset += sizeof(nint);
-        EmitByte(code, ref offset, 0xFF); EmitByte(code, ref offset, 0xD0);
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xC4); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0xE9);
-        int hostRestoreJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-
-        int guestStackOffset = offset;
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xEC); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0xB9);
-        EmitUInt32(code, ref offset, hostRspSwitchTlsSlot);
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0xB8);
-        *(nint*)(code + offset) = tlsGetValueAddress;
-        offset += sizeof(nint);
-        EmitByte(code, ref offset, 0xFF); EmitByte(code, ref offset, 0xD0);
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xC4); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x85); EmitByte(code, ref offset, 0xC0); // test rax, rax
-        EmitByte(code, ref offset, 0x0F); EmitByte(code, ref offset, 0x84);
-        int missingTlsJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-        EmitByte(code, ref offset, 0x4C); EmitByte(code, ref offset, 0x8B); EmitByte(code, ref offset, 0x18); // mov r11, [rax]
-        EmitByte(code, ref offset, 0x4D); EmitByte(code, ref offset, 0x85); EmitByte(code, ref offset, 0xDB); // test r11, r11
-        EmitByte(code, ref offset, 0x0F); EmitByte(code, ref offset, 0x84);
-        int missingHostStackJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-        EmitByte(code, ref offset, 0x4C); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xDC); // mov rsp, r11
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xEC); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0x4C); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xE9); // mov rcx, r13
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0xB8);
-        *(nint*)(code + offset) = managedCallback;
-        offset += sizeof(nint);
-        EmitByte(code, ref offset, 0xFF); EmitByte(code, ref offset, 0xD0);
-        EmitByte(code, ref offset, 0x48); EmitByte(code, ref offset, 0x83); EmitByte(code, ref offset, 0xC4); EmitByte(code, ref offset, 0x28);
-        EmitByte(code, ref offset, 0xE9);
-        int guestRestoreJump = offset;
-        EmitUInt32(code, ref offset, 0u);
-
-        int passThroughOffset = offset;
-        EmitByte(code, ref offset, 0x31); EmitByte(code, ref offset, 0xC0); // xor eax, eax
-        int restoreOffset = offset;
-        EmitByte(code, ref offset, 0x4C); EmitByte(code, ref offset, 0x89); EmitByte(code, ref offset, 0xE4); // mov rsp, r12
-        EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x5D);
-        EmitByte(code, ref offset, 0x41); EmitByte(code, ref offset, 0x5C);
-        EmitByte(code, ref offset, 0xC3);
-
-        *(int*)(code + aboveStackJump) = guestStackOffset - (aboveStackJump + sizeof(int));
-        *(int*)(code + belowStackJump) = guestStackOffset - (belowStackJump + sizeof(int));
-        *(int*)(code + hostRestoreJump) = restoreOffset - (hostRestoreJump + sizeof(int));
-        *(int*)(code + missingTlsJump) = passThroughOffset - (missingTlsJump + sizeof(int));
-        *(int*)(code + missingHostStackJump) = passThroughOffset - (missingHostStackJump + sizeof(int));
-        *(int*)(code + guestRestoreJump) = restoreOffset - (guestRestoreJump + sizeof(int));
-
-        if (!_memory.Protect((ulong)ptr, stubSize, HostPageProtection.ReadExecute, out _))
-        {
-            Console.Error.WriteLine($"[LOADER][ERROR] VirtualProtect failed for exception handler trampoline at 0x{(nint)ptr:X16}");
-            _ = _memory.Free((ulong)ptr);
-            return 0;
-        }
-        _memory.FlushInstructionCache((ulong)ptr, (ulong)offset);
-        return (nint)ptr;
-    }
-
-    public void FreeThunk(nint thunk)
-    {
-        _ = _memory.Free((ulong)thunk);
-    }
-
-    public nint AddFirstChanceHandler(nint thunk)
-    {
-        return (nint)AddVectoredExceptionHandler(1u, thunk);
-    }
-
-    public void RemoveHandler(nint handle)
-    {
-        _ = RemoveVectoredExceptionHandler((void*)handle);
-    }
-
-    public void SetUnhandledFilter(nint thunk)
-    {
-        _ = SetUnhandledExceptionFilter(thunk);
-    }
-
-    private static void EmitByte(byte* code, ref int offset, byte value)
-    {
-        code[offset++] = value;
-    }
-
-    private static void EmitUInt32(byte* code, ref int offset, uint value)
-    {
-        *(uint*)(code + offset) = value;
-        offset += sizeof(uint);
-    }
-
-    [LibraryImport("kernel32.dll")]
-    private static partial void* AddVectoredExceptionHandler(uint first, IntPtr handler);
-
-    [LibraryImport("kernel32.dll")]
-    private static partial uint RemoveVectoredExceptionHandler(void* handle);
-
-    [LibraryImport("kernel32.dll")]
-    private static partial IntPtr SetUnhandledExceptionFilter(IntPtr lpTopLevelExceptionFilter);
-}

src/SharpEmu.Core/Cpu/TrackedCpuMemory.cs

@@ -5,7 +5,7 @@ using SharpEmu.HLE;
 
 namespace SharpEmu.Core.Cpu;
 
-public sealed class TrackedCpuMemory : ICpuMemory, ITrackedCpuMemory, IGuestMemoryAllocator, ICpuMemoryWrapper
+public sealed class TrackedCpuMemory : ICpuMemory, ITrackedCpuMemory, IGuestMemoryAllocator
 {
     private readonly ICpuMemory _inner;
 
@@ -50,9 +50,4 @@ public sealed class TrackedCpuMemory : ICpuMemory, ITrackedCpuMemory, IGuestMemo
         address = 0;
         return false;
     }
-
-    public bool TryFreeGuestMemory(ulong address)
-    {
-        return _inner is IGuestMemoryAllocator allocator && allocator.TryFreeGuestMemory(address);
-    }
 }

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/ProgramHeader.cs

@@ -48,8 +48,6 @@ public enum ProgramHeaderType : uint
 
     Tls = 7,
 
-    GnuEhFrame = 0x6474E550,
-
     SceRela = 0x60000000,
 
     SceProcParam = 0x61000001,

src/SharpEmu.Core/Loader/SelfImage.cs

@@ -24,10 +24,7 @@ public sealed class SelfImage
         ulong procParamAddress = 0,
         string? title = null,
         string? titleId = null,
-        string? version = null,
-        uint tlsModuleId = 0,
-        ulong tlsMemorySize = 0,
-        ulong tlsStaticOffset = 0)
+        string? version = null)
     {
         ArgumentNullException.ThrowIfNull(programHeaders);
         ArgumentNullException.ThrowIfNull(mappedRegions);
@@ -47,9 +44,6 @@ public sealed class SelfImage
         Title = title;
         TitleId = titleId;
         Version = version;
-        TlsModuleId = tlsModuleId;
-        TlsMemorySize = tlsMemorySize;
-        TlsStaticOffset = tlsStaticOffset;
     }
 
     public bool IsSelf { get; }
@@ -81,11 +75,4 @@ public sealed class SelfImage
     public string? TitleId { get; }
 
     public string? Version { get; }
-
-    public uint TlsModuleId { get; }
-
-    public ulong TlsMemorySize { get; }
-
-    /// <summary>Variant II distance from the thread pointer to this module's static TLS base.</summary>
-    public ulong TlsStaticOffset { get; }
 }

src/SharpEmu.Core/Loader/SelfLoader.cs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 using System.Buffers.Binary;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -16,9 +15,7 @@ namespace SharpEmu.Core.Loader;
 
 public sealed class SelfLoader : ISelfLoader
 {
-    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;
@@ -57,22 +54,11 @@ public sealed class SelfLoader : ISelfLoader
     private const long DtSceSymTab = 0x61000039;
     private const long DtSceSymTabSize = 0x6100003F;
 
-    private const uint RelocationTypeNone = 0;
     private const uint RelocationTypeAbsolute64 = 1;
-    private const uint RelocationTypePc32 = 2;
-    private const uint RelocationTypePlt32 = 4;
     private const uint RelocationTypeGlobalData = 6;
     private const uint RelocationTypeJumpSlot = 7;
     private const uint RelocationTypeRelative = 8;
-    private const uint RelocationTypeUnsigned32 = 10;
-    private const uint RelocationTypeSigned32 = 11;
-    private const uint RelocationTypeTlsModuleId = 16;   // R_X86_64_DTPMOD64
-    private const uint RelocationTypeTlsDtpOff64 = 17;    // R_X86_64_DTPOFF64
-    private const uint RelocationTypeTlsTpOff64 = 18;     // R_X86_64_TPOFF64
-    private const uint RelocationTypePc64 = 24;
-    private const uint RelocationTypeSize32 = 32;
-    private const uint RelocationTypeSize64 = 33;
-    private const uint RelocationTypeRelative64 = 38;
+    private const uint RelocationTypeTlsModuleId = 16;
     private const ulong Ps5MainImageBase = 0x0000000800000000UL;
     private const ulong Ps4MainImageBase = 0x0000000000400000UL;
     private const ulong Ps5ModuleSearchStart = 0x0000000804000000UL;
@@ -98,11 +84,6 @@ public sealed class SelfLoader : ISelfLoader
     private static readonly int SelfSegmentSize = Unsafe.SizeOf<SelfSegment>();
     private static readonly int ProgramHeaderSize = Unsafe.SizeOf<ProgramHeader>();
 
-    static SelfLoader()
-    {
-        RunRelocationSelfChecks();
-    }
-
     public SelfImage Load(ReadOnlySpan<byte> imageData, IVirtualMemory virtualMemory)
     {
         return Load(imageData, virtualMemory, fs: null, mountRoot: null);
@@ -171,22 +152,16 @@ public sealed class SelfLoader : ISelfLoader
         {
             virtualMemory.Clear();
             _nextTlsModuleId = 1;
-            GuestTlsTemplate.Reset();
         }
 
+        var tlsModuleId = _nextTlsModuleId == 0 ? 1u : _nextTlsModuleId;
+        Console.Error.WriteLine($"[LOADER][TLS] load_start clear={clearVirtualMemory} next={_nextTlsModuleId} assigned={tlsModuleId}");
+
         var loadContext = ParseLayout(imageData);
         var elfHeader = ReadUnmanaged<ElfHeader>(imageData, loadContext.ElfOffset);
         ValidateElfHeader(elfHeader);
 
         var programHeaders = ParseProgramHeaders(imageData, loadContext, elfHeader);
-        var hasTlsSegment = TryGetProgramHeader(programHeaders, ProgramHeaderType.Tls, out var processTlsHeader, out _) &&
-            processTlsHeader.MemorySize != 0;
-        var tlsModuleId = hasTlsSegment
-            ? (_nextTlsModuleId == 0 ? 1u : _nextTlsModuleId)
-            : 0u;
-        Console.Error.WriteLine(
-            $"[LOADER][TLS] load_start clear={clearVirtualMemory} next={_nextTlsModuleId} " +
-            $"assigned={tlsModuleId} has_pt_tls={hasTlsSegment}");
 
         var totalImageSize = CalculateTotalImageSize(programHeaders);
         Console.WriteLine($"Total image size needed: 0x{totalImageSize:X} ({totalImageSize} bytes)");
@@ -199,9 +174,8 @@ public sealed class SelfLoader : ISelfLoader
             {
                 if (!physicalVm.TryAllocateAtExact(imageBase, totalImageSize, executable: true, out var allocatedBase))
                 {
-                    var reason = physicalVm.DescribeAddressForDiagnostics(imageBase);
                     throw new InvalidOperationException(
-                        $"Could not allocate main image at required base 0x{imageBase:X16} (size=0x{totalImageSize:X}): {reason}.");
+                        $"Could not allocate main image at required base 0x{imageBase:X16} (size=0x{totalImageSize:X}).");
                 }
 
                 imageBase = allocatedBase;
@@ -220,13 +194,6 @@ public sealed class SelfLoader : ISelfLoader
         }
 
         MapLoadSegments(imageData, loadContext, programHeaders, virtualMemory, imageBase);
-        // Register every module before relocations so DTPMOD/DTPOFF/TPOFF use
-        // the module's real PT_TLS identity and Variant II static offset.
-        var tlsInfo = RegisterModuleTlsTemplate(
-            programHeaders,
-            virtualMemory,
-            imageBase,
-            tlsModuleId);
         var importStubs = ResolveAndPatchImportStubs(
             imageData,
             loadContext,
@@ -284,7 +251,7 @@ public sealed class SelfLoader : ISelfLoader
             Console.WriteLine($"[LOADER] PH[{i}]: type={ph.HeaderType}, vaddr=0x{ph.VirtualAddress:X16} -> 0x{ph.VirtualAddress + imageBase:X16}, memsz=0x{ph.MemorySize:X}");
         }
 
-        if (tlsModuleId != 0 && _nextTlsModuleId == tlsModuleId && _nextTlsModuleId < uint.MaxValue)
+        if (_nextTlsModuleId == tlsModuleId && _nextTlsModuleId < uint.MaxValue)
         {
             _nextTlsModuleId++;
         }
@@ -305,10 +272,7 @@ public sealed class SelfLoader : ISelfLoader
             procParamAddress,
             applicationInfo.Title,
             applicationInfo.TitleId,
-            applicationInfo.Version,
-            tlsModuleId,
-            tlsInfo.MemorySize,
-            tlsInfo.StaticOffset);
+            applicationInfo.Version);
     }
 
     private static (string? Title, string? TitleId, string? Version) TryLoadParamJson(
@@ -357,11 +321,10 @@ 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)
+            if (!selfHeader.HasKnownLayout || selfHeader.Unknown != 0x22)
             {
                 throw new InvalidDataException("SELF header signature is not recognized.");
             }
@@ -380,19 +343,6 @@ public sealed class SelfLoader : ISelfLoader
             return new LoadContext(IsSelf: true, elfOffset, selfHeader.FileSize, segments);
         }
 
-        // Not a recognized (fake-signed) SELF. Only a bare, decrypted ELF is
-        // acceptable here; anything else — most commonly a still-encrypted
-        // retail eboot — must be reported clearly rather than failing later
-        // with an opaque "not a valid ELF header" message.
-        if (magic != ElfMagic)
-        {
-            throw new InvalidDataException(
-                $"Image is neither a decrypted ELF nor a recognized fake-signed SELF " +
-                $"(leading bytes 0x{magic:X8}). This is almost certainly a still-encrypted " +
-                $"retail eboot — SharpEmu has no decryption keys and requires a decrypted / " +
-                $"fake-signed (fSELF) image.");
-        }
-
         return new LoadContext(IsSelf: false, ElfOffset: 0, SelfFileSize: 0, Array.Empty<SelfSegment>());
     }
 
@@ -504,43 +454,6 @@ public sealed class SelfLoader : ISelfLoader
         return 0;
     }
 
-    private static ModuleTlsInfo RegisterModuleTlsTemplate(
-        IReadOnlyList<ProgramHeader> programHeaders,
-        IVirtualMemory virtualMemory,
-        ulong imageBase,
-        uint tlsModuleId)
-    {
-        if (!TryGetProgramHeader(programHeaders, ProgramHeaderType.Tls, out var tlsHeader, out _) ||
-            tlsHeader.MemorySize == 0)
-        {
-            return default;
-        }
-
-        // tdata (initialized) bytes come from the mapped segment; tbss is the
-        // implicitly-zero remainder up to MemorySize.
-        var fileSize = (int)Math.Min(tlsHeader.FileSize, tlsHeader.MemorySize);
-        var initImage = fileSize > 0 ? new byte[fileSize] : [];
-        if (fileSize > 0 &&
-            !virtualMemory.TryRead(imageBase + tlsHeader.VirtualAddress, initImage))
-        {
-            Console.Error.WriteLine(
-                $"[LOADER][TLS] Failed to read TLS init image at 0x{imageBase + tlsHeader.VirtualAddress:X}; seeding zeros.");
-            initImage = [];
-        }
-
-        var staticOffset = GuestTlsTemplate.RegisterModule(
-            tlsModuleId,
-            initImage,
-            tlsHeader.MemorySize,
-            tlsHeader.Alignment,
-            tlsHeader.VirtualAddress);
-        Console.Error.WriteLine(
-            $"[LOADER][TLS] Module {tlsModuleId} TLS template: memsz=0x{tlsHeader.MemorySize:X} " +
-            $"filesz=0x{tlsHeader.FileSize:X} align=0x{tlsHeader.Alignment:X} " +
-            $"static_offset=0x{staticOffset:X} total_static=0x{GuestTlsTemplate.StaticTlsSize:X}");
-        return new ModuleTlsInfo(tlsHeader.MemorySize, staticOffset);
-    }
-
     private static IReadOnlyDictionary<ulong, string> ResolveAndPatchImportStubs(
         ReadOnlySpan<byte> imageData,
         LoadContext loadContext,
@@ -620,17 +533,12 @@ public sealed class SelfLoader : ISelfLoader
         uint maxSymbolIndex = 0;
         foreach (var relocation in relocations)
         {
-            if (relocation.Type == RelocationTypeNone)
-            {
-                continue;
-            }
-
             if (!IsSupportedRelocationType(relocation.Type))
             {
                 continue;
             }
 
-            if (relocation.Type is RelocationTypeNone or RelocationTypeRelative or RelocationTypeRelative64 or RelocationTypeTlsModuleId)
+            if (relocation.Type is RelocationTypeRelative or RelocationTypeTlsModuleId)
             {
                 continue;
             }
@@ -714,16 +622,13 @@ public sealed class SelfLoader : ISelfLoader
 
         importedRelocations = BuildImportedRelocations(descriptors);
 
-        var stubImportNids = orderedImportNids
-            .Where(nid => ShouldCreateImportStub(nid, descriptors, moduleManager))
-            .ToArray();
-        var stubsByAddress = CreateImportStubMapping(virtualMemory, stubImportNids);
+        var stubsByAddress = CreateImportStubMapping(virtualMemory, orderedImportNids);
         Console.WriteLine($"[LOADER] Created {stubsByAddress.Count} import stubs");
 
-        int printCount = Math.Min(10, stubImportNids.Length);
+        int printCount = Math.Min(10, orderedImportNids.Count);
         for (int i = 0; i < printCount; i++)
         {
-            var nid = stubImportNids[i];
+            var nid = orderedImportNids[i];
             var addr = stubsByAddress.First(x => x.Value == nid).Key;
         }
 
@@ -747,41 +652,22 @@ public sealed class SelfLoader : ISelfLoader
 
         foreach (var descriptor in descriptors)
         {
-            ulong symbolValue;
+            ulong targetValue;
             if (descriptor.ImportNid is null)
             {
-                symbolValue = descriptor.SymbolValue;
+                targetValue = AddSigned(descriptor.SymbolValue, descriptor.Addend);
             }
             else
             {
-                if (addressesByNid.TryGetValue(descriptor.ImportNid, out var stubAddress))
-                {
-                    symbolValue = stubAddress;
-                }
-                else if (descriptor.IsWeak)
-                {
-                    // ELF unresolved weak definitions use S=0. They must not
-                    // receive a trap import stub, which would turn a permitted
-                    // null test into a call to an unresolved-import handler.
-                    symbolValue = 0;
-                }
-                else
+                if (!addressesByNid.TryGetValue(descriptor.ImportNid, out var stubAddress))
                 {
                     throw new InvalidOperationException($"Import stub not found for NID '{descriptor.ImportNid}'.");
                 }
+
+                targetValue = AddSigned(stubAddress, descriptor.Addend);
             }
 
-            var targetValue = ComputeRelocationValue(descriptor, symbolValue);
-
-            if (targetValue < 0x1000 && descriptor.ValueKind is
-                RelocationValueKind.TlsOffset or
-                RelocationValueKind.PcRelative or
-                RelocationValueKind.SymbolSize)
-            {
-                // A TLS offset (TPOFF64/DTPOFF64) is a signed displacement, not a
-                // mapped address, so a small or negative value here is expected.
-            }
-            else if (targetValue < 0x1000 && !descriptor.IsWeak)
+            if (targetValue < 0x1000)
             {
                 if (descriptor.ValueKind == RelocationValueKind.TlsModuleId)
                 {
@@ -795,10 +681,9 @@ public sealed class SelfLoader : ISelfLoader
                 }
             }
 
-            if (!TryWriteRelocationValue(virtualMemory, descriptor, targetValue, out var writeError))
+            if (!TryWriteUInt64(virtualMemory, descriptor.TargetAddress, targetValue))
             {
-                throw new InvalidDataException(
-                    $"Failed to patch relocation at 0x{descriptor.TargetAddress:X16}: {writeError}");
+                throw new InvalidDataException($"Failed to patch relocation at 0x{descriptor.TargetAddress:X16}.");
             }
 
             if (descriptor.TargetAddress >= 0x00000008030FC300UL &&
@@ -904,21 +789,14 @@ public sealed class SelfLoader : ISelfLoader
 
             if (!IsSupportedRelocationType(relocation.Type))
             {
-                // Surface unsupported relocation types loudly instead of
-                // skipping silently: TLS-relative (17/18), COPY (5), and
-                // IRELATIVE/ifunc (37) leave their targets unrelocated, which
-                // manifests later as reads of zero or calls into address 0.
-                ReportUnsupportedRelocation(relocation.Type, relocation.Offset, imageBase);
-                if (relocation.Type is 5 or 37)
+                if (IsFocusRelocationOffset(relocation.Offset, imageBase))
                 {
-                    throw new NotSupportedException(
-                        $"Relocation type {relocation.Type} requires deferred runtime-linker processing.");
+                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] unsupported type={relocation.Type}");
                 }
                 continue;
             }
 
-            var relocationWriteSize = GetRelocationWriteSize(relocation.Type);
-            if (!TryResolveMappedAddress(virtualMemory, relocation.Offset, imageBase, relocationWriteSize, out var targetAddress))
+            if (!TryResolveMappedAddress(virtualMemory, relocation.Offset, imageBase, sizeof(ulong), out var targetAddress))
             {
                 if (IsFocusRelocationOffset(relocation.Offset, imageBase))
                 {
@@ -927,7 +805,7 @@ public sealed class SelfLoader : ISelfLoader
                 continue;
             }
 
-            if (relocation.Type is RelocationTypeRelative or RelocationTypeRelative64)
+            if (relocation.Type == RelocationTypeRelative)
             {
                 descriptors.Add(new RelocationDescriptor(
                     targetAddress,
@@ -941,12 +819,7 @@ public sealed class SelfLoader : ISelfLoader
 
             if (relocation.Type == RelocationTypeTlsModuleId)
             {
-                if (tlsModuleId == 0)
-                {
-                    throw new InvalidDataException(
-                        $"R_X86_64_DTPMOD64 at 0x{targetAddress:X16} references a module without PT_TLS.");
-                }
-                var dtpmodValue = tlsModuleId;
+                var dtpmodValue = tlsModuleId == 0 ? 1u : tlsModuleId;
                 descriptors.Add(new RelocationDescriptor(
                     targetAddress,
                     0,
@@ -972,95 +845,47 @@ public sealed class SelfLoader : ISelfLoader
                 continue;
             }
 
-            if (relocation.Type is RelocationTypeTlsDtpOff64 or RelocationTypeTlsTpOff64)
-            {
-                // Variant II static TLS: the module block sits at
-                // [tp - blockSize, tp). DTPOFF64 is the module-relative offset
-                // (st_value + addend); TPOFF64 is that offset expressed relative
-                // to the thread pointer, i.e. minus the aligned block size.
-                var tlsSymbolOffset = AddSigned(symbol.Value, relocation.Addend);
-                if (!GuestTlsTemplate.TryGetStaticOffset(tlsModuleId, out var moduleStaticOffset))
-                {
-                    Console.Error.WriteLine(
-                        $"[LOADER][TLS] Missing PT_TLS registration for module {tlsModuleId}; " +
-                        $"cannot apply relocation {relocation.Type} at 0x{targetAddress:X16}.");
-                    continue;
-                }
-                var tlsValue = relocation.Type == RelocationTypeTlsTpOff64
-                    ? unchecked(tlsSymbolOffset - moduleStaticOffset)
-                    : tlsSymbolOffset;
-                descriptors.Add(new RelocationDescriptor(
-                    targetAddress,
-                    0,
-                    null,
-                    tlsValue,
-                    RelocationValueKind.TlsOffset,
-                    IsDataImport: false));
-                continue;
-            }
-
+            var addend = relocation.Type is RelocationTypeGlobalData or RelocationTypeJumpSlot ? 0 : relocation.Addend;
             var symbolBind = GetSymbolBind(symbol.Info);
-            if (symbolIndex == 0)
-            {
-                descriptors.Add(CreateSymbolRelocationDescriptor(
-                    relocation,
-                    targetAddress,
-                    symbol,
-                    symbolAddress: 0,
-                    importNid: null,
-                    isWeak: false));
-                continue;
-            }
-
             if (symbolBind == SymbolBindLocal)
             {
-                var symbolAddress = relocation.Type is RelocationTypeSize32 or RelocationTypeSize64
-                    ? 0
-                    : ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
+                var symbolAddress = ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
                 if (symbolAddress == 0)
                 {
-                    if (relocation.Type is not (RelocationTypeSize32 or RelocationTypeSize64))
-                    {
-                        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;
-                    }
+                    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(CreateSymbolRelocationDescriptor(
-                    relocation,
+                descriptors.Add(new RelocationDescriptor(
                     targetAddress,
-                    symbol,
+                    addend,
+                    null,
                     symbolAddress,
-                    importNid: null,
-                    isWeak: false));
+                    RelocationValueKind.Pointer,
+                    IsDataImport: false));
                 continue;
             }
 
             if (symbol.Value != 0)
             {
-                var symbolAddress = relocation.Type is RelocationTypeSize32 or RelocationTypeSize64
-                    ? 0
-                    : ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
+                var symbolAddress = ResolveMappedAddressOrFallback(virtualMemory, symbol.Value, imageBase);
                 if (symbolAddress == 0)
                 {
-                    if (relocation.Type is not (RelocationTypeSize32 or RelocationTypeSize64))
-                    {
-                        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;
-                    }
+                    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(CreateSymbolRelocationDescriptor(
-                    relocation,
+                descriptors.Add(new RelocationDescriptor(
                     targetAddress,
-                    symbol,
+                    addend,
+                    null,
                     symbolAddress,
-                    importNid: null,
-                    isWeak: false));
+                    RelocationValueKind.Pointer,
+                    IsDataImport: false));
                 continue;
             }
 
@@ -1075,16 +900,6 @@ public sealed class SelfLoader : ISelfLoader
 
             if (!TryReadNullTerminatedAscii(stringTable, symbol.NameOffset, out var symbolName))
             {
-                if (symbolBind == SymbolBindWeak)
-                {
-                    descriptors.Add(CreateSymbolRelocationDescriptor(
-                        relocation,
-                        targetAddress,
-                        symbol,
-                        symbolAddress: 0,
-                        importNid: null,
-                        isWeak: true));
-                }
                 if (targetAddress >= FocusRelocGuestStart && targetAddress <= FocusRelocGuestEnd)
                 {
                     Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] symbol name read failed offset={symbol.NameOffset}");
@@ -1095,16 +910,6 @@ public sealed class SelfLoader : ISelfLoader
             var nid = ExtractNid(symbolName);
             if (string.IsNullOrWhiteSpace(nid))
             {
-                if (symbolBind == SymbolBindWeak)
-                {
-                    descriptors.Add(CreateSymbolRelocationDescriptor(
-                        relocation,
-                        targetAddress,
-                        symbol,
-                        symbolAddress: 0,
-                        importNid: null,
-                        isWeak: true));
-                }
                 continue;
             }
 
@@ -1113,74 +918,16 @@ public sealed class SelfLoader : ISelfLoader
                 orderedImportNids.Add(nid);
             }
 
-            descriptors.Add(CreateSymbolRelocationDescriptor(
-                relocation,
+            descriptors.Add(new RelocationDescriptor(
                 targetAddress,
-                symbol,
-                symbolAddress: 0,
-                importNid: nid,
-                isWeak: symbolBind == SymbolBindWeak));
+                addend,
+                nid,
+                0,
+                RelocationValueKind.Pointer,
+                IsDataImport: GetSymbolType(symbol.Info) == SymbolTypeObject));
         }
     }
 
-    private static RelocationDescriptor CreateSymbolRelocationDescriptor(
-        ElfRelocation relocation,
-        ulong targetAddress,
-        ElfSymbol symbol,
-        ulong symbolAddress,
-        string? importNid,
-        bool isWeak)
-    {
-        var valueKind = relocation.Type switch
-        {
-            RelocationTypePc32 or RelocationTypePlt32 or RelocationTypePc64 => RelocationValueKind.PcRelative,
-            RelocationTypeSize32 or RelocationTypeSize64 => RelocationValueKind.SymbolSize,
-            _ => RelocationValueKind.Pointer,
-        };
-        var writeKind = relocation.Type switch
-        {
-            RelocationTypePc32 or RelocationTypePlt32 or RelocationTypeSigned32 => RelocationWriteKind.Int32,
-            RelocationTypeUnsigned32 or RelocationTypeSize32 => RelocationWriteKind.UInt32,
-            _ => RelocationWriteKind.UInt64,
-        };
-        var symbolValue = valueKind == RelocationValueKind.SymbolSize
-            ? symbol.Size
-            : symbolAddress;
-        var addend = relocation.Type is RelocationTypeGlobalData or RelocationTypeJumpSlot
-            ? 0
-            : relocation.Addend;
-        return new RelocationDescriptor(
-            targetAddress,
-            addend,
-            importNid,
-            symbolValue,
-            valueKind,
-            IsDataImport: GetSymbolType(symbol.Info) == SymbolTypeObject,
-            writeKind,
-            isWeak);
-    }
-
-    private static bool ShouldCreateImportStub(
-        string nid,
-        IReadOnlyList<RelocationDescriptor> descriptors,
-        IModuleManager? moduleManager)
-    {
-        for (var i = 0; i < descriptors.Count; i++)
-        {
-            var descriptor = descriptors[i];
-            if (!string.Equals(descriptor.ImportNid, nid, StringComparison.Ordinal))
-            {
-                continue;
-            }
-            if (!descriptor.IsWeak || moduleManager?.TryGetExport(nid, out _) == true)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private static void RegisterRuntimeSymbolsAndHooks(
         ReadOnlySpan<byte> imageData,
         LoadContext loadContext,
@@ -1935,51 +1682,11 @@ public sealed class SelfLoader : ISelfLoader
     private static bool IsSupportedRelocationType(uint relocationType)
     {
         return relocationType is
-            RelocationTypeNone or
             RelocationTypeAbsolute64 or
-            RelocationTypePc32 or
-            RelocationTypePlt32 or
             RelocationTypeGlobalData or
             RelocationTypeJumpSlot or
             RelocationTypeRelative or
-            RelocationTypeUnsigned32 or
-            RelocationTypeSigned32 or
-            RelocationTypeTlsModuleId or
-            RelocationTypeTlsDtpOff64 or
-            RelocationTypeTlsTpOff64 or
-            RelocationTypePc64 or
-            RelocationTypeSize32 or
-            RelocationTypeSize64 or
-            RelocationTypeRelative64;
-    }
-
-    private static readonly HashSet<uint> _reportedUnsupportedRelocationTypes = new();
-
-    private static void ReportUnsupportedRelocation(uint relocationType, ulong offset, ulong imageBase)
-    {
-        // Report each distinct unsupported type once to keep the log useful.
-        lock (_reportedUnsupportedRelocationTypes)
-        {
-            if (!_reportedUnsupportedRelocationTypes.Add(relocationType))
-            {
-                if (IsFocusRelocationOffset(offset, imageBase))
-                {
-                    Console.Error.WriteLine($"[LOADER][FOCUS][SKIP] unsupported type={relocationType}");
-                }
-
-                return;
-            }
-        }
-
-        var name = relocationType switch
-        {
-            5 => "R_X86_64_COPY",
-            37 => "R_X86_64_IRELATIVE (ifunc)",
-            _ => "unknown",
-        };
-        Console.Error.WriteLine(
-            $"[LOADER][ERROR] Unsupported relocation type {relocationType} ({name}) rejected " +
-            $"(first at off=0x{offset:X16}); COPY requires dependency symbol storage and IRELATIVE requires resolver execution.");
+            RelocationTypeTlsModuleId;
     }
 
     private static ulong DetermineRequestedImageBase(
@@ -2333,106 +2040,6 @@ public sealed class SelfLoader : ISelfLoader
         return virtualMemory.TryWrite(address, buffer);
     }
 
-    private static ulong ComputeRelocationValue(RelocationDescriptor descriptor, ulong resolvedSymbolValue)
-    {
-        var baseValue = descriptor.ValueKind == RelocationValueKind.SymbolSize
-            ? descriptor.SymbolValue
-            : resolvedSymbolValue;
-        var value = AddSigned(baseValue, descriptor.Addend);
-        return descriptor.ValueKind == RelocationValueKind.PcRelative
-            ? unchecked(value - descriptor.TargetAddress)
-            : value;
-    }
-
-    private static bool TryWriteRelocationValue(
-        IVirtualMemory virtualMemory,
-        RelocationDescriptor descriptor,
-        ulong value,
-        out string? error)
-    {
-        Span<byte> buffer = stackalloc byte[sizeof(ulong)];
-        var length = sizeof(ulong);
-        switch (descriptor.WriteKind)
-        {
-            case RelocationWriteKind.UInt64:
-                BinaryPrimitives.WriteUInt64LittleEndian(buffer, value);
-                break;
-
-            case RelocationWriteKind.UInt32:
-                if (value > uint.MaxValue)
-                {
-                    error = $"value 0x{value:X16} overflows an unsigned 32-bit relocation";
-                    return false;
-                }
-                BinaryPrimitives.WriteUInt32LittleEndian(buffer, (uint)value);
-                length = sizeof(uint);
-                break;
-
-            case RelocationWriteKind.Int32:
-                var signedValue = unchecked((long)value);
-                if (signedValue is < int.MinValue or > int.MaxValue)
-                {
-                    error = $"value {signedValue} overflows a signed 32-bit relocation";
-                    return false;
-                }
-                BinaryPrimitives.WriteInt32LittleEndian(buffer, (int)signedValue);
-                length = sizeof(int);
-                break;
-
-            default:
-                error = $"unknown relocation write kind {descriptor.WriteKind}";
-                return false;
-        }
-
-        error = virtualMemory.TryWrite(descriptor.TargetAddress, buffer[..length])
-            ? null
-            : "target memory is not writable";
-        return error is null;
-    }
-
-    private static int GetRelocationWriteSize(uint relocationType)
-    {
-        return relocationType is
-            RelocationTypePc32 or
-            RelocationTypePlt32 or
-            RelocationTypeUnsigned32 or
-            RelocationTypeSigned32 or
-            RelocationTypeSize32
-                ? sizeof(uint)
-                : sizeof(ulong);
-    }
-
-    [Conditional("DEBUG")]
-    private static void RunRelocationSelfChecks()
-    {
-        var pc32 = new RelocationDescriptor(
-            TargetAddress: 0x1000,
-            Addend: -4,
-            ImportNid: null,
-            SymbolValue: 0x1800,
-            RelocationValueKind.PcRelative,
-            IsDataImport: false,
-            RelocationWriteKind.Int32);
-        Debug.Assert(
-            unchecked((long)ComputeRelocationValue(pc32, pc32.SymbolValue)) == 0x7FC,
-            "R_X86_64_PC32 did not apply S + A - P.");
-
-        var weak = new RelocationDescriptor(
-            TargetAddress: 0x2000,
-            Addend: 7,
-            ImportNid: "weak",
-            SymbolValue: 0,
-            RelocationValueKind.Pointer,
-            IsDataImport: false,
-            IsWeak: true);
-        Debug.Assert(
-            ComputeRelocationValue(weak, resolvedSymbolValue: 0) == 7,
-            "An unresolved weak relocation did not use S=0.");
-        Debug.Assert(
-            !ShouldCreateImportStub("weak", [weak], moduleManager: null),
-            "An unresolved weak symbol incorrectly received a trap import stub.");
-    }
-
     private static ulong AlignUp(ulong value, ulong alignment)
     {
         var mask = alignment - 1;
@@ -2641,16 +2248,6 @@ public sealed class SelfLoader : ISelfLoader
         {
             throw new InvalidDataException($"Unsupported ELF program header entry size: {header.ProgramHeaderEntrySize}.");
         }
-
-        // The CPU backend executes guest instructions natively, so a non
-        // x86-64 image can only fail deep in execution with an opaque SIGILL.
-        // Catch it here with an actionable message. (EM_X86_64 == 62.)
-        const ushort ElfMachineX86_64 = 62;
-        if (header.Machine != ElfMachineX86_64)
-        {
-            throw new InvalidDataException(
-                $"Unsupported ELF machine type 0x{header.Machine:X4}; SharpEmu only runs x86-64 (EM_X86_64) images.");
-        }
     }
 
     private static unsafe T ReadUnmanaged<T>(ReadOnlySpan<byte> source, int offset)
@@ -2731,25 +2328,10 @@ public sealed class SelfLoader : ISelfLoader
         public uint Type => (uint)(Info & uint.MaxValue);
     }
 
-    private readonly record struct ModuleTlsInfo(ulong MemorySize, ulong StaticOffset);
-
     private enum RelocationValueKind : byte
     {
         Pointer = 0,
-        TlsModuleId = 1,
-        // A pre-computed TLS offset written verbatim (TPOFF64/DTPOFF64). Unlike
-        // Pointer it is a signed displacement, not a mapped address, so it is
-        // patched as-is without the low-address validity warning.
-        TlsOffset = 2,
-        PcRelative = 3,
-        SymbolSize = 4,
-    }
-
-    private enum RelocationWriteKind : byte
-    {
-        UInt64 = 0,
-        UInt32 = 1,
-        Int32 = 2,
+        TlsModuleId = 1
     }
 
     private readonly record struct RelocationDescriptor(
@@ -2758,9 +2340,7 @@ public sealed class SelfLoader : ISelfLoader
         string? ImportNid,
         ulong SymbolValue,
         RelocationValueKind ValueKind,
-        bool IsDataImport,
-        RelocationWriteKind WriteKind = RelocationWriteKind.UInt64,
-        bool IsWeak = false);
+        bool IsDataImport);
 
     private enum SelfSegmentResolveStatus
     {
@@ -2790,27 +2370,28 @@ public sealed class SelfLoader : ISelfLoader
         private readonly ushort _size2;
         private readonly ulong _fileSize;
         private readonly ushort _segmentCount;
-        private readonly ushort _flags;
+        private readonly ushort _unknown;
         private readonly uint _padding;
 
         public ushort SegmentCount => _segmentCount;
 
+        public ushort Unknown => _unknown;
+
         public ulong FileSize => _fileSize;
 
-        // Version, key type, and flags are signing metadata and vary across
-        // valid SELF images. They do not change the fixed header layout.
         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 &&
-            _ident7 == 0x12;
+            _ident7 == 0x12 &&
+            _ident8 == 0x01 &&
+            _ident9 == 0x01 &&
+            _ident10 == 0x00 &&
+            _ident11 == 0x00;
     }
 
     [StructLayout(LayoutKind.Sequential, Pack = 1)]

src/SharpEmu.Core/Memory/PhysicalVirtualMemory.cs

@@ -4,20 +4,14 @@
 using System.Runtime.InteropServices;
 using SharpEmu.Core.Loader;
 using SharpEmu.HLE;
-using SharpEmu.HLE.Host;
-using SharpEmu.Logging;
 
 namespace SharpEmu.Core.Memory;
 
-public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryAllocator, IGuestAddressSpace, IDisposable
+public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryAllocator, IDisposable
 {
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("VMEM");
-
     private readonly ReaderWriterLockSlim _gate = new(LockRecursionPolicy.SupportsRecursion);
     private readonly object _guestAllocationGate = new();
-    private readonly object _allocationSearchHintGate = new();
     private readonly List<MemoryRegion> _regions = new();
-    private readonly Dictionary<(ulong DesiredAddress, ulong Alignment, bool Executable), ulong> _allocationSearchHints = new();
     private readonly Dictionary<ulong, ProgramHeaderFlags> _pageProtections = new();
     private bool _disposed;
     private const ulong PageSize = 0x1000;
@@ -25,131 +19,39 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
     private const ulong GuestAllocationArenaSize = 0x0100_0000;
     private const ulong GuestAllocationArenaStartOffset = PageSize;
     private const ulong LargeDataReserveThreshold = 0x4000_0000UL; // 1 GiB
-    private const ulong FullCommitRegionLimit = 4UL << 30;
-    private const ulong DefaultLazyReservePrimeBytes = 0x0400_0000UL; // 64 MiB
+    private const ulong LazyReservePrimeBytes = 0x5000_0000UL; // 1.25 GiB
     private const ulong LazyReservePrimeChunkBytes = 0x0200_0000UL; // 32 MiB
 
-    // Raw Windows PAGE_* values retained for the internal region/protection
-    // bookkeeping: regions and saved old-protection values always carry the raw
-    // value of the host platform in use, and these classification helpers only
-    // ever see values this class itself assigned (see IHostMemory.ProtectRaw).
+    private const uint MEM_COMMIT = 0x1000;
+    private const uint MEM_RESERVE = 0x2000;
+    private const uint MEM_RELEASE = 0x8000;
     private const uint PAGE_EXECUTE_READ = 0x20;
     private const uint PAGE_EXECUTE_READWRITE = 0x40;
     private const uint PAGE_EXECUTE = 0x10;
     private const uint PAGE_EXECUTE_WRITECOPY = 0x80;
+    private const uint PAGE_NOACCESS = 0x01;
     private const uint PAGE_READWRITE = 0x04;
     private const uint PAGE_READONLY = 0x02;
 
-    private readonly IHostMemory _hostMemory;
     private ulong _guestAllocationArenaBase;
-    private readonly SortedDictionary<ulong, ulong> _guestAllocationFreeRanges = new();
-    private readonly Dictionary<ulong, (ulong Offset, ulong Size)> _guestAllocations = new();
-    private static readonly ulong LazyReservePrimeBytes = ResolveLazyReservePrimeBytes();
+    private ulong _guestAllocationOffset;
 
-    public PhysicalVirtualMemory(IHostMemory? hostMemory = null)
-    {
-        _hostMemory = hostMemory ?? CrossPlatformHostMemory.Instance;
-    }
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern void* VirtualAlloc(void* lpAddress, nuint dwSize, uint flAllocationType, uint flProtect);
 
-    private sealed class CrossPlatformHostMemory : IHostMemory
-    {
-        public static readonly CrossPlatformHostMemory Instance = new();
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool VirtualFree(void* lpAddress, nuint dwSize, uint dwFreeType);
 
-        public ulong Allocate(ulong desiredAddress, ulong size, HostPageProtection protection) =>
-            unchecked((ulong)HostMemory.Alloc(
-                (void*)desiredAddress,
-                (nuint)size,
-                HostMemory.MEM_RESERVE | HostMemory.MEM_COMMIT,
-                ToRawProtection(protection)));
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool VirtualProtect(void* lpAddress, nuint dwSize, uint flNewProtect, out uint lpflOldProtect);
 
-        public ulong Reserve(ulong desiredAddress, ulong size, HostPageProtection protection) =>
-            unchecked((ulong)HostMemory.Alloc(
-                (void*)desiredAddress,
-                (nuint)size,
-                HostMemory.MEM_RESERVE,
-                ToRawProtection(protection)));
+    [DllImport("kernel32.dll")]
+    private static extern nuint VirtualQuery(void* lpAddress, out MemoryBasicInformation64 lpBuffer, nuint dwLength);
 
-        public bool Commit(ulong address, ulong size, HostPageProtection protection) =>
-            HostMemory.Alloc(
-                (void*)address,
-                (nuint)size,
-                HostMemory.MEM_COMMIT,
-                ToRawProtection(protection)) != null;
-
-        public bool Free(ulong address) =>
-            HostMemory.Free((void*)address, 0, HostMemory.MEM_RELEASE);
-
-        public bool Protect(
-            ulong address,
-            ulong size,
-            HostPageProtection protection,
-            out uint rawOldProtection) =>
-            HostMemory.Protect(
-                (void*)address,
-                (nuint)size,
-                ToRawProtection(protection),
-                out rawOldProtection);
-
-        public bool ProtectRaw(
-            ulong address,
-            ulong size,
-            uint rawProtection,
-            out uint rawOldProtection) =>
-            HostMemory.Protect((void*)address, (nuint)size, rawProtection, out rawOldProtection);
-
-        public bool Query(ulong address, out HostRegionInfo info)
-        {
-            if (HostMemory.Query((void*)address, out var raw) == 0)
-            {
-                info = default;
-                return false;
-            }
-
-            var state = raw.State switch
-            {
-                HostMemory.MEM_FREE_STATE => HostRegionState.Free,
-                HostMemory.MEM_RESERVE => HostRegionState.Reserved,
-                _ => HostRegionState.Committed,
-            };
-
-            info = new HostRegionInfo(
-                raw.BaseAddress,
-                raw.AllocationBase,
-                raw.RegionSize,
-                state,
-                raw.State,
-                FromRawProtection(raw.Protect),
-                raw.Protect,
-                raw.AllocationProtect);
-            return true;
-        }
-
-        public void FlushInstructionCache(ulong address, ulong size) =>
-            HostMemory.FlushInstructionCache((void*)address, (nuint)size);
-
-        private static uint ToRawProtection(HostPageProtection protection) => protection switch
-        {
-            HostPageProtection.NoAccess => HostMemory.PAGE_NOACCESS,
-            HostPageProtection.ReadOnly => HostMemory.PAGE_READONLY,
-            HostPageProtection.ReadWrite => HostMemory.PAGE_READWRITE,
-            HostPageProtection.Execute => HostMemory.PAGE_EXECUTE,
-            HostPageProtection.ReadExecute => HostMemory.PAGE_EXECUTE_READ,
-            HostPageProtection.ReadWriteExecute => HostMemory.PAGE_EXECUTE_READWRITE,
-            HostPageProtection.ExecuteWriteCopy => 0x80,
-            _ => HostMemory.PAGE_NOACCESS,
-        };
-
-        private static HostPageProtection FromRawProtection(uint protection) => protection switch
-        {
-            HostMemory.PAGE_READONLY => HostPageProtection.ReadOnly,
-            HostMemory.PAGE_READWRITE => HostPageProtection.ReadWrite,
-            HostMemory.PAGE_EXECUTE => HostPageProtection.Execute,
-            HostMemory.PAGE_EXECUTE_READ => HostPageProtection.ReadExecute,
-            HostMemory.PAGE_EXECUTE_READWRITE => HostPageProtection.ReadWriteExecute,
-            0x80 => HostPageProtection.ExecuteWriteCopy,
-            _ => HostPageProtection.NoAccess,
-        };
-    }
+    [DllImport("kernel32.dll")]
+    private static extern void FlushInstructionCache(void* hProcess, void* lpBaseAddress, nuint dwSize);
 
     public bool TryAllocateAtExact(ulong desiredAddress, ulong size, bool executable, out ulong actualAddress)
     {
@@ -161,17 +63,17 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
 
         var alignedSize = (size + 0xFFF) & ~0xFFFUL;
         var protection = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
-        var hostProtection = executable ? HostPageProtection.ReadWriteExecute : HostPageProtection.ReadWrite;
-        var result = _hostMemory.Allocate(desiredAddress, alignedSize, hostProtection);
-        if (result == 0)
+        var allocationType = MEM_COMMIT | MEM_RESERVE;
+        var result = VirtualAlloc((void*)desiredAddress, (nuint)alignedSize, allocationType, protection);
+        if (result == null)
         {
             return false;
         }
 
-        actualAddress = result;
+        actualAddress = (ulong)result;
         if (actualAddress != desiredAddress)
         {
-            _hostMemory.Free(result);
+            VirtualFree(result, 0, MEM_RELEASE);
             actualAddress = 0;
             return false;
         }
@@ -194,28 +96,10 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         }
 
         var allocationKind = executable ? "executable memory" : "data memory";
-        TraceVmem($"Allocated exact {allocationKind}: 0x{actualAddress:X16} - 0x{actualAddress + alignedSize:X16} ({alignedSize} bytes)");
+        Console.Error.WriteLine($"[VMEM] Allocated exact {allocationKind}: 0x{actualAddress:X16} - 0x{actualAddress + alignedSize:X16} ({alignedSize} bytes)");
         return true;
     }
 
-    public string DescribeAddressForDiagnostics(ulong address)
-    {
-        if (!_hostMemory.Query(address, out var info))
-        {
-            return "unable to query host memory at this address";
-        }
-
-        return info.State switch
-        {
-            HostRegionState.Free => "address reports free, but the exact-address reservation still failed",
-            HostRegionState.Reserved =>
-                $"already reserved by another host allocation (base=0x{info.AllocationBase:X16}, size=0x{info.RegionSize:X})",
-            HostRegionState.Committed =>
-                $"already committed by another host allocation (base=0x{info.AllocationBase:X16}, size=0x{info.RegionSize:X}, protect=0x{info.RawProtection:X})",
-            _ => $"in an unexpected host state (raw=0x{info.RawState:X})",
-        };
-    }
-
     public ulong AllocateAt(ulong desiredAddress, ulong size, bool executable = true, bool allowAlternative = true)
     {
         if (size == 0)
@@ -224,66 +108,64 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         var alignedSize = (size + 0xFFF) & ~0xFFFUL;
 
         var protection = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
-        var hostProtection = executable ? HostPageProtection.ReadWriteExecute : HostPageProtection.ReadWrite;
+        var allocationType = MEM_COMMIT | MEM_RESERVE;
         var reservedOnly = false;
-        var preferReserveOnly = !executable &&
-            alignedSize >= LargeDataReserveThreshold &&
-            alignedSize > FullCommitRegionLimit;
+        var preferReserveOnly = !executable && alignedSize >= LargeDataReserveThreshold;
 
-        ulong result = 0;
+        void* result = null;
         if (preferReserveOnly)
         {
-            result = _hostMemory.Reserve(desiredAddress, alignedSize, HostPageProtection.ReadWrite);
-            if (result == 0 && allowAlternative)
+            result = VirtualAlloc((void*)desiredAddress, (nuint)alignedSize, MEM_RESERVE, PAGE_READWRITE);
+            if (result == null && allowAlternative)
             {
-                result = _hostMemory.Reserve(0, alignedSize, HostPageProtection.ReadWrite);
+                result = VirtualAlloc(null, (nuint)alignedSize, MEM_RESERVE, PAGE_READWRITE);
             }
 
-            if (result != 0)
+            if (result != null)
             {
                 reservedOnly = true;
             }
         }
 
-        if (result == 0)
+        if (result == null)
         {
-            result = _hostMemory.Allocate(desiredAddress, alignedSize, hostProtection);
+            result = VirtualAlloc((void*)desiredAddress, (nuint)alignedSize, allocationType, protection);
         }
 
-        if (result == 0)
+        if (result == null)
         {
             if (!allowAlternative)
             {
                 throw new InvalidOperationException($"Failed to allocate exact mapping at 0x{desiredAddress:X16} ({alignedSize} bytes)");
             }
 
-            TraceVmem($"Could not allocate at 0x{desiredAddress:X16}, trying any address...");
-            result = _hostMemory.Allocate(0, alignedSize, hostProtection);
+            Console.Error.WriteLine($"[VMEM] Could not allocate at 0x{desiredAddress:X16}, trying any address...");
+            result = VirtualAlloc(null, (nuint)alignedSize, allocationType, protection);
 
-            if (result == 0)
+            if (result == null)
             {
                 if (!executable)
                 {
-                    result = _hostMemory.Reserve(desiredAddress, alignedSize, HostPageProtection.ReadWrite);
-                    if (result == 0 && allowAlternative)
+                    result = VirtualAlloc((void*)desiredAddress, (nuint)alignedSize, MEM_RESERVE, PAGE_READWRITE);
+                    if (result == null && allowAlternative)
                     {
-                        result = _hostMemory.Reserve(0, alignedSize, HostPageProtection.ReadWrite);
+                        result = VirtualAlloc(null, (nuint)alignedSize, MEM_RESERVE, PAGE_READWRITE);
                     }
 
-                    if (result != 0)
+                    if (result != null)
                     {
                         reservedOnly = true;
                     }
                 }
 
-                if (result == 0)
+                if (result == null)
                 {
                     throw new OutOfMemoryException($"Failed to allocate {alignedSize} bytes of virtual memory");
                 }
             }
         }
 
-        var actualAddress = result;
+        var actualAddress = (ulong)result;
 
         var lazyPrimeState = "n/a";
         if (reservedOnly)
@@ -296,8 +178,9 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                 {
                     var remaining = primeBytes - committedBytes;
                     var chunkBytes = Math.Min(remaining, LazyReservePrimeChunkBytes);
-                    var commitAddress = actualAddress + committedBytes;
-                    if (!_hostMemory.Commit(commitAddress, chunkBytes, HostPageProtection.ReadWrite))
+                    var commitAddress = (void*)(actualAddress + committedBytes);
+                    var committed = VirtualAlloc(commitAddress, (nuint)chunkBytes, MEM_COMMIT, PAGE_READWRITE);
+                    if (committed == null)
                     {
                         break;
                     }
@@ -310,12 +193,12 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                     lazyPrimeState = committedBytes == primeBytes
                         ? $"ok:{committedBytes:X}"
                         : $"partial:{committedBytes:X}/{primeBytes:X}";
-                    TraceVmem($"Primed lazy region: 0x{actualAddress:X16} - 0x{actualAddress + committedBytes:X16} ({committedBytes} bytes)");
+                    Console.Error.WriteLine($"[VMEM] Primed lazy region: 0x{actualAddress:X16} - 0x{actualAddress + committedBytes:X16} ({committedBytes} bytes)");
                 }
                 else
                 {
                     lazyPrimeState = $"fail:{primeBytes:X}";
-                    TraceVmem($"Failed to prime lazy region at 0x{actualAddress:X16} ({primeBytes} bytes), continuing with on-demand commit");
+                    Console.Error.WriteLine($"[VMEM] Failed to prime lazy region at 0x{actualAddress:X16} ({primeBytes} bytes), continuing with on-demand commit");
                 }
             }
             else
@@ -344,7 +227,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         var allocationKind = reservedOnly
             ? "reserved data memory (lazy commit)"
             : (executable ? "executable memory" : "data memory");
-        TraceVmem($"Allocated {allocationKind}: 0x{actualAddress:X16} - 0x{actualAddress + alignedSize:X16} ({alignedSize} bytes) lazy_prime={lazyPrimeState}");
+        Console.Error.WriteLine($"[VMEM] Allocated {allocationKind}: 0x{actualAddress:X16} - 0x{actualAddress + alignedSize:X16} ({alignedSize} bytes) lazy_prime={lazyPrimeState}");
 
         return actualAddress;
     }
@@ -364,37 +247,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
 
         var alignedSize = AlignUp(size, PageSize);
         var effectiveAlignment = Math.Max(PageSize, alignment == 0 ? PageSize : alignment);
-        var requestedCursor = AlignUp(desiredAddress, effectiveAlignment);
-        var cursor = GetAllocationSearchCursor(desiredAddress, requestedCursor, effectiveAlignment, executable);
-
-        // macOS needs alignment over-allocation; Linux uses exact-address search.
-        if (OperatingSystem.IsMacOS())
-        {
-            var reserveSize = effectiveAlignment > PageSize
-                ? alignedSize + effectiveAlignment
-                : alignedSize;
-            try
-            {
-                var posixAddress = AllocateAt(cursor, reserveSize, executable, allowAlternative: true);
-                if (posixAddress != 0)
-                {
-                    var alignedBase = AlignUp(posixAddress, effectiveAlignment);
-                    if (alignedBase + alignedSize <= posixAddress + reserveSize)
-                    {
-                        actualAddress = alignedBase;
-                        UpdateAllocationSearchCursor(desiredAddress, effectiveAlignment, executable, alignedBase + alignedSize);
-                        return true;
-                    }
-
-                    ReleaseUntrackedAllocation(posixAddress);
-                }
-            }
-            catch
-            {
-            }
-
-            return false;
-        }
+        var cursor = AlignUp(desiredAddress, effectiveAlignment);
 
         for (var attempt = 0; attempt < 0x10000; attempt++)
         {
@@ -409,10 +262,18 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                 continue;
             }
 
-            if (TryAllocateAtExact(cursor, alignedSize, executable, out actualAddress))
+            try
+            {
+                actualAddress = AllocateAt(cursor, alignedSize, executable, allowAlternative: false);
+                if (actualAddress == cursor)
+                {
+                    return true;
+                }
+
+                actualAddress = 0;
+            }
+            catch
             {
-                UpdateAllocationSearchCursor(desiredAddress, effectiveAlignment, executable, actualAddress + alignedSize);
-                return true;
             }
 
             cursor = AlignUp(cursor + effectiveAlignment, effectiveAlignment);
@@ -421,28 +282,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         return false;
     }
 
-    private void ReleaseUntrackedAllocation(ulong address)
-    {
-        _gate.EnterWriteLock();
-        try
-        {
-            for (var i = 0; i < _regions.Count; i++)
-            {
-                if (_regions[i].VirtualAddress == address)
-                {
-                    _regions.RemoveAt(i);
-                    break;
-                }
-            }
-        }
-        finally
-        {
-            _gate.ExitWriteLock();
-        }
-
-        _hostMemory.Free(address);
-    }
-
     public bool TryAllocateGuestMemory(ulong size, ulong alignment, out ulong address)
     {
         address = 0;
@@ -462,9 +301,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                         GuestAllocationArenaSize,
                         executable: false,
                         allowAlternative: true);
-                    _guestAllocationFreeRanges.Add(
-                        GuestAllocationArenaStartOffset,
-                        GuestAllocationArenaSize - GuestAllocationArenaStartOffset);
+                    _guestAllocationOffset = GuestAllocationArenaStartOffset;
                 }
                 catch (Exception)
                 {
@@ -472,128 +309,18 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                 }
             }
 
-            ulong rangeOffset = 0;
-            ulong rangeSize = 0;
-            ulong alignedOffset = 0;
-            var found = false;
-            foreach (var range in _guestAllocationFreeRanges)
-            {
-                alignedOffset = AlignUp(range.Key, alignment);
-                if (alignedOffset >= range.Key &&
-                    alignedOffset - range.Key <= range.Value &&
-                    size <= range.Value - (alignedOffset - range.Key))
-                {
-                    rangeOffset = range.Key;
-                    rangeSize = range.Value;
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found)
+            var alignedOffset = AlignUp(_guestAllocationOffset, alignment);
+            if (alignedOffset > GuestAllocationArenaSize || size > GuestAllocationArenaSize - alignedOffset)
             {
                 return false;
             }
 
-            _guestAllocationFreeRanges.Remove(rangeOffset);
-            if (alignedOffset > rangeOffset)
-            {
-                _guestAllocationFreeRanges.Add(rangeOffset, alignedOffset - rangeOffset);
-            }
-
-            var allocationEnd = alignedOffset + size;
-            var rangeEnd = rangeOffset + rangeSize;
-            if (allocationEnd < rangeEnd)
-            {
-                _guestAllocationFreeRanges.Add(allocationEnd, rangeEnd - allocationEnd);
-            }
-
             address = _guestAllocationArenaBase + alignedOffset;
-            _guestAllocations.Add(address, (alignedOffset, size));
+            _guestAllocationOffset = alignedOffset + size;
             return true;
         }
     }
 
-    public bool TryFreeGuestMemory(ulong address)
-    {
-        lock (_guestAllocationGate)
-        {
-            if (!_guestAllocations.Remove(address, out var allocation))
-            {
-                return false;
-            }
-
-            var freeOffset = allocation.Offset;
-            var freeSize = allocation.Size;
-            ulong? previousOffset = null;
-            ulong? nextOffset = null;
-
-            foreach (var range in _guestAllocationFreeRanges)
-            {
-                if (range.Key < freeOffset)
-                {
-                    previousOffset = range.Key;
-                    continue;
-                }
-
-                nextOffset = range.Key;
-                break;
-            }
-
-            if (previousOffset is { } previous &&
-                previous + _guestAllocationFreeRanges[previous] == freeOffset)
-            {
-                freeOffset = previous;
-                freeSize += _guestAllocationFreeRanges[previous];
-                _guestAllocationFreeRanges.Remove(previous);
-            }
-
-            if (nextOffset is { } next && freeOffset + freeSize == next)
-            {
-                freeSize += _guestAllocationFreeRanges[next];
-                _guestAllocationFreeRanges.Remove(next);
-            }
-
-            _guestAllocationFreeRanges.Add(freeOffset, freeSize);
-            return true;
-        }
-    }
-
-    public bool TryProtect(ulong address, ulong size, GuestPageProtection protection)
-    {
-        if (size == 0)
-        {
-            return false;
-        }
-
-        return _hostMemory.Protect(address, size, ResolveProtection(protection), out _);
-    }
-
-    // Reproduces the decomposition KernelMemoryCompatExports.ResolveHostProtection
-    // performed before this seam existed; the Windows backend maps each case back
-    // to the identical PAGE_* value.
-    private static HostPageProtection ResolveProtection(GuestPageProtection protection)
-    {
-        var read = (protection & GuestPageProtection.Read) != 0;
-        var write = (protection & GuestPageProtection.Write) != 0;
-        var execute = (protection & GuestPageProtection.Execute) != 0;
-
-        if (execute)
-        {
-            return write
-                ? HostPageProtection.ReadWriteExecute
-                : read
-                    ? HostPageProtection.ReadExecute
-                    : HostPageProtection.Execute;
-        }
-
-        return write
-            ? HostPageProtection.ReadWrite
-            : read
-                ? HostPageProtection.ReadOnly
-                : HostPageProtection.NoAccess;
-    }
-
     public void Clear()
     {
         lock (_guestAllocationGate)
@@ -603,14 +330,10 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             {
                 foreach (var region in _regions)
                 {
-                    _hostMemory.Free(region.VirtualAddress);
+                    VirtualFree((void*)region.VirtualAddress, 0, MEM_RELEASE);
                 }
                 _regions.Clear();
                 _pageProtections.Clear();
-                lock (_allocationSearchHintGate)
-                {
-                    _allocationSearchHints.Clear();
-                }
             }
             finally
             {
@@ -618,8 +341,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             }
 
             _guestAllocationArenaBase = 0;
-            _guestAllocationFreeRanges.Clear();
-            _guestAllocations.Clear();
+            _guestAllocationOffset = 0;
         }
     }
 
@@ -668,7 +390,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
 
             ApplySegmentProtection(mapStart, mapEnd, protection);
 
-            TraceVmem($"Mapped segment: 0x{virtualAddress:X16} - 0x{virtualAddress + memorySize:X16} (file: {fileData.Length} bytes, prot: {protection})");
+            Console.Error.WriteLine($"[VMEM] Mapped segment: 0x{virtualAddress:X16} - 0x{virtualAddress + memorySize:X16} (file: {fileData.Length} bytes, prot: {protection})");
         }
         finally
         {
@@ -678,67 +400,46 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
 
     private void ApplySegmentProtection(ulong mapStart, ulong mapEnd, ProgramHeaderFlags flags)
     {
-        var runStart = mapStart;
-        var runFlags = ProgramHeaderFlags.None;
-        var hasRun = false;
-
         for (var pageAddress = mapStart; pageAddress < mapEnd; pageAddress += PageSize)
         {
             _pageProtections.TryGetValue(pageAddress, out var existingFlags);
             var mergedFlags = existingFlags | flags;
             _pageProtections[pageAddress] = mergedFlags;
-
-            if (!hasRun)
-            {
-                runStart = pageAddress;
-                runFlags = mergedFlags;
-                hasRun = true;
-            }
-            else if (mergedFlags != runFlags)
-            {
-                SetProtection(runStart, pageAddress - runStart, runFlags);
-                runStart = pageAddress;
-                runFlags = mergedFlags;
-            }
-        }
-
-        if (hasRun)
-        {
-            SetProtection(runStart, mapEnd - runStart, runFlags);
+            SetProtection(pageAddress, PageSize, mergedFlags);
         }
     }
 
     private void SetProtection(ulong address, ulong size, ProgramHeaderFlags flags)
     {
-        HostPageProtection protection;
+        uint protection;
 
         if (flags == ProgramHeaderFlags.None)
         {
-            protection = HostPageProtection.NoAccess;
+            protection = PAGE_NOACCESS;
         }
         else if ((flags & ProgramHeaderFlags.Execute) != 0)
         {
             protection = (flags & ProgramHeaderFlags.Write) != 0
-                ? HostPageProtection.ReadWriteExecute
-                : HostPageProtection.ReadExecute;
+                ? PAGE_EXECUTE_READWRITE
+                : PAGE_EXECUTE_READ;
         }
         else if ((flags & ProgramHeaderFlags.Write) != 0)
         {
-            protection = HostPageProtection.ReadWrite;
+            protection = PAGE_READWRITE;
         }
         else
         {
-            protection = HostPageProtection.ReadOnly;
+            protection = PAGE_READONLY;
         }
 
-        if (!_hostMemory.Protect(address, size, protection, out _))
+        if (!VirtualProtect((void*)address, (nuint)size, protection, out _))
         {
             throw new InvalidOperationException($"Failed to set memory protection at 0x{address:X16}");
         }
 
         if ((flags & ProgramHeaderFlags.Execute) != 0)
         {
-            _hostMemory.FlushInstructionCache(address, size);
+            FlushInstructionCache(null, (void*)address, (nuint)size);
         }
     }
 
@@ -830,47 +531,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;
@@ -1010,7 +670,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                 return true;
             }
 
-            if (!_hostMemory.Protect((ulong)destPtr, (ulong)source.Length, HostPageProtection.ReadWriteExecute, out var oldProtect))
+            if (!VirtualProtect(destPtr, (nuint)source.Length, PAGE_EXECUTE_READWRITE, out var oldProtect))
             {
                 return false;
             }
@@ -1024,10 +684,10 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             }
             finally
             {
-                _hostMemory.ProtectRaw((ulong)destPtr, (ulong)source.Length, oldProtect, out _);
+                VirtualProtect(destPtr, (nuint)source.Length, oldProtect, out _);
                 if (IsExecutableProtection(oldProtect))
                 {
-                    _hostMemory.FlushInstructionCache((ulong)destPtr, (ulong)source.Length);
+                    FlushInstructionCache(null, destPtr, (nuint)source.Length);
                 }
             }
 
@@ -1049,14 +709,9 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         _gate.EnterReadLock();
         try
         {
-            var region = FindRegion(virtualAddress, 1);
-            if (region is null ||
-                (region.IsReservedOnly && !EnsureRangeCommitted(virtualAddress, 1, region)))
-            {
-                return null;
-            }
-
-            return (void*)virtualAddress;
+            return FindRegion(virtualAddress, 1) is not null
+                ? (void*)virtualAddress
+                : null;
         }
         finally
         {
@@ -1138,16 +793,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             foreach (var region in _regions)
             {
                 var regionEnd = region.VirtualAddress + region.Size;
-                if (region.VirtualAddress >= end)
-                {
-                    break;
-                }
-
-                if (regionEnd <= address)
-                {
-                    continue;
-                }
-
                 if (address < regionEnd && region.VirtualAddress < end)
                 {
                     overlapEnd = Math.Max(overlapEnd, regionEnd);
@@ -1162,37 +807,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         return overlapEnd != 0;
     }
 
-    private ulong GetAllocationSearchCursor(
-        ulong desiredAddress,
-        ulong requestedCursor,
-        ulong alignment,
-        bool executable)
-    {
-        lock (_allocationSearchHintGate)
-        {
-            var key = (desiredAddress, alignment, executable);
-            if (_allocationSearchHints.TryGetValue(key, out var hintedCursor) &&
-                hintedCursor > requestedCursor)
-            {
-                return AlignUp(hintedCursor, alignment);
-            }
-        }
-
-        return requestedCursor;
-    }
-
-    private void UpdateAllocationSearchCursor(
-        ulong desiredAddress,
-        ulong alignment,
-        bool executable,
-        ulong nextCursor)
-    {
-        lock (_allocationSearchHintGate)
-        {
-            _allocationSearchHints[(desiredAddress, alignment, executable)] = AlignUp(nextCursor, alignment);
-        }
-    }
-
     private static bool TryResolveRegionOffset(ulong address, ulong size, MemoryRegion region, out ulong offset)
     {
         offset = 0;
@@ -1258,12 +872,12 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         return protection is PAGE_READWRITE or PAGE_EXECUTE_READWRITE;
     }
 
-    private static HostPageProtection GetCommitProtection(MemoryRegion region)
+    private static uint GetCommitProtection(MemoryRegion region)
     {
-        return region.IsExecutable ? HostPageProtection.ReadWriteExecute : HostPageProtection.ReadWrite;
+        return region.IsExecutable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
     }
 
-    private bool EnsureRangeCommitted(ulong address, ulong size, MemoryRegion region)
+    private static unsafe bool EnsureRangeCommitted(ulong address, ulong size, MemoryRegion region)
     {
         if (size == 0 || !region.IsReservedOnly)
         {
@@ -1277,7 +891,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         var pageAddress = startPage;
         while (pageAddress < endPage)
         {
-            if (!_hostMemory.Query(pageAddress, out var info))
+            if (VirtualQuery((void*)pageAddress, out var info, (nuint)sizeof(MemoryBasicInformation64)) == 0)
             {
                 return false;
             }
@@ -1291,19 +905,19 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                 return false;
             }
 
-            if (info.State == HostRegionState.Committed)
+            if (info.State == MEM_COMMIT)
             {
                 pageAddress = rangeEnd;
                 continue;
             }
 
-            if (info.State != HostRegionState.Reserved)
+            if (info.State != MEM_RESERVE)
             {
                 return false;
             }
 
             var commitSize = rangeEnd - pageAddress;
-            if (!_hostMemory.Commit(pageAddress, commitSize, commitProtection))
+            if (VirtualAlloc((void*)pageAddress, (nuint)commitSize, MEM_COMMIT, commitProtection) == null)
             {
                 return false;
             }
@@ -1324,11 +938,11 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
 
         var startPage = AlignDown(address, PageSize);
         var endPage = AlignUp(address + size, PageSize);
-        var temporaryProtection = region.IsExecutable ? HostPageProtection.ReadWriteExecute : HostPageProtection.ReadWrite;
+        var temporaryProtection = region.IsExecutable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
 
         for (var pageAddress = startPage; pageAddress < endPage; pageAddress += PageSize)
         {
-            if (!_hostMemory.Protect(pageAddress, PageSize, temporaryProtection, out var oldProtection))
+            if (!VirtualProtect((void*)pageAddress, (nuint)PageSize, temporaryProtection, out var oldProtection))
             {
                 RestorePageProtections(touchedPages);
                 touchedPages.Clear();
@@ -1341,11 +955,11 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         return true;
     }
 
-    private void RestorePageProtections(List<(ulong Address, uint Protection)> touchedPages)
+    private static void RestorePageProtections(List<(ulong Address, uint Protection)> touchedPages)
     {
         foreach (var (pageAddress, protection) in touchedPages)
         {
-            _hostMemory.ProtectRaw(pageAddress, PageSize, protection, out _);
+            VirtualProtect((void*)pageAddress, (nuint)PageSize, protection, out _);
         }
     }
 
@@ -1361,29 +975,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         return checked((value + mask) & ~mask);
     }
 
-    private static ulong ResolveLazyReservePrimeBytes()
-    {
-        var configured = Environment.GetEnvironmentVariable("SHARPEMU_LAZY_RESERVE_PRIME_MB");
-        if (ulong.TryParse(configured, out var megabytes))
-        {
-            return megabytes == 0
-                ? 0
-                : checked(Math.Min(megabytes, 4096UL) * 1024UL * 1024UL);
-        }
-
-        return DefaultLazyReservePrimeBytes;
-    }
-
-    private static void TraceVmem(string message)
-    {
-        if (!string.Equals(Environment.GetEnvironmentVariable("SHARPEMU_LOG_VMEM"), "1", StringComparison.Ordinal))
-        {
-            return;
-        }
-
-        Log.Debug(message);
-    }
-
     public void Dispose()
     {
         if (!_disposed)
@@ -1402,4 +993,16 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         public uint Protection { get; set; }
     }
 
+    private struct MemoryBasicInformation64
+    {
+        public ulong BaseAddress;
+        public ulong AllocationBase;
+        public uint AllocationProtect;
+        public uint Alignment1;
+        public ulong RegionSize;
+        public uint State;
+        public uint Protect;
+        public uint Type;
+        public uint Alignment2;
+    }
 }

src/SharpEmu.Core/Memory/VirtualMemory.cs

@@ -41,14 +41,15 @@ public sealed class VirtualMemory : IVirtualMemory
 
         lock (_gate)
         {
-            var insertionIndex = FindInsertionIndex(virtualAddress);
-            if ((insertionIndex > 0 && virtualAddress < _regions[insertionIndex - 1].EndAddress) ||
-                (insertionIndex < _regions.Count && endAddress > _regions[insertionIndex].Region.VirtualAddress))
+            foreach (var existing in _regions)
             {
-                throw new InvalidOperationException("Attempted to map an overlapping virtual memory region.");
+                if (virtualAddress < existing.EndAddress && endAddress > existing.Region.VirtualAddress)
+                {
+                    throw new InvalidOperationException("Attempted to map an overlapping virtual memory region.");
+                }
             }
 
-            _regions.Insert(insertionIndex, new MappedRegion(
+            _regions.Add(new MappedRegion(
                 new VirtualMemoryRegion(virtualAddress, memorySize, fileOffset, (ulong)fileData.Length, protection),
                 endAddress,
                 backingMemory));
@@ -73,12 +74,12 @@ public sealed class VirtualMemory : IVirtualMemory
     {
         lock (_gate)
         {
-            if (!TryValidateRange(virtualAddress, destination.Length, ProgramHeaderFlags.Read, out var regionIndex))
+            if (!TryResolveRegion(virtualAddress, destination.Length, out var region, out var offset))
             {
                 return false;
             }
 
-            CopyFromRegions(virtualAddress, destination, regionIndex);
+            region.BackingMemory.AsSpan(offset, destination.Length).CopyTo(destination);
             return true;
         }
     }
@@ -87,127 +88,39 @@ public sealed class VirtualMemory : IVirtualMemory
     {
         lock (_gate)
         {
-            if (!TryValidateRange(virtualAddress, source.Length, ProgramHeaderFlags.Write, out var regionIndex))
+            if (!TryResolveRegion(virtualAddress, source.Length, out var region, out var offset))
             {
                 return false;
             }
 
-            CopyToRegions(virtualAddress, source, regionIndex);
+            source.CopyTo(region.BackingMemory.AsSpan(offset, source.Length));
             return true;
         }
     }
 
-    private bool TryValidateRange(
-        ulong virtualAddress,
-        int length,
-        ProgramHeaderFlags requiredProtection,
-        out int regionIndex)
+    private bool TryResolveRegion(ulong virtualAddress, int length, out MappedRegion region, out int offset)
     {
-        regionIndex = FindContainingRegionIndex(virtualAddress);
-        if (regionIndex < 0)
+        foreach (var candidate in _regions)
         {
-            return false;
-        }
-
-        var currentAddress = virtualAddress;
-        var remaining = length;
-        var currentIndex = regionIndex;
-        while (true)
-        {
-            if (currentIndex >= _regions.Count)
+            if (virtualAddress < candidate.Region.VirtualAddress || virtualAddress >= candidate.EndAddress)
             {
-                return false;
+                continue;
             }
 
-            var region = _regions[currentIndex];
-            if (currentAddress < region.Region.VirtualAddress ||
-                currentAddress >= region.EndAddress ||
-                (region.Region.Protection & requiredProtection) == 0)
+            var candidateOffset = checked((int)(virtualAddress - candidate.Region.VirtualAddress));
+            if (candidateOffset + length > candidate.BackingMemory.Length)
             {
-                return false;
+                break;
             }
 
-            if (remaining == 0)
-            {
-                return true;
-            }
-
-            var available = region.EndAddress - currentAddress;
-            var chunkLength = (int)Math.Min((ulong)remaining, available);
-            remaining -= chunkLength;
-            if (remaining == 0)
-            {
-                return true;
-            }
-
-            currentAddress += (ulong)chunkLength;
-            currentIndex++;
-        }
-    }
-
-    private int FindContainingRegionIndex(ulong virtualAddress)
-    {
-        var insertionIndex = FindInsertionIndex(virtualAddress);
-        if (insertionIndex < _regions.Count &&
-            _regions[insertionIndex].Region.VirtualAddress == virtualAddress)
-        {
-            return insertionIndex;
+            region = candidate;
+            offset = candidateOffset;
+            return true;
         }
 
-        var candidateIndex = insertionIndex - 1;
-        return candidateIndex >= 0 && virtualAddress < _regions[candidateIndex].EndAddress
-            ? candidateIndex
-            : -1;
-    }
-
-    private void CopyFromRegions(ulong virtualAddress, Span<byte> destination, int regionIndex)
-    {
-        var copied = 0;
-        var currentAddress = virtualAddress;
-        while (copied < destination.Length)
-        {
-            var region = _regions[regionIndex++];
-            var regionOffset = checked((int)(currentAddress - region.Region.VirtualAddress));
-            var chunkLength = Math.Min(destination.Length - copied, region.BackingMemory.Length - regionOffset);
-            region.BackingMemory.AsSpan(regionOffset, chunkLength).CopyTo(destination[copied..]);
-            copied += chunkLength;
-            currentAddress += (ulong)chunkLength;
-        }
-    }
-
-    private void CopyToRegions(ulong virtualAddress, ReadOnlySpan<byte> source, int regionIndex)
-    {
-        var copied = 0;
-        var currentAddress = virtualAddress;
-        while (copied < source.Length)
-        {
-            var region = _regions[regionIndex++];
-            var regionOffset = checked((int)(currentAddress - region.Region.VirtualAddress));
-            var chunkLength = Math.Min(source.Length - copied, region.BackingMemory.Length - regionOffset);
-            source.Slice(copied, chunkLength).CopyTo(region.BackingMemory.AsSpan(regionOffset, chunkLength));
-            copied += chunkLength;
-            currentAddress += (ulong)chunkLength;
-        }
-    }
-
-    private int FindInsertionIndex(ulong virtualAddress)
-    {
-        var lower = 0;
-        var upper = _regions.Count;
-        while (lower < upper)
-        {
-            var middle = lower + ((upper - lower) / 2);
-            if (_regions[middle].Region.VirtualAddress < virtualAddress)
-            {
-                lower = middle + 1;
-            }
-            else
-            {
-                upper = middle;
-            }
-        }
-
-        return lower;
+        region = default;
+        offset = 0;
+        return false;
     }
 
     private readonly record struct MappedRegion(VirtualMemoryRegion Region, ulong EndAddress, byte[] BackingMemory);

src/SharpEmu.Core/Runtime/SharpEmuRuntime.cs

@@ -11,8 +11,6 @@ using SharpEmu.Libs.VideoOut;
 using SharpEmu.Libs.Kernel;
 using SharpEmu.Libs.AppContent;
 using SharpEmu.Libs.SaveData;
-using SharpEmu.Libs.Fiber;
-using SharpEmu.Libs.SystemService;
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,7 +20,7 @@ namespace SharpEmu.Core.Runtime;
 
 public sealed class SharpEmuRuntime : ISharpEmuRuntime
 {
-    private readonly record struct LoadedModuleImage(string Path, SelfImage Image, int Handle, bool StartAtBoot);
+    private readonly record struct LoadedModuleImage(string Path, SelfImage Image);
 
     private static readonly HashSet<string> PreloadSkipModules = new(StringComparer.OrdinalIgnoreCase)
     {
@@ -81,9 +79,8 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             ImportTraceLimit = Math.Max(0, options.ImportTraceLimit),
         };
         var moduleManager = new ModuleManager();
-        // The compile-time generated registry (SharpEmu.SourceGenerators) is the sole
-        // registration source; content tests in SharpEmu.Libs.Tests pin its invariants.
-        moduleManager.RegisterExports(SharpEmu.Generated.SysAbiExportRegistry.CreateExports(Generation.Gen4 | Generation.Gen5));
+        moduleManager.RegisterFromAssembly(typeof(VideoOutExports).Assembly, Generation.Gen4 | Generation.Gen5, Aerolib.Instance);
+        moduleManager.RegisterFromAssembly(typeof(KernelExports).Assembly, Generation.Gen4 | Generation.Gen5, Aerolib.Instance);
         moduleManager.Freeze();
 
         var virtualMemory = new PhysicalVirtualMemory();
@@ -137,13 +134,11 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         LastSessionSummary = null;
         LastBasicBlockTrace = null;
         LastMilestoneLog = null;
-        FiberExports.ResetRuntimeState();
         KernelModuleRegistry.Reset();
         var image = LoadImage(normalizedEbootPath);
         VideoOutExports.ConfigureApplicationInfo(image.Title, image.TitleId, image.Version);
         SaveDataExports.ConfigureApplicationInfo(image.TitleId);
-        SystemServiceExports.ConfigureApplicationInfo(image.TitleId);
-        _ = RegisterLoadedModule(normalizedEbootPath, image, isMain: true, isSystemModule: false);
+        RegisterLoadedModule(normalizedEbootPath, image, isMain: true, isSystemModule: false);
         KernelRuntimeCompatExports.ConfigureProcessProcParamAddress(image.ProcParamAddress);
         Console.Error.WriteLine($"[RUNTIME] Entry: 0x{image.EntryPoint:X16}");
         var generation = image.ElfHeader.AbiVersion == 2 ? Generation.Gen5 : Generation.Gen4;
@@ -189,16 +184,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
 
         Console.Error.WriteLine($"[RUNTIME] DispatchEntry returned: {result}");
         Console.Error.WriteLine($"[RUNTIME] Dispatch result: {result}");
-
-        // Stop is a host operation, not an emulation failure. The detailed
-        // trace and session-summary builders can traverse a partially torn
-        // down native backend, delaying the GUI exit callback indefinitely.
-        if (HostSessionControl.IsShutdownRequested)
-        {
-            Console.Error.WriteLine("[RUNTIME] Skipping post-exit diagnostics for host shutdown.");
-            return result;
-        }
-
         LastExecutionTrace = _cpuDispatcher.LastImportResolutionTrace;
         LastMilestoneLog = _cpuDispatcher.LastMilestoneLog;
         LastSessionSummary = BuildSessionSummary(_cpuDispatcher.LastSessionSummary);
@@ -383,20 +368,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             return null;
         }
 
-        // Dump tools commonly place decrypted executables in an app0/decrypted
-        // sidecar while leaving Unity data in the parent app0 directory. Keep
-        // loading code/modules beside the decrypted eboot, but mount /app0 at
-        // the content-bearing parent so boot.config, metadata and assets resolve.
-        if (string.Equals(Path.GetFileName(app0Root), "decrypted", StringComparison.OrdinalIgnoreCase))
-        {
-            var parentRoot = Path.GetDirectoryName(app0Root);
-            if (!string.IsNullOrWhiteSpace(parentRoot) &&
-                Directory.Exists(Path.Combine(parentRoot, "Media")))
-            {
-                app0Root = parentRoot;
-            }
-        }
-
         Environment.SetEnvironmentVariable(app0VariableName, app0Root);
         return new App0BindingScope(app0VariableName);
     }
@@ -442,56 +413,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         return null;
     }
 
-    private bool TryGetEhFrameInfo(
-        SelfImage image,
-        ulong imageSize,
-        out ulong ehFrameHeaderAddress,
-        out ulong ehFrameAddress,
-        out ulong ehFrameSize)
-    {
-        ehFrameHeaderAddress = 0;
-        ehFrameAddress = 0;
-        ehFrameSize = 0;
-        var imageBase = image.EntryPoint >= image.ElfHeader.EntryPoint
-            ? image.EntryPoint - image.ElfHeader.EntryPoint
-            : 0UL;
-        for (var i = 0; i < image.ProgramHeaders.Count; i++)
-        {
-            var header = image.ProgramHeaders[i];
-            if (header.HeaderType != ProgramHeaderType.GnuEhFrame || header.MemorySize < 8)
-            {
-                continue;
-            }
-
-            var headerAddress = imageBase + header.VirtualAddress;
-            Span<byte> ehHeader = stackalloc byte[8];
-            if (!_virtualMemory.TryRead(headerAddress, ehHeader) ||
-                ehHeader[0] != 1 ||
-                ehHeader[1] != 0x1B)
-            {
-                continue;
-            }
-
-            var relativeOffset = BinaryPrimitives.ReadInt32LittleEndian(ehHeader[4..]);
-            ehFrameHeaderAddress = headerAddress;
-            ehFrameAddress = unchecked((ulong)((long)headerAddress + 4 + relativeOffset));
-            if (ehFrameAddress < 0x10000)
-            {
-                continue;
-            }
-
-            var relativeEhFrameAddress = ehFrameAddress - imageBase;
-            ehFrameSize = header.VirtualAddress > relativeEhFrameAddress
-                ? header.VirtualAddress - relativeEhFrameAddress
-                : imageSize > header.VirtualAddress
-                    ? imageSize - header.VirtualAddress
-                    : 0;
-            return true;
-        }
-
-        return false;
-    }
-
     private OrbisGen2Result? RunPreloadedModuleInitializers(
         IReadOnlyList<LoadedModuleImage> loadedModuleImages,
         Generation generation,
@@ -501,22 +422,12 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         for (var i = 0; i < loadedModuleImages.Count; i++)
         {
             var loadedModule = loadedModuleImages[i];
-            if (!loadedModule.StartAtBoot)
-            {
-                continue;
-            }
-
             var initEntryPoint = loadedModule.Image.InitFunctionEntryPoint;
             if (initEntryPoint < 0x10000)
             {
                 continue;
             }
 
-            if (!KernelModuleRegistry.TryBeginModuleStart(loadedModule.Handle, out _))
-            {
-                continue;
-            }
-
             var moduleName = Path.GetFileName(loadedModule.Path);
             if (string.IsNullOrWhiteSpace(moduleName))
             {
@@ -533,9 +444,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
                 activeRuntimeSymbols,
                 moduleName,
                 _cpuExecutionOptions);
-            KernelModuleRegistry.CompleteModuleStart(
-                loadedModule.Handle,
-                result == OrbisGen2Result.ORBIS_GEN2_OK);
             if (result != OrbisGen2Result.ORBIS_GEN2_OK)
             {
                 Console.Error.WriteLine(
@@ -633,17 +541,11 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
 
         var moduleDirectories = new[]
         {
-            (Path: Path.Combine(ebootDirectory, "sce_module"), StartAtBoot: true),
-            (Path: Path.Combine(ebootDirectory, "sce_modules"), StartAtBoot: true),
-            (Path: Path.Combine(ebootDirectory, "Media", "Modules"), StartAtBoot: true),
-            // Unity native plugins are loaded later through sceKernelLoadStartModule. Map
-            // them up front so the HLE loader can return a real module handle and dlsym
-            // can resolve their exports, but defer DT_INIT until the guest requests them.
-            (Path: Path.Combine(ebootDirectory, "Media", "Plugins"), StartAtBoot: false),
+            Path.Combine(ebootDirectory, "sce_module"),
+            Path.Combine(ebootDirectory, "sce_modules"),
         }
-        .GroupBy(entry => entry.Path, StringComparer.OrdinalIgnoreCase)
-        .Select(group => group.First())
-        .Where(entry => Directory.Exists(entry.Path))
+        .Distinct(StringComparer.OrdinalIgnoreCase)
+        .Where(Directory.Exists)
         .ToArray();
 
         if (moduleDirectories.Length == 0)
@@ -652,26 +554,23 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         }
 
         var allModulePaths = moduleDirectories
-            .SelectMany(directory => Directory
-                .EnumerateFiles(directory.Path)
-                .OrderBy(path => path, StringComparer.OrdinalIgnoreCase)
-                .Select(path => (Path: path, directory.StartAtBoot)))
-            .Where(entry =>
+            .SelectMany(Directory.EnumerateFiles)
+            .Where(path =>
             {
-                var extension = Path.GetExtension(entry.Path);
+                var extension = Path.GetExtension(path);
                 return string.Equals(extension, ".prx", StringComparison.OrdinalIgnoreCase) ||
                        string.Equals(extension, ".sprx", StringComparison.OrdinalIgnoreCase);
             })
-            .GroupBy(entry => entry.Path, StringComparer.OrdinalIgnoreCase)
-            .Select(group => group.First())
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .OrderBy(path => path, StringComparer.OrdinalIgnoreCase)
             .ToArray();
 
         var modulePaths = allModulePaths
-            .Where(entry => ShouldPreloadModule(entry.Path))
+            .Where(ShouldPreloadModule)
             .ToArray();
         var skippedModules = allModulePaths
-            .Where(entry => !ShouldPreloadModule(entry.Path))
-            .Select(entry => Path.GetFileName(entry.Path))
+            .Where(path => !ShouldPreloadModule(path))
+            .Select(Path.GetFileName)
             .Where(name => !string.IsNullOrWhiteSpace(name))
             .ToArray();
         if (skippedModules.Length > 0)
@@ -684,15 +583,14 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             return loadedImages;
         }
 
-        Console.Error.WriteLine($"[RUNTIME] Module search directories: {string.Join(", ", moduleDirectories.Select(entry => entry.Path))}");
+        Console.Error.WriteLine($"[RUNTIME] Module search directories: {string.Join(", ", moduleDirectories)}");
         Console.Error.WriteLine($"[RUNTIME] Loading {modulePaths.Length} module(s)...");
         var loadedModules = 0;
         var failedModules = 0;
         var mergedImportCount = 0;
         var mergedSymbolCount = 0;
-        foreach (var moduleEntry in modulePaths)
+        foreach (var modulePath in modulePaths)
         {
-            var modulePath = moduleEntry.Path;
             try
             {
                 var fileInfo = new FileInfo(modulePath);
@@ -717,13 +615,8 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
 
                 mergedImportCount += MergeImportStubs(importStubs, moduleImage.ImportStubs, modulePath);
                 mergedSymbolCount += MergeRuntimeSymbols(runtimeSymbols, moduleImage.RuntimeSymbols);
-                InstallNativePluginCompatibilityHooks(importStubs, moduleImage, modulePath);
-                var moduleHandle = RegisterLoadedModule(modulePath, moduleImage, isMain: false, isSystemModule: false);
-                var moduleName = Path.GetFileName(modulePath);
-                var startAtBoot = moduleEntry.StartAtBoot ||
-                    string.Equals(moduleName, "libfmod.prx", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(moduleName, "libfmodstudio.prx", StringComparison.OrdinalIgnoreCase);
-                loadedImages.Add(new LoadedModuleImage(modulePath, moduleImage, moduleHandle, startAtBoot));
+                RegisterLoadedModule(modulePath, moduleImage, isMain: false, isSystemModule: false);
+                loadedImages.Add(new LoadedModuleImage(modulePath, moduleImage));
                 loadedModules++;
 
                 Console.Error.WriteLine(
@@ -741,28 +634,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         return loadedImages;
     }
 
-    private static void InstallNativePluginCompatibilityHooks(
-        IDictionary<ulong, string> importStubs,
-        SelfImage moduleImage,
-        string modulePath)
-    {
-        if (!string.Equals(Path.GetFileName(modulePath), "libfmod.prx", StringComparison.OrdinalIgnoreCase))
-        {
-            return;
-        }
-
-        ReadOnlySpan<string> compatibilityNids = ["uPLTdl3psGk"];
-        foreach (var nid in compatibilityNids)
-        {
-            if (moduleImage.RuntimeSymbols.TryGetValue(nid, out var address) && address >= 0x10000)
-            {
-                importStubs[address] = nid;
-                Console.Error.WriteLine(
-                    $"[RUNTIME] Installed FMOD compatibility hook: {nid} -> 0x{address:X16}");
-            }
-        }
-    }
-
     private void RebindImportedDataSymbols(
         SelfImage mainImage,
         IReadOnlyList<LoadedModuleImage> loadedModuleImages,
@@ -967,7 +838,7 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
         return !PreloadSkipModules.Contains(fileName);
     }
 
-    private int RegisterLoadedModule(string modulePath, SelfImage image, bool isMain, bool isSystemModule)
+    private static void RegisterLoadedModule(string modulePath, SelfImage image, bool isMain, bool isSystemModule)
     {
         if (!TryComputeImageRange(image, out var baseAddress, out var size))
         {
@@ -975,27 +846,15 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             size = 0;
         }
 
-        _ = TryGetEhFrameInfo(
-            image,
-            size,
-            out var ehFrameHeaderAddress,
-            out var ehFrameAddress,
-            out var ehFrameSize);
         var handle = KernelModuleRegistry.RegisterModule(
             modulePath,
             baseAddress,
             size,
             image.EntryPoint,
-            image.InitFunctionEntryPoint,
-            ehFrameHeaderAddress,
-            ehFrameAddress,
-            ehFrameSize,
             isMain,
             isSystemModule);
-        KernelModuleRegistry.RegisterModuleSymbols(handle, image.RuntimeSymbols);
         Console.Error.WriteLine(
             $"[RUNTIME] Registered module handle={handle} name={Path.GetFileName(modulePath)} base=0x{baseAddress:X16} size=0x{size:X16}");
-        return handle;
     }
 
     private static bool TryComputeImageRange(SelfImage image, out ulong baseAddress, out ulong size)
@@ -1162,16 +1021,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             disposableDispatcher.Dispose();
         }
 
-        if (_cpuDispatcher is CpuDispatcher { NativeSessionLeaked: true })
-        {
-            // A guest worker is still inside guest code; unmapping the guest
-            // address space under it would fault the whole process, which
-            // hosts the GUI launcher in embedded sessions.
-            Console.Error.WriteLine(
-                "[RUNTIME] Guest workers were still active at teardown; keeping the guest address space mapped.");
-            return;
-        }
-
         if (_virtualMemory is IDisposable disposableMemory)
         {
             disposableMemory.Dispose();

src/SharpEmu.Core/SharpEmu.Core.csproj

@@ -1,4 +1,4 @@
-<!--
+<!--
 Copyright (C) 2026 SharpEmu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->
@@ -14,14 +14,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <PackageReference Include="Iced" />
   </ItemGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="SharpEmu.Libs.Tests" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-  </PropertyGroup>
-
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

src/SharpEmu.Core/packages.lock.json

@@ -0,0 +1,113 @@
+{
+  "version": 2,
+  "dependencies": {
+    "net10.0": {
+      "Iced": {
+        "type": "Direct",
+        "requested": "[1.21.0, )",
+        "resolved": "1.21.0",
+        "contentHash": "dv5+81Q1TBQvVMSOOOmRcjJmvWcX3BZPZsIq31+RLc5cNft0IHAyNlkdb7ZarOWG913PyBoFDsDXoCIlKmLclg=="
+      },
+      "Microsoft.DotNet.PlatformAbstractions": {
+        "type": "Transitive",
+        "resolved": "3.1.6",
+        "contentHash": "jek4XYaQ/PGUwDKKhwR8K47Uh1189PFzMeLqO83mXrXQVIpARZCcfuDedH50YDTepBkfijCZN5U/vZi++erxtg=="
+      },
+      "Microsoft.Extensions.DependencyModel": {
+        "type": "Transitive",
+        "resolved": "9.0.9",
+        "contentHash": "fNGvKct2De8ghm0Bpfq0iWthtzIWabgOTi+gJhNOPhNJIowXNEUE2eZNW/zNCzrHVA3PXg2yZ+3cWZndC2IqYA=="
+      },
+      "Silk.NET.Core": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "D7AT/nnwlB+4RZ84XY8QNGBZMJI5z9l4CSSETIJ1wCfRJzRt/341y3MRZ4HbnFz4r/IGaWOEZr86iE+0/65yyQ==",
+        "dependencies": {
+          "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
+          "Microsoft.Extensions.DependencyModel": "9.0.9"
+        }
+      },
+      "Silk.NET.GLFW": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "UIs4sH57xlPUNHQ/1bt9rymPWlGy8IMDCNv86h0iM4TOA1CkIx0XM/n/tA4AReh1zQkNrvkxPEdZ3Blvy1dyXg==",
+        "dependencies": {
+          "Silk.NET.Core": "2.23.0",
+          "Ultz.Native.GLFW": "3.4.0"
+        }
+      },
+      "Silk.NET.Maths": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "r8PdIVzME8EH0qAgbmRPO87I4GfgR2j8TofT7EMuRJDf1QluoQwnVypDoFJjQ2ZBSRsGYk5unYxxogI05Ogsmw=="
+      },
+      "Silk.NET.Windowing.Common": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "ThStSinmY9KQI8DGiF5XEhkLJVnBcgRTBTzL9ijg1wMZAYuckz7ykrNw04fjRm2Gryh6tCNGbvz2XaY0efeFzg==",
+        "dependencies": {
+          "Silk.NET.Core": "2.23.0",
+          "Silk.NET.Maths": "2.23.0"
+        }
+      },
+      "Silk.NET.Windowing.Glfw": {
+        "type": "Transitive",
+        "resolved": "2.23.0",
+        "contentHash": "aYBudKmENmvLRn9p15HbdvlQTnnXskcDfTfbYwSb/4fr263rGLwYuDw/txUEc2jihHJiWCp5+75Y7z5wTJWl7g==",
+        "dependencies": {
+          "Silk.NET.GLFW": "2.23.0",
+          "Silk.NET.Windowing.Common": "2.23.0"
+        }
+      },
+      "Ultz.Native.GLFW": {
+        "type": "Transitive",
+        "resolved": "3.4.0",
+        "contentHash": "Iy22JopynbOJ32vA0lBhFEzGi65GQJBuJHYBYRBpydrDpNoTiHnjIXfA65Gu+8qsOr/ZEoIF8r9aHCgAXuO6DA=="
+      },
+      "sharpemu.hle": {
+        "type": "Project"
+      },
+      "sharpemu.libs": {
+        "type": "Project",
+        "dependencies": {
+          "SharpEmu.HLE": "[1.0.0, )",
+          "Silk.NET.Vulkan": "[2.23.0, )",
+          "Silk.NET.Vulkan.Extensions.KHR": "[2.23.0, )",
+          "Silk.NET.Windowing": "[2.23.0, )"
+        }
+      },
+      "sharpemu.logging": {
+        "type": "Project"
+      },
+      "Silk.NET.Vulkan": {
+        "type": "CentralTransitive",
+        "requested": "[2.23.0, )",
+        "resolved": "2.23.0",
+        "contentHash": "3/irtlSWXZ3eTi8N6nelI6L34NTB8ZJHpqVMNzZx2aX7Ek9YEQ34NoQW8/Tljrtmkg8KRhHW8hKTEzZaKV8PgA==",
+        "dependencies": {
+          "Silk.NET.Core": "2.23.0"
+        }
+      },
+      "Silk.NET.Vulkan.Extensions.KHR": {
+        "type": "CentralTransitive",
+        "requested": "[2.23.0, )",
+        "resolved": "2.23.0",
+        "contentHash": "uRaf4j+SmH3DumjSSSUbFg33BnsGZUyXGj93O9NgGKZSJN3OTmNmQDxRew+/KiVLcgH6qzbto8aNGZ++j9GFWg==",
+        "dependencies": {
+          "Silk.NET.Core": "2.23.0",
+          "Silk.NET.Vulkan": "2.23.0"
+        }
+      },
+      "Silk.NET.Windowing": {
+        "type": "CentralTransitive",
+        "requested": "[2.23.0, )",
+        "resolved": "2.23.0",
+        "contentHash": "OPNPmt/lRyUKVYrFLQXVxyATqD3MKLc1iY1oKx1/2GppgmZxVZPwN12tekrQ4C7408kgB1L5JD1Wnirqqeb2kg==",
+        "dependencies": {
+          "Silk.NET.Windowing.Common": "2.23.0",
+          "Silk.NET.Windowing.Glfw": "2.23.0"
+        }
+      }
+    }
+  }
+}

src/SharpEmu.GUI/App.axaml

@@ -1,243 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="SharpEmu.GUI.App"
-             RequestedThemeVariant="Dark">
-
-  <Application.Resources>
-    <Color x:Key="SystemAccentColor">#7C5CFC</Color>
-
-    <LinearGradientBrush x:Key="BgBrush" StartPoint="0%,0%" EndPoint="100%,100%">
-      <GradientStop Offset="0" Color="#12151F" />
-      <GradientStop Offset="0.55" Color="#0D1017" />
-      <GradientStop Offset="1" Color="#0B0D14" />
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="ChromeBrush" Color="#090C12" />
-    <SolidColorBrush x:Key="CardBrush" Color="#141924" />
-    <SolidColorBrush x:Key="CardBorderBrush" Color="#232B3A" />
-    <SolidColorBrush x:Key="ElevatedBrush" Color="#1B2230" />
-    <SolidColorBrush x:Key="TextBrush" Color="#E8ECF4" />
-    <SolidColorBrush x:Key="MutedBrush" Color="#8B94A7" />
-    <SolidColorBrush x:Key="FaintBrush" Color="#5A6478" />
-    <SolidColorBrush x:Key="AccentBrush" Color="#7C5CFC" />
-    <SolidColorBrush x:Key="AccentHoverBrush" Color="#8F73FF" />
-    <SolidColorBrush x:Key="DangerBrush" Color="#E5484D" />
-    <SolidColorBrush x:Key="DangerHoverBrush" Color="#F2555A" />
-    <SolidColorBrush x:Key="SuccessBrush" Color="#46C46B" />
-    <SolidColorBrush x:Key="InfoBrush" Color="#58A6FF" />
-    <SolidColorBrush x:Key="TileHoverBrush" Color="#1A2130" />
-    <SolidColorBrush x:Key="TileSelectedBrush" Color="#212A3F" />
-  </Application.Resources>
-
-  <Application.Styles>
-    <FluentTheme />
-
-    <Style Selector="Window">
-      <Setter Property="FontFamily" Value="Inter, Segoe UI, sans-serif" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
-
-    <Style Selector="Border.card">
-      <Setter Property="Background" Value="{StaticResource CardBrush}" />
-      <Setter Property="BorderBrush" Value="{StaticResource CardBorderBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CornerRadius" Value="12" />
-      <Setter Property="Padding" Value="16" />
-    </Style>
-
-    <Style Selector="Border.pill">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="CornerRadius" Value="999" />
-      <Setter Property="Padding" Value="10,3" />
-    </Style>
-
-    <!-- Session status/hotkey badges: the title-id pill geometry with a
-         tinted fill so state (RUNNING) and keys (F11) read at a glance. -->
-    <Style Selector="Border.badge">
-      <Setter Property="CornerRadius" Value="999" />
-      <Setter Property="Padding" Value="8,2" />
-      <Setter Property="BorderThickness" Value="1" />
-    </Style>
-    <Style Selector="Border.badge.running">
-      <Setter Property="Background" Value="#1E46C46B" />
-      <Setter Property="BorderBrush" Value="#5546C46B" />
-    </Style>
-    <Style Selector="Border.badge.key">
-      <Setter Property="Background" Value="#1E58A6FF" />
-      <Setter Property="BorderBrush" Value="#5558A6FF" />
-    </Style>
-
-    <Style Selector="TextBlock.sectionTitle">
-      <Setter Property="FontSize" Value="11" />
-      <Setter Property="FontWeight" Value="SemiBold" />
-      <Setter Property="LetterSpacing" Value="1.5" />
-      <Setter Property="Foreground" Value="{StaticResource MutedBrush}" />
-    </Style>
-
-    <Style Selector="TextBlock.fieldLabel">
-      <Setter Property="FontSize" Value="12" />
-      <Setter Property="Foreground" Value="{StaticResource MutedBrush}" />
-      <Setter Property="Margin" Value="0,0,0,6" />
-    </Style>
-
-    <Style Selector="TextBox">
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-
-    <Style Selector="Button.accent">
-      <Setter Property="Background" Value="{StaticResource AccentBrush}" />
-      <Setter Property="Foreground" Value="White" />
-      <Setter Property="FontWeight" Value="SemiBold" />
-      <Setter Property="Padding" Value="22,10" />
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-    <Style Selector="Button.accent:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource AccentHoverBrush}" />
-      <Setter Property="Foreground" Value="White" />
-    </Style>
-
-    <Style Selector="Button.danger">
-      <Setter Property="Background" Value="{StaticResource DangerBrush}" />
-      <Setter Property="Foreground" Value="White" />
-      <Setter Property="FontWeight" Value="SemiBold" />
-      <Setter Property="Padding" Value="22,10" />
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-    <Style Selector="Button.danger:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource DangerHoverBrush}" />
-      <Setter Property="Foreground" Value="White" />
-    </Style>
-
-    <Style Selector="Button.ghost">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderBrush" Value="{StaticResource CardBorderBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-      <Setter Property="Padding" Value="12,7" />
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-    <Style Selector="Button.ghost:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
-
-    <Style Selector="ToggleButton.ghost">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderBrush" Value="{StaticResource CardBorderBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-      <Setter Property="Padding" Value="12,7" />
-      <Setter Property="CornerRadius" Value="8" />
-    </Style>
-    <Style Selector="ToggleButton.ghost:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
-    <Style Selector="ToggleButton.ghost:checked /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-      <Setter Property="BorderBrush" Value="{StaticResource AccentBrush}" />
-      <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}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CornerRadius" Value="10" />
-      <Setter Property="Padding" Value="6" />
-    </Style>
-    <Style Selector="ContextMenu MenuItem">
-      <Setter Property="Padding" Value="10,7" />
-      <Setter Property="CornerRadius" Value="7" />
-    </Style>
-    <Style Selector="ContextMenu Separator">
-      <Setter Property="Background" Value="{StaticResource CardBorderBrush}" />
-      <Setter Property="Height" Value="1" />
-      <Setter Property="Margin" Value="8,4" />
-    </Style>
-
-    <Style Selector="ListBox.console">
-      <Setter Property="Background" Value="#0B0E14" />
-      <Setter Property="FontFamily" Value="Cascadia Mono, Consolas, Courier New, monospace" />
-      <Setter Property="FontSize" Value="12" />
-    </Style>
-    <Style Selector="ListBox.console ListBoxItem">
-      <Setter Property="Padding" Value="10,1" />
-      <Setter Property="MinHeight" Value="0" />
-    </Style>
-
-    <!-- Cover-art library grid -->
-    <Style Selector="ListBox.tileGrid ListBoxItem">
-      <Setter Property="Padding" Value="10" />
-      <Setter Property="Margin" Value="5" />
-      <Setter Property="CornerRadius" Value="14" />
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="BorderBrush" Value="Transparent" />
-      <Setter Property="RenderTransform" Value="translateY(0px)" />
-      <Setter Property="Transitions">
-        <Transitions>
-          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.12" />
-        </Transitions>
-      </Setter>
-    </Style>
-    <Style Selector="ListBox.tileGrid ListBoxItem:pointerover">
-      <Setter Property="RenderTransform" Value="translateY(-3px)" />
-    </Style>
-    <Style Selector="ListBox.tileGrid ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource TileHoverBrush}" />
-    </Style>
-    <Style Selector="ListBox.tileGrid ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource TileSelectedBrush}" />
-      <Setter Property="BorderBrush" Value="{StaticResource AccentBrush}" />
-    </Style>
-    <Style Selector="ListBox.tileGrid ListBoxItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="{StaticResource TileSelectedBrush}" />
-      <Setter Property="BorderBrush" Value="{StaticResource AccentHoverBrush}" />
-    </Style>
-
-    <Style Selector="Border.coverShadow">
-      <Setter Property="CornerRadius" Value="10" />
-      <Setter Property="BoxShadow" Value="0 6 14 0 #55000000" />
-    </Style>
-    <Style Selector="Border.coverClip">
-      <Setter Property="CornerRadius" Value="10" />
-      <Setter Property="ClipToBounds" Value="True" />
-      <Setter Property="Background" Value="{StaticResource ElevatedBrush}" />
-    </Style>
-  </Application.Styles>
-
-</Application>

src/SharpEmu.GUI/App.axaml.cs

@@ -1,26 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-
-namespace SharpEmu.GUI;
-
-public partial class App : Application
-{
-    public override void Initialize()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    public override void OnFrameworkInitializationCompleted()
-    {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.MainWindow = new MainWindow();
-        }
-
-        base.OnFrameworkInitializationCompleted();
-    }
-}

src/SharpEmu.GUI/Atrac9/Atrac9Config.cs

@@ -1,120 +0,0 @@
-#nullable disable
-using System.IO;
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    /// <summary>
-    /// Stores the configuration data needed to decode or encode an ATRAC9 stream.
-    /// </summary>
-    public class Atrac9Config
-    {
-        /// <summary>
-        /// The 4-byte ATRAC9 configuration data.
-        /// </summary>
-        public byte[] ConfigData { get; }
-
-        /// <summary>
-        /// A 4-bit value specifying one of 16 sample rates.
-        /// </summary>
-        public int SampleRateIndex { get; }
-        /// <summary>
-        /// A 3-bit value specifying one of 6 substream channel mappings.
-        /// </summary>
-        public int ChannelConfigIndex { get; }
-        /// <summary>
-        /// An 11-bit value containing the average size of a single frame.
-        /// </summary>
-        public int FrameBytes { get; }
-        /// <summary>
-        /// A 2-bit value indicating how many frames are in each superframe.
-        /// </summary>
-        public int SuperframeIndex { get; }
-
-        /// <summary>
-        /// The channel mapping used by the ATRAC9 stream.
-        /// </summary>
-        public ChannelConfig ChannelConfig { get; }
-        /// <summary>
-        /// The total number of channels in the ATRAC9 stream.
-        /// </summary>
-        public int ChannelCount { get; }
-        /// <summary>
-        /// The sample rate of the ATRAC9 stream.
-        /// </summary>
-        public int SampleRate { get; }
-        /// <summary>
-        /// Indicates whether the ATRAC9 stream has a <see cref="SampleRateIndex"/> of 8 or above.
-        /// </summary>
-        public bool HighSampleRate { get; }
-
-        /// <summary>
-        /// The number of frames in each superframe.
-        /// </summary>
-        public int FramesPerSuperframe { get; }
-        /// <summary>
-        /// The number of samples in one frame as an exponent of 2.
-        /// <see cref="FrameSamples"/> = 2^<see cref="FrameSamplesPower"/>.
-        /// </summary>
-        public int FrameSamplesPower { get; }
-        /// <summary>
-        /// The number of samples in one frame.
-        /// </summary>
-        public int FrameSamples { get; }
-        /// <summary>
-        /// The number of bytes in one superframe.
-        /// </summary>
-        public int SuperframeBytes { get; }
-        /// <summary>
-        /// The number of samples in one superframe.
-        /// </summary>
-        public int SuperframeSamples { get; }
-
-        /// <summary>
-        /// Reads ATRAC9 configuration data and calculates the stream parameters from it.
-        /// </summary>
-        /// <param name="configData">The processed ATRAC9 configuration.</param>
-        public Atrac9Config(byte[] configData)
-        {
-            if (configData == null || configData.Length != 4)
-            {
-                throw new InvalidDataException("Config data must be 4 bytes long");
-            }
-
-            ReadConfigData(configData, out int a, out int b, out int c, out int d);
-            SampleRateIndex = a;
-            ChannelConfigIndex = b;
-            FrameBytes = c;
-            SuperframeIndex = d;
-            ConfigData = configData;
-
-            FramesPerSuperframe = 1 << SuperframeIndex;
-            SuperframeBytes = FrameBytes << SuperframeIndex;
-            ChannelConfig = Tables.ChannelConfig[ChannelConfigIndex];
-
-            ChannelCount = ChannelConfig.ChannelCount;
-            SampleRate = Tables.SampleRates[SampleRateIndex];
-            HighSampleRate = SampleRateIndex > 7;
-            FrameSamplesPower = Tables.SamplingRateIndexToFrameSamplesPower[SampleRateIndex];
-            FrameSamples = 1 << FrameSamplesPower;
-            SuperframeSamples = FrameSamples * FramesPerSuperframe;
-        }
-
-        private static void ReadConfigData(byte[] configData, out int sampleRateIndex, out int channelConfigIndex, out int frameBytes, out int superframeIndex)
-        {
-            var reader = new BitReader(configData);
-
-            int header = reader.ReadInt(8);
-            sampleRateIndex = reader.ReadInt(4);
-            channelConfigIndex = reader.ReadInt(3);
-            int validationBit = reader.ReadInt(1);
-            frameBytes = reader.ReadInt(11) + 1;
-            superframeIndex = reader.ReadInt(2);
-
-            if (header != 0xFE || validationBit != 0)
-            {
-                throw new InvalidDataException("ATRAC9 Config Data is invalid");
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Atrac9Decoder.cs

@@ -1,128 +0,0 @@
-#nullable disable
-using System;
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    /// <summary>
-    /// Decodes an ATRAC9 stream into 16-bit PCM.
-    /// </summary>
-    public class Atrac9Decoder
-    {
-        /// <summary>
-        /// The config data for the current ATRAC9 stream.
-        /// </summary>
-        public Atrac9Config Config { get; private set; }
-
-        private Frame Frame { get; set; }
-        private BitReader Reader { get; set; }
-        private bool _initialized;
-
-        /// <summary>
-        /// Sets up the decoder to decode an ATRAC9 stream based on the information in <paramref name="configData"/>.
-        /// </summary>
-        /// <param name="configData">A 4-byte value containing information about the ATRAC9 stream.</param>
-        public void Initialize(byte[] configData)
-        {
-            Config = new Atrac9Config(configData);
-            Frame = new Frame(Config);
-            Reader = new BitReader(null);
-            _initialized = true;
-        }
-
-        /// <summary>
-        /// Decodes one superframe of ATRAC9 data.
-        /// </summary>
-        /// <param name="atrac9Data">The ATRAC9 data to decode. The array must be at least
-        /// <see cref="Config"/>.<see cref="Atrac9Config.SuperframeBytes"/> bytes long.</param>
-        /// <param name="pcmOut">A buffer that the decoded PCM data will be placed in.
-        /// The array must have dimensions of at least [<see cref="Config"/>.<see cref="Atrac9Config.ChannelCount"/>]
-        /// [<see cref="Config"/>.<see cref="Atrac9Config.SuperframeSamples"/>].</param>
-        public void Decode(byte[] atrac9Data, short[][] pcmOut)
-        {
-            if (!_initialized) throw new InvalidOperationException("Decoder must be initialized before decoding.");
-
-            ValidateDecodeBuffers(atrac9Data, pcmOut);
-            Reader.SetBuffer(atrac9Data);
-            DecodeSuperFrame(pcmOut);
-        }
-
-        private void ValidateDecodeBuffers(byte[] atrac9Buffer, short[][] pcmBuffer)
-        {
-            if (atrac9Buffer == null) throw new ArgumentNullException(nameof(atrac9Buffer));
-            if (pcmBuffer == null) throw new ArgumentNullException(nameof(pcmBuffer));
-
-            if (atrac9Buffer.Length < Config.SuperframeBytes)
-            {
-                throw new ArgumentException("ATRAC9 buffer is too small");
-            }
-
-            if (pcmBuffer.Length < Config.ChannelCount)
-            {
-                throw new ArgumentException("PCM buffer is too small");
-            }
-
-            for (int i = 0; i < Config.ChannelCount; i++)
-            {
-                if (pcmBuffer[i]?.Length < Config.SuperframeSamples)
-                {
-                    throw new ArgumentException("PCM buffer is too small");
-                }
-            }
-        }
-
-        private void DecodeSuperFrame(short[][] pcmOut)
-        {
-            for (int i = 0; i < Config.FramesPerSuperframe; i++)
-            {
-                Frame.FrameIndex = i;
-                DecodeFrame(Reader, Frame);
-                PcmFloatToShort(pcmOut, i * Config.FrameSamples);
-                Reader.AlignPosition(8);
-            }
-        }
-
-        private void PcmFloatToShort(short[][] pcmOut, int start)
-        {
-            int endSample = start + Config.FrameSamples;
-            int channelNum = 0;
-            foreach (Block block in Frame.Blocks)
-            {
-                foreach (Channel channel in block.Channels)
-                {
-                    double[] pcmSrc = channel.Pcm;
-                    short[] pcmDest = pcmOut[channelNum++];
-                    for (int d = 0, s = start; s < endSample; d++, s++)
-                    {
-                        double sample = pcmSrc[d];
-                        // Not using Math.Round because it's ~20x slower on 64-bit
-                        int roundedSample = (int)Math.Floor(sample + 0.5);
-                        pcmDest[s] = Helpers.Clamp16(roundedSample);
-                    }
-                }
-            }
-        }
-
-        private static void DecodeFrame(BitReader reader, Frame frame)
-        {
-            Unpack.UnpackFrame(reader, frame);
-
-            foreach (Block block in frame.Blocks)
-            {
-                Quantization.DequantizeSpectra(block);
-                Stereo.ApplyIntensityStereo(block);
-                Quantization.ScaleSpectrum(block);
-                BandExtension.ApplyBandExtension(block);
-                ImdctBlock(block);
-            }
-        }
-
-        private static void ImdctBlock(Block block)
-        {
-            foreach (Channel channel in block.Channels)
-            {
-                channel.Mdct.RunImdct(channel.Spectra, channel.Pcm);
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Atrac9Rng.cs

@@ -1,34 +0,0 @@
-#nullable disable
-namespace LibAtrac9
-{
-    /// <summary>
-    /// An Xorshift RNG used by the ATRAC9 codec
-    /// </summary>
-    internal class Atrac9Rng
-    {
-        private ushort _stateA;
-        private ushort _stateB;
-        private ushort _stateC;
-        private ushort _stateD;
-
-        public Atrac9Rng(ushort seed)
-        {
-            int startValue = 0x4D93 * (seed ^ (seed >> 14));
-
-            _stateA = (ushort)(3 - startValue);
-            _stateB = (ushort)(2 - startValue);
-            _stateC = (ushort)(1 - startValue);
-            _stateD = (ushort)(0 - startValue);
-        }
-
-        public ushort Next()
-        {
-            ushort t = (ushort)(_stateD ^ (_stateD << 5));
-            _stateD = _stateC;
-            _stateC = _stateB;
-            _stateB = _stateA;
-            _stateA = (ushort)(t ^ _stateA ^ ((t ^ (_stateA >> 5)) >> 4));
-            return _stateA;
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/BandExtension.cs

@@ -1,373 +0,0 @@
-#nullable disable
-using System;
-
-namespace LibAtrac9
-{
-    internal static class BandExtension
-    {
-        public static void ApplyBandExtension(Block block)
-        {
-            if (!block.BandExtensionEnabled || !block.HasExtensionData) return;
-
-            foreach (Channel channel in block.Channels)
-            {
-                ApplyBandExtensionChannel(channel);
-            }
-        }
-
-        private static void ApplyBandExtensionChannel(Channel channel)
-        {
-            int groupAUnit = channel.Block.QuantizationUnitCount;
-            int[] scaleFactors = channel.ScaleFactors;
-            double[] spectra = channel.Spectra;
-            double[] scales = channel.BexScales;
-            int[] values = channel.BexValues;
-
-            GetBexBandInfo(out int bandCount, out int groupBUnit, out int groupCUnit, groupAUnit);
-            int totalUnits = Math.Max(groupCUnit, 22);
-
-            int groupABin = Tables.QuantUnitToCoeffIndex[groupAUnit];
-            int groupBBin = Tables.QuantUnitToCoeffIndex[groupBUnit];
-            int groupCBin = Tables.QuantUnitToCoeffIndex[groupCUnit];
-            int totalBins = Tables.QuantUnitToCoeffIndex[totalUnits];
-
-            FillHighFrequencies(spectra, groupABin, groupBBin, groupCBin, totalBins);
-
-            switch (channel.BexMode)
-            {
-                case 0:
-                    int bexQuantUnits = totalUnits - groupAUnit;
-
-                    switch (bandCount)
-                    {
-                        case 3:
-                            scales[0] = BexMode0Bands3[0][values[0]];
-                            scales[1] = BexMode0Bands3[1][values[0]];
-                            scales[2] = BexMode0Bands3[2][values[1]];
-                            scales[3] = BexMode0Bands3[3][values[2]];
-                            scales[4] = BexMode0Bands3[4][values[3]];
-                            break;
-                        case 4:
-                            scales[0] = BexMode0Bands4[0][values[0]];
-                            scales[1] = BexMode0Bands4[1][values[0]];
-                            scales[2] = BexMode0Bands4[2][values[1]];
-                            scales[3] = BexMode0Bands4[3][values[2]];
-                            scales[4] = BexMode0Bands4[4][values[3]];
-                            break;
-                        case 5:
-                            scales[0] = BexMode0Bands5[0][values[0]];
-                            scales[1] = BexMode0Bands5[1][values[1]];
-                            scales[2] = BexMode0Bands5[2][values[1]];
-                            break;
-                    }
-
-                    scales[bexQuantUnits - 1] = Tables.SpectrumScale[scaleFactors[groupAUnit]];
-
-                    AddNoiseToSpectrum(channel, Tables.QuantUnitToCoeffIndex[totalUnits - 1],
-                        Tables.QuantUnitToCoeffCount[totalUnits - 1]);
-                    ScaleBexQuantUnits(spectra, scales, groupAUnit, totalUnits);
-                    break;
-                case 1:
-                    for (int i = groupAUnit; i < totalUnits; i++)
-                    {
-                        scales[i - groupAUnit] = Tables.SpectrumScale[scaleFactors[i]];
-                    }
-
-                    AddNoiseToSpectrum(channel, groupABin, totalBins - groupABin);
-                    ScaleBexQuantUnits(spectra, scales, groupAUnit, totalUnits);
-                    break;
-                case 2:
-                    double groupAScale2 = BexMode2Scale[values[0]];
-                    double groupBScale2 = BexMode2Scale[values[1]];
-
-                    for (int i = groupABin; i < groupBBin; i++)
-                    {
-                        spectra[i] *= groupAScale2;
-                    }
-
-                    for (int i = groupBBin; i < groupCBin; i++)
-                    {
-                        spectra[i] *= groupBScale2;
-                    }
-                    return;
-                case 3:
-                    double rate = Math.Pow(2, BexMode3Rate[values[1]]);
-                    double scale = BexMode3Initial[values[0]];
-                    for (int i = groupABin; i < totalBins; i++)
-                    {
-                        scale *= rate;
-                        spectra[i] *= scale;
-                    }
-                    return;
-                case 4:
-                    double mult = BexMode4Multiplier[values[0]];
-                    double groupAScale4 = 0.7079468 * mult;
-                    double groupBScale4 = 0.5011902 * mult;
-                    double groupCScale4 = 0.3548279 * mult;
-
-                    for (int i = groupABin; i < groupBBin; i++)
-                    {
-                        spectra[i] *= groupAScale4;
-                    }
-
-                    for (int i = groupBBin; i < groupCBin; i++)
-                    {
-                        spectra[i] *= groupBScale4;
-                    }
-
-                    for (int i = groupCBin; i < totalBins; i++)
-                    {
-                        spectra[i] *= groupCScale4;
-                    }
-                    return;
-            }
-        }
-
-        private static void ScaleBexQuantUnits(double[] spectra, double[] scales, int startUnit, int totalUnits)
-        {
-            for (int i = startUnit; i < totalUnits; i++)
-            {
-                for (int k = Tables.QuantUnitToCoeffIndex[i]; k < Tables.QuantUnitToCoeffIndex[i + 1]; k++)
-                {
-                    spectra[k] *= scales[i - startUnit];
-                }
-            }
-        }
-
-        private static void FillHighFrequencies(double[] spectra, int groupABin, int groupBBin, int groupCBin, int totalBins)
-        {
-            for (int i = 0; i < groupBBin - groupABin; i++)
-            {
-                spectra[groupABin + i] = spectra[groupABin - i - 1];
-            }
-
-            for (int i = 0; i < groupCBin - groupBBin; i++)
-            {
-                spectra[groupBBin + i] = spectra[groupBBin - i - 1];
-            }
-
-            for (int i = 0; i < totalBins - groupCBin; i++)
-            {
-                spectra[groupCBin + i] = spectra[groupCBin - i - 1];
-            }
-        }
-
-        private static void AddNoiseToSpectrum(Channel channel, int index, int count)
-        {
-            if (channel.Rng == null)
-            {
-                int[] sf = channel.ScaleFactors;
-                ushort seed = (ushort)(543 * (sf[8] + sf[12] + sf[15] + 1));
-                channel.Rng = new Atrac9Rng(seed);
-            }
-            for (int i = 0; i < count; i++)
-            {
-                channel.Spectra[i + index] = channel.Rng.Next() / 65535.0 * 2.0 - 1.0;
-            }
-        }
-
-        public static void GetBexBandInfo(out int bandCount, out int groupAUnit, out int groupBUnit, int quantUnits)
-        {
-            groupAUnit = BexGroupInfo[quantUnits - 13][0];
-            groupBUnit = BexGroupInfo[quantUnits - 13][1];
-            bandCount = BexGroupInfo[quantUnits - 13][2];
-        }
-
-        public static readonly byte[][] BexGroupInfo =
-        {
-            new byte[] {16, 21, 0},
-            new byte[] {18, 22, 1},
-            new byte[] {20, 22, 2},
-            new byte[] {21, 22, 3},
-            new byte[] {21, 22, 3},
-            new byte[] {23, 24, 4},
-            new byte[] {23, 24, 4},
-            new byte[] {24, 24, 5}
-        };
-
-        // [mode][bands]
-
-        public static readonly byte[][] BexEncodedValueCounts =
-        {
-            new byte[] {0, 0, 0, 4, 4, 2},
-            new byte[] {0, 0, 0, 0, 0, 0},
-            new byte[] {0, 0, 0, 2, 2, 1},
-            new byte[] {0, 0, 0, 2, 2, 2},
-            new byte[] {1, 1, 1, 0, 0, 0}
-        };
-
-        // [mode][bands][valueIndex]
-
-        public static readonly byte[][][] BexDataLengths =
-        {
-            new[] {
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {5, 4, 3, 3},
-                new byte[] {4, 4, 3, 4},
-                new byte[] {4, 5, 0, 0}
-            }, new[] {
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0}
-            }, new[] {
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {6, 6, 0, 0},
-                new byte[] {6, 6, 0, 0},
-                new byte[] {6, 0, 0, 0}
-            }, new[] {
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {4, 4, 0, 0},
-                new byte[] {4, 4, 0, 0},
-                new byte[] {4, 4, 0, 0}
-            }, new[] {
-                new byte[] {3, 0, 0, 0},
-                new byte[] {3, 0, 0, 0},
-                new byte[] {3, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0},
-                new byte[] {0, 0, 0, 0}
-            }
-        };
-
-        public static readonly double[][] BexMode0Bands3 =
-        {
-            new[] {
-                0.000000e+0, 1.988220e-1, 2.514343e-1, 2.960510e-1,
-                3.263550e-1, 3.771362e-1, 3.786926e-1, 4.540405e-1,
-                4.877625e-1, 5.262451e-1, 5.447083e-1, 5.737000e-1,
-                6.212158e-1, 6.222839e-1, 6.560974e-1, 6.896667e-1,
-                7.555542e-1, 7.677917e-1, 7.918091e-1, 7.971497e-1,
-                8.188171e-1, 8.446045e-1, 9.790649e-1, 9.822083e-1,
-                9.846191e-1, 9.859314e-1, 9.863586e-1, 9.863892e-1,
-                9.873352e-1, 9.881287e-1, 9.898682e-1, 9.913330e-1
-            }, new[] {
-                0.000000e+0, 9.982910e-1, 7.592773e-2, 7.179565e-1,
-                9.851379e-1, 5.340271e-1, 9.013672e-1, 6.349182e-1,
-                7.226257e-1, 1.948547e-1, 7.628174e-1, 9.873657e-1,
-                8.112183e-1, 2.715454e-1, 9.734192e-1, 1.443787e-1,
-                4.640198e-1, 3.249207e-1, 3.790894e-1, 8.276367e-2,
-                5.954590e-1, 2.864380e-1, 9.806824e-1, 7.929077e-1,
-                6.292114e-1, 4.887085e-1, 2.905273e-1, 1.301880e-1,
-                3.140869e-1, 5.482483e-1, 4.210815e-1, 1.182861e-1
-            }, new[] {
-                0.000000e+0, 3.155518e-2, 8.581543e-2, 1.364746e-1,
-                1.858826e-1, 2.368469e-1, 2.888184e-1, 3.432617e-1,
-                4.012451e-1, 4.623108e-1, 5.271301e-1, 5.954895e-1,
-                6.681213e-1, 7.448425e-1, 8.245239e-1, 9.097290e-1
-            }, new[] {
-                0.000000e+0, 4.418945e-2, 1.303711e-1, 2.273560e-1,
-                3.395996e-1, 4.735718e-1, 6.267090e-1, 8.003845e-1
-            }, new[] {
-                0.000000e+0, 2.804565e-2, 9.683228e-2, 1.849976e-1,
-                3.005981e-1, 4.470520e-1, 6.168518e-1, 8.007813e-1
-            }
-        };
-
-        public static readonly double[][] BexMode0Bands4 =
-        {
-            new[] {
-                0.000000e+0, 2.708740e-1, 3.479614e-1, 3.578186e-1,
-                5.083618e-1, 5.299072e-1, 5.819092e-1, 6.381836e-1,
-                7.276917e-1, 7.595520e-1, 7.878723e-1, 9.707336e-1,
-                9.713135e-1, 9.736023e-1, 9.759827e-1, 9.832458e-1
-            }, new[] {
-                0.000000e+0, 2.330627e-1, 5.891418e-1, 7.170410e-1,
-                2.036438e-1, 1.613464e-1, 6.668701e-1, 9.481201e-1,
-                9.769897e-1, 5.111694e-1, 3.522644e-1, 8.209534e-1,
-                2.933960e-1, 9.757690e-1, 5.289917e-1, 4.372253e-1
-            }, new[] {
-                0.000000e+0, 4.360962e-2, 1.056519e-1, 1.590576e-1,
-                2.078857e-1, 2.572937e-1, 3.082581e-1, 3.616028e-1,
-                4.191589e-1, 4.792175e-1, 5.438538e-1, 6.125183e-1,
-                6.841125e-1, 7.589417e-1, 8.365173e-1, 9.148254e-1
-            }, new[] {
-                0.000000e+0, 4.074097e-2, 1.164551e-1, 2.077026e-1,
-                3.184509e-1, 4.532166e-1, 6.124268e-1, 7.932129e-1
-            }, new[] {
-                0.000000e+0, 8.880615e-3, 2.932739e-2, 5.593872e-2,
-                8.825684e-2, 1.259155e-1, 1.721497e-1, 2.270813e-1,
-                2.901611e-1, 3.579712e-1, 4.334106e-1, 5.147095e-1,
-                6.023254e-1, 6.956177e-1, 7.952881e-1, 8.977356e-1
-            }
-        };
-
-        public static readonly double[][] BexMode0Bands5 =
-        {
-            new[] {
-                0.000000e+0, 7.379150e-2, 1.806335e-1, 2.687073e-1,
-                3.407898e-1, 4.047546e-1, 4.621887e-1, 5.168762e-1,
-                5.703125e-1, 6.237488e-1, 6.763611e-1, 7.288208e-1,
-                7.808533e-1, 8.337708e-1, 8.874512e-1, 9.418030e-1
-            }, new[] {
-                0.000000e+0, 7.980347e-2, 1.615295e-1, 1.665649e-1,
-                1.822205e-1, 2.185669e-1, 2.292175e-1, 2.456665e-1,
-                2.666321e-1, 3.306580e-1, 3.330688e-1, 3.765259e-1,
-                4.085083e-1, 4.400024e-1, 4.407654e-1, 4.817505e-1,
-                4.924011e-1, 5.320740e-1, 5.893860e-1, 6.131287e-1,
-                6.212463e-1, 6.278076e-1, 6.308899e-1, 7.660828e-1,
-                7.850647e-1, 7.910461e-1, 7.929382e-1, 8.038330e-1,
-                9.834900e-1, 9.846191e-1, 9.852295e-1, 9.862671e-1
-            }, new[] {
-                0.000000e+0, 6.084290e-1, 3.672791e-1, 3.151855e-1,
-                1.488953e-1, 2.571716e-1, 5.103455e-1, 3.311157e-1,
-                5.426025e-2, 4.254456e-1, 7.998352e-1, 7.873230e-1,
-                5.418701e-1, 2.925110e-1, 8.468628e-2, 1.410522e-1,
-                9.819641e-1, 9.609070e-1, 3.530884e-2, 9.729004e-2,
-                5.758362e-1, 9.941711e-1, 7.215576e-1, 7.183228e-1,
-                2.028809e-1, 9.588623e-2, 2.032166e-1, 1.338806e-1,
-                5.003357e-1, 1.874390e-1, 9.804993e-1, 1.107788e-1
-            }
-        };
-
-        public static readonly double[] BexMode2Scale =
-        {
-            4.272461e-4, 1.312256e-3, 2.441406e-3, 3.692627e-3,
-            4.913330e-3, 6.134033e-3, 7.507324e-3, 8.972168e-3,
-            1.049805e-2, 1.223755e-2, 1.406860e-2, 1.599121e-2,
-            1.800537e-2, 2.026367e-2, 2.264404e-2, 2.517700e-2,
-            2.792358e-2, 3.073120e-2, 3.344727e-2, 3.631592e-2,
-            3.952026e-2, 4.275513e-2, 4.608154e-2, 4.968262e-2,
-            5.355835e-2, 5.783081e-2, 6.195068e-2, 6.677246e-2,
-            7.196045e-2, 7.745361e-2, 8.319092e-2, 8.993530e-2,
-            9.759521e-2, 1.056213e-1, 1.138916e-1, 1.236267e-1,
-            1.348267e-1, 1.470337e-1, 1.603394e-1, 1.755676e-1,
-            1.905823e-1, 2.071228e-1, 2.245178e-1, 2.444153e-1,
-            2.658997e-1, 2.897644e-1, 3.146057e-1, 3.450012e-1,
-            3.766174e-1, 4.122620e-1, 4.505615e-1, 4.893799e-1,
-            5.305481e-1, 5.731201e-1, 6.157837e-1, 6.580811e-1,
-            6.985168e-1, 7.435303e-1, 7.865906e-1, 8.302612e-1,
-            8.718567e-1, 9.125671e-1, 9.575806e-1, 9.996643e-1
-        };
-
-        public static readonly double[] BexMode3Initial =
-        {
-            3.491211e-1, 5.371094e-1, 6.782227e-1, 7.910156e-1,
-            9.057617e-1, 1.024902e+0, 1.156250e+0, 1.290527e+0,
-            1.458984e+0, 1.664551e+0, 1.929688e+0, 2.278320e+0,
-            2.831543e+0, 3.659180e+0, 5.257813e+0, 8.373047e+0
-        };
-
-        public static readonly double[] BexMode3Rate =
-        {
-            -2.913818e-1, -2.541504e-1, -1.664429e-1, -1.476440e-1,
-            -1.342163e-1, -1.220703e-1, -1.117554e-1, -1.026611e-1,
-            -9.436035e-2, -8.483887e-2, -7.476807e-2, -6.304932e-2,
-            -4.492188e-2, -2.447510e-2, +1.831055e-4, +4.174805e-2
-        };
-
-        public static readonly double[] BexMode4Multiplier =
-        {
-            3.610229e-2, 1.260681e-1, 2.227478e-1, 3.338318e-1,
-            4.662170e-1, 6.221313e-1, 7.989197e-1, 9.939575e-1
-        };
-    }
-}

src/SharpEmu.GUI/Atrac9/BitAllocation.cs

@@ -1,141 +0,0 @@
-#nullable disable
-using System;
-
-namespace LibAtrac9
-{
-    internal static class BitAllocation
-    {
-        public static void CreateGradient(Block block)
-        {
-            int valueCount = block.GradientEndValue - block.GradientStartValue;
-            int unitCount = block.GradientEndUnit - block.GradientStartUnit;
-
-            for (int i = 0; i < block.GradientEndUnit; i++)
-            {
-                block.Gradient[i] = block.GradientStartValue;
-            }
-
-            for (int i = block.GradientEndUnit; i <= block.QuantizationUnitCount; i++)
-            {
-                block.Gradient[i] = block.GradientEndValue;
-            }
-            if (unitCount <= 0) return;
-            if (valueCount == 0) return;
-
-            byte[] curve = Tables.GradientCurves[unitCount - 1];
-            if (valueCount <= 0)
-            {
-                double scale = (-valueCount - 1) / 31.0;
-                int baseVal = block.GradientStartValue - 1;
-                for (int i = block.GradientStartUnit; i < block.GradientEndUnit; i++)
-                {
-                    block.Gradient[i] = baseVal - (int)(curve[i - block.GradientStartUnit] * scale);
-                }
-            }
-            else
-            {
-                double scale = (valueCount - 1) / 31.0;
-                int baseVal = block.GradientStartValue + 1;
-                for (int i = block.GradientStartUnit; i < block.GradientEndUnit; i++)
-                {
-                    block.Gradient[i] = baseVal + (int)(curve[i - block.GradientStartUnit] * scale);
-                }
-            }
-        }
-
-        public static void CalculateMask(Channel channel)
-        {
-            Array.Clear(channel.PrecisionMask, 0, channel.PrecisionMask.Length);
-            for (int i = 1; i < channel.Block.QuantizationUnitCount; i++)
-            {
-                int delta = channel.ScaleFactors[i] - channel.ScaleFactors[i - 1];
-                if (delta > 1)
-                {
-                    channel.PrecisionMask[i] += Math.Min(delta - 1, 5);
-                }
-                else if (delta < -1)
-                {
-                    channel.PrecisionMask[i - 1] += Math.Min(delta * -1 - 1, 5);
-                }
-            }
-        }
-
-        public static void CalculatePrecisions(Channel channel)
-        {
-            Block block = channel.Block;
-
-            if (block.GradientMode != 0)
-            {
-                for (int i = 0; i < block.QuantizationUnitCount; i++)
-                {
-                    channel.Precisions[i] = channel.ScaleFactors[i] + channel.PrecisionMask[i] - block.Gradient[i];
-                    if (channel.Precisions[i] > 0)
-                    {
-                        switch (block.GradientMode)
-                        {
-                            case 1:
-                                channel.Precisions[i] /= 2;
-                                break;
-                            case 2:
-                                channel.Precisions[i] = 3 * channel.Precisions[i] / 8;
-                                break;
-                            case 3:
-                                channel.Precisions[i] /= 4;
-                                break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (int i = 0; i < block.QuantizationUnitCount; i++)
-                {
-                    channel.Precisions[i] = channel.ScaleFactors[i] - block.Gradient[i];
-                }
-            }
-
-            for (int i = 0; i < block.QuantizationUnitCount; i++)
-            {
-                if (channel.Precisions[i] < 1)
-                {
-                    channel.Precisions[i] = 1;
-                }
-            }
-
-            for (int i = 0; i < block.GradientBoundary; i++)
-            {
-                channel.Precisions[i]++;
-            }
-
-            for (int i = 0; i < block.QuantizationUnitCount; i++)
-            {
-                channel.PrecisionsFine[i] = 0;
-                if (channel.Precisions[i] > 15)
-                {
-                    channel.PrecisionsFine[i] = channel.Precisions[i] - 15;
-                    channel.Precisions[i] = 15;
-                }
-            }
-        }
-
-        public static byte[][] GenerateGradientCurves()
-        {
-            byte[] main =
-            {
-                01, 01, 01, 01, 02, 02, 02, 02, 03, 03, 03, 04, 04, 05, 05, 06, 07, 08, 09, 10, 11, 12, 13, 15,
-                16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 27, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30
-            };
-            var curves = new byte[main.Length][];
-
-            for (int length = 1; length <= main.Length; length++)
-            {
-                curves[length - 1] = new byte[length];
-                for (int i = 0; i < length; i++)
-                {
-                    curves[length - 1][i] = main[i * main.Length / length];
-                }
-            }
-            return curves;
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Block.cs

@@ -1,92 +0,0 @@
-#nullable disable
-namespace LibAtrac9
-{
-    internal class Block
-    {
-        public Atrac9Config Config { get; }
-        public BlockType BlockType { get; }
-        public int BlockIndex { get; }
-        public Frame Frame { get; }
-
-        public Channel[] Channels { get; }
-        public int ChannelCount { get; }
-
-        public bool FirstInSuperframe { get; set; }
-        public bool ReuseBandParams { get; set; }
-
-        public int BandCount { get; set; }
-        public int StereoBand { get; set; }
-        public int ExtensionBand { get; set; }
-        public int QuantizationUnitCount { get; set; }
-        public int StereoQuantizationUnit { get; set; }
-        public int ExtensionUnit { get; set; }
-        public int QuantizationUnitsPrev { get; set; }
-
-        public int[] Gradient { get; } = new int[31];
-        public int GradientMode { get; set; }
-        public int GradientStartUnit { get; set; }
-        public int GradientStartValue { get; set; }
-        public int GradientEndUnit { get; set; }
-        public int GradientEndValue { get; set; }
-        public int GradientBoundary { get; set; }
-
-        public int PrimaryChannelIndex { get; set; }
-        public int[] JointStereoSigns { get; } = new int[30];
-        public bool HasJointStereoSigns { get; set; }
-        public Channel PrimaryChannel => Channels[PrimaryChannelIndex == 0 ? 0 : 1];
-        public Channel SecondaryChannel => Channels[PrimaryChannelIndex == 0 ? 1 : 0];
-
-        public bool BandExtensionEnabled { get; set; }
-        public bool HasExtensionData { get; set; }
-        public int BexDataLength { get; set; }
-        public int BexMode { get; set; }
-
-        public Block(Frame parentFrame, int blockIndex)
-        {
-            Frame = parentFrame;
-            BlockIndex = blockIndex;
-            Config = parentFrame.Config;
-            BlockType = Config.ChannelConfig.BlockTypes[blockIndex];
-            ChannelCount = BlockTypeToChannelCount(BlockType);
-            Channels = new Channel[ChannelCount];
-            for (int i = 0; i < ChannelCount; i++)
-            {
-                Channels[i] = new Channel(this, i);
-            }
-        }
-
-        public static int BlockTypeToChannelCount(BlockType blockType)
-        {
-            switch (blockType)
-            {
-                case BlockType.Mono:
-                    return 1;
-                case BlockType.Stereo:
-                    return 2;
-                case BlockType.LFE:
-                    return 1;
-                default:
-                    return 0;
-            }
-        }
-    }
-
-    /// <summary>
-    /// An ATRAC9 block (substream) type
-    /// </summary>
-    public enum BlockType
-    {
-        /// <summary>
-        /// Mono ATRAC9 block
-        /// </summary>
-        Mono = 0,
-        /// <summary>
-        /// Stereo ATRAC9 block
-        /// </summary>
-        Stereo = 1,
-        /// <summary>
-        /// Low-frequency effects ATRAC9 block
-        /// </summary>
-        LFE = 2
-    }
-}

src/SharpEmu.GUI/Atrac9/Channel.cs

@@ -1,49 +0,0 @@
-#nullable disable
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    internal class Channel
-    {
-        public Atrac9Config Config { get; }
-        public int ChannelIndex { get; }
-        public bool IsPrimary => Block.PrimaryChannelIndex == ChannelIndex;
-        public Block Block { get; }
-        public Mdct Mdct { get; }
-
-        public double[] Pcm { get; } = new double[256];
-        public double[] Spectra { get; } = new double[256];
-
-        public int CodedQuantUnits { get; set; }
-        public int ScaleFactorCodingMode { get; set; }
-        public int[] ScaleFactors { get; } = new int[31];
-        public int[] ScaleFactorsPrev { get; } = new int[31];
-
-        public int[] Precisions { get; } = new int[30];
-        public int[] PrecisionsFine { get; } = new int[30];
-        public int[] PrecisionMask { get; } = new int[30];
-
-        public int[] SpectraValuesBuffer { get; } = new int[16];
-        public int[] CodebookSet { get; } = new int[30];
-
-        public int[] QuantizedSpectra { get; } = new int[256];
-        public int[] QuantizedSpectraFine { get; } = new int[256];
-
-        public int BexMode { get; set; }
-        public int BexValueCount { get; set; }
-        public int[] BexValues { get; } = new int[4];
-        public double[] BexScales { get; } = new double[6];
-        public Atrac9Rng Rng { get; set; }
-
-        public Channel(Block parentBlock, int channelIndex)
-        {
-            Block = parentBlock;
-            ChannelIndex = channelIndex;
-            Config = parentBlock.Config;
-            Mdct = new Mdct(Config.FrameSamplesPower, Tables.ImdctWindow[Config.FrameSamplesPower - 6]);
-        }
-
-        public void UpdateCodedUnits() =>
-            CodedQuantUnits = IsPrimary ? Block.QuantizationUnitCount : Block.StereoQuantizationUnit;
-    }
-}

src/SharpEmu.GUI/Atrac9/ChannelConfig.cs

@@ -1,34 +0,0 @@
-#nullable disable
-namespace LibAtrac9
-{
-    /// <summary>
-    /// Describes the channel mapping for an ATRAC9 stream
-    /// </summary>
-    public class ChannelConfig
-    {
-        internal ChannelConfig(params BlockType[] blockTypes)
-        {
-            BlockCount = blockTypes.Length;
-            BlockTypes = blockTypes;
-            foreach (BlockType type in blockTypes)
-            {
-                ChannelCount += Block.BlockTypeToChannelCount(type);
-            }
-        }
-
-        /// <summary>
-        /// The number of blocks or substreams in the ATRAC9 stream
-        /// </summary>
-        public int BlockCount { get; }
-
-        /// <summary>
-        /// The type of each block or substream in the ATRAC9 stream
-        /// </summary>
-        public BlockType[] BlockTypes { get; }
-
-        /// <summary>
-        /// The number of channels in the ATRAC9 stream
-        /// </summary>
-        public int ChannelCount { get; }
-    }
-}

src/SharpEmu.GUI/Atrac9/Frame.cs

@@ -1,21 +0,0 @@
-#nullable disable
-namespace LibAtrac9
-{
-    internal class Frame
-    {
-        public Atrac9Config Config { get; }
-        public int FrameIndex { get; set; }
-        public Block[] Blocks { get; }
-
-        public Frame(Atrac9Config config)
-        {
-            Config = config;
-            Blocks = new Block[config.ChannelConfig.BlockCount];
-
-            for (int i = 0; i < config.ChannelConfig.BlockCount; i++)
-            {
-                Blocks[i] = new Block(this, i);
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/HuffmanCodebook.cs

@@ -1,63 +0,0 @@
-#nullable disable
-using System;
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    internal class HuffmanCodebook
-    {
-        public HuffmanCodebook(short[] codes, byte[] bits, byte valueCountPower)
-        {
-            Codes = codes;
-            Bits = bits;
-            if (Codes == null || Bits == null) return;
-
-            ValueCount = 1 << valueCountPower;
-            ValueCountPower = valueCountPower;
-            ValueBits = Helpers.Log2(codes.Length) >> valueCountPower;
-            ValueMax = 1 << ValueBits;
-
-            int max = 0;
-            foreach (byte bitSize in bits)
-            {
-                max = Math.Max(max, bitSize);
-            }
-
-            MaxBitSize = max;
-            Lookup = CreateLookupTable();
-        }
-
-        private byte[] CreateLookupTable()
-        {
-            if (Codes == null || Bits == null) return null;
-
-            int tableSize = 1 << MaxBitSize;
-            var dest = new byte[tableSize];
-
-            for (int i = 0; i < Bits.Length; i++)
-            {
-                if (Bits[i] == 0) continue;
-                int unusedBits = MaxBitSize - Bits[i];
-
-                int start = Codes[i] << unusedBits;
-                int length = 1 << unusedBits;
-                int end = start + length;
-
-                for (int j = start; j < end; j++)
-                {
-                    dest[j] = (byte)i;
-                }
-            }
-            return dest;
-        }
-
-        public short[] Codes { get; }
-        public byte[] Bits { get; }
-        public byte[] Lookup { get; }
-        public int ValueCount { get; }
-        public int ValueCountPower { get; }
-        public int ValueBits { get; }
-        public int ValueMax { get; }
-        public int MaxBitSize { get; }
-    }
-}

src/SharpEmu.GUI/Atrac9/LICENSE.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Alex Barney
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

src/SharpEmu.GUI/Atrac9/Quantization.cs

@@ -1,58 +0,0 @@
-#nullable disable
-using System;
-
-namespace LibAtrac9
-{
-    internal static class Quantization
-    {
-        public static void DequantizeSpectra(Block block)
-        {
-            foreach (Channel channel in block.Channels)
-            {
-                Array.Clear(channel.Spectra, 0, channel.Spectra.Length);
-
-                for (int i = 0; i < channel.CodedQuantUnits; i++)
-                {
-                    DequantizeQuantUnit(channel, i);
-                }
-            }
-        }
-
-        private static void DequantizeQuantUnit(Channel channel, int band)
-        {
-            int subBandIndex = Tables.QuantUnitToCoeffIndex[band];
-            int subBandCount = Tables.QuantUnitToCoeffCount[band];
-            double stepSize = Tables.QuantizerStepSize[channel.Precisions[band]];
-            double stepSizeFine = Tables.QuantizerFineStepSize[channel.PrecisionsFine[band]];
-
-            for (int sb = 0; sb < subBandCount; sb++)
-            {
-                double coarse = channel.QuantizedSpectra[subBandIndex + sb] * stepSize;
-                double fine = channel.QuantizedSpectraFine[subBandIndex + sb] * stepSizeFine;
-                channel.Spectra[subBandIndex + sb] = coarse + fine;
-            }
-        }
-
-        public static void ScaleSpectrum(Block block)
-        {
-            foreach (Channel channel in block.Channels)
-            {
-                ScaleSpectrum(channel);
-            }
-        }
-
-        private static void ScaleSpectrum(Channel channel)
-        {
-            int quantUnitCount = channel.Block.QuantizationUnitCount;
-            double[] spectra = channel.Spectra;
-
-            for (int i = 0; i < quantUnitCount; i++)
-            {
-                for (int sb = Tables.QuantUnitToCoeffIndex[i]; sb < Tables.QuantUnitToCoeffIndex[i + 1]; sb++)
-                {
-                    spectra[sb] *= Tables.SpectrumScale[channel.ScaleFactors[i]];
-                }
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/ScaleFactors.cs

@@ -1,172 +0,0 @@
-#nullable disable
-using System;
-using System.IO;
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    internal static class ScaleFactors
-    {
-        public static void Read(BitReader reader, Channel channel)
-        {
-            Array.Clear(channel.ScaleFactors, 0, channel.ScaleFactors.Length);
-
-            channel.ScaleFactorCodingMode = reader.ReadInt(2);
-            if (channel.ChannelIndex == 0)
-            {
-                switch (channel.ScaleFactorCodingMode)
-                {
-                    case 0:
-                        ReadVlcDeltaOffset(reader, channel);
-                        break;
-                    case 1:
-                        ReadClcOffset(reader, channel);
-                        break;
-                    case 2:
-                        if (channel.Block.FirstInSuperframe) throw new InvalidDataException();
-                        ReadVlcDistanceToBaseline(reader, channel, channel.ScaleFactorsPrev, channel.Block.QuantizationUnitsPrev);
-                        break;
-                    case 3:
-                        if (channel.Block.FirstInSuperframe) throw new InvalidDataException();
-                        ReadVlcDeltaOffsetWithBaseline(reader, channel, channel.ScaleFactorsPrev, channel.Block.QuantizationUnitsPrev);
-                        break;
-                }
-            }
-            else
-            {
-                switch (channel.ScaleFactorCodingMode)
-                {
-                    case 0:
-                        ReadVlcDeltaOffset(reader, channel);
-                        break;
-                    case 1:
-                        ReadVlcDistanceToBaseline(reader, channel, channel.Block.Channels[0].ScaleFactors, channel.Block.ExtensionUnit);
-                        break;
-                    case 2:
-                        ReadVlcDeltaOffsetWithBaseline(reader, channel, channel.Block.Channels[0].ScaleFactors, channel.Block.ExtensionUnit);
-                        break;
-                    case 3:
-                        if (channel.Block.FirstInSuperframe) throw new InvalidDataException();
-                        ReadVlcDistanceToBaseline(reader, channel, channel.ScaleFactorsPrev, channel.Block.QuantizationUnitsPrev);
-                        break;
-                }
-            }
-
-            for (int i = 0; i < channel.Block.ExtensionUnit; i++)
-            {
-                if (channel.ScaleFactors[i] < 0 || channel.ScaleFactors[i] > 31)
-                {
-                    throw new InvalidDataException("Scale factor values are out of range.");
-                }
-            }
-
-            Array.Copy(channel.ScaleFactors, channel.ScaleFactorsPrev, channel.ScaleFactors.Length);
-        }
-
-        private static void ReadClcOffset(BitReader reader, Channel channel)
-        {
-            const int maxBits = 5;
-            int[] sf = channel.ScaleFactors;
-            int bitLength = reader.ReadInt(2) + 2;
-            int baseValue = bitLength < maxBits ? reader.ReadInt(maxBits) : 0;
-
-            for (int i = 0; i < channel.Block.ExtensionUnit; i++)
-            {
-                sf[i] = reader.ReadInt(bitLength) + baseValue;
-            }
-        }
-
-        private static void ReadVlcDeltaOffset(BitReader reader, Channel channel)
-        {
-            int weightIndex = reader.ReadInt(3);
-            byte[] weights = ScaleFactorWeights[weightIndex];
-
-            int[] sf = channel.ScaleFactors;
-            int baseValue = reader.ReadInt(5);
-            int bitLength = reader.ReadInt(2) + 3;
-            HuffmanCodebook codebook = Tables.HuffmanScaleFactorsUnsigned[bitLength];
-
-            sf[0] = reader.ReadInt(bitLength);
-
-            for (int i = 1; i < channel.Block.ExtensionUnit; i++)
-            {
-                int delta = Unpack.ReadHuffmanValue(codebook, reader);
-                sf[i] = (sf[i - 1] + delta) & (codebook.ValueMax - 1);
-            }
-
-            for (int i = 0; i < channel.Block.ExtensionUnit; i++)
-            {
-                sf[i] += baseValue - weights[i];
-            }
-        }
-
-        private static void ReadVlcDistanceToBaseline(BitReader reader, Channel channel, int[] baseline, int baselineLength)
-        {
-            int[] sf = channel.ScaleFactors;
-            int bitLength = reader.ReadInt(2) + 2;
-            HuffmanCodebook codebook = Tables.HuffmanScaleFactorsSigned[bitLength];
-            int unitCount = Math.Min(channel.Block.ExtensionUnit, baselineLength);
-
-            for (int i = 0; i < unitCount; i++)
-            {
-                int distance = Unpack.ReadHuffmanValue(codebook, reader, true);
-                sf[i] = (baseline[i] + distance) & 31;
-            }
-
-            for (int i = unitCount; i < channel.Block.ExtensionUnit; i++)
-            {
-                sf[i] = reader.ReadInt(5);
-            }
-        }
-
-        private static void ReadVlcDeltaOffsetWithBaseline(BitReader reader, Channel channel, int[] baseline, int baselineLength)
-        {
-            int[] sf = channel.ScaleFactors;
-            int baseValue = reader.ReadOffsetBinary(5, BitReader.OffsetBias.Negative);
-            int bitLength = reader.ReadInt(2) + 1;
-            HuffmanCodebook codebook = Tables.HuffmanScaleFactorsUnsigned[bitLength];
-            int unitCount = Math.Min(channel.Block.ExtensionUnit, baselineLength);
-
-            sf[0] = reader.ReadInt(bitLength);
-
-            for (int i = 1; i < unitCount; i++)
-            {
-                int delta = Unpack.ReadHuffmanValue(codebook, reader);
-                sf[i] = (sf[i - 1] + delta) & (codebook.ValueMax - 1);
-            }
-
-            for (int i = 0; i < unitCount; i++)
-            {
-                sf[i] += baseValue + baseline[i];
-            }
-
-            for (int i = unitCount; i < channel.Block.ExtensionUnit; i++)
-            {
-                sf[i] = reader.ReadInt(5);
-            }
-        }
-
-        public static readonly byte[][] ScaleFactorWeights =
-        {
-            new byte[] {
-                0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 3, 2, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, 10, 12, 12, 12
-            }, new byte[] {
-                3, 2, 2, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 2, 3, 3, 4, 5, 7, 10, 10, 10
-            }, new byte[] {
-                0, 2, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 9, 12, 12, 12
-            }, new byte[] {
-                0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 8, 8, 10, 11, 11, 12, 13, 13, 13, 13
-            }, new byte[] {
-                0, 2, 2, 3, 3, 4, 4, 5, 4, 5, 5, 5, 5, 6, 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, 11, 12, 12, 13, 13, 14, 14, 14
-            }, new byte[] {
-                1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 6, 7, 7, 9, 11, 11, 11
-            }, new byte[] {
-                0, 5, 8, 10, 11, 11, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 12, 12, 12,
-                12, 13, 15, 15, 15
-            }, new byte[] {
-                0, 2, 3, 4, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13,
-                15, 15, 15
-            }
-        };
-    }
-}

src/SharpEmu.GUI/Atrac9/Stereo.cs

@@ -1,34 +0,0 @@
-#nullable disable
-namespace LibAtrac9
-{
-    internal static class Stereo
-    {
-        public static void ApplyIntensityStereo(Block block)
-        {
-            if (block.BlockType != BlockType.Stereo) return;
-
-            int totalUnits = block.QuantizationUnitCount;
-            int stereoUnits = block.StereoQuantizationUnit;
-            if (stereoUnits >= totalUnits) return;
-
-            Channel source = block.PrimaryChannel;
-            Channel dest = block.SecondaryChannel;
-
-            for (int i = stereoUnits; i < totalUnits; i++)
-            {
-                int sign = block.JointStereoSigns[i];
-                for (int sb = Tables.QuantUnitToCoeffIndex[i]; sb < Tables.QuantUnitToCoeffIndex[i + 1]; sb++)
-                {
-                    if (sign > 0)
-                    {
-                        dest.Spectra[sb] = -source.Spectra[sb];
-                    }
-                    else
-                    {
-                        dest.Spectra[sb] = source.Spectra[sb];
-                    }
-                }
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Tables.cs

@@ -1,116 +0,0 @@
-#nullable disable
-using System;
-using static LibAtrac9.HuffmanCodebooks;
-
-namespace LibAtrac9
-{
-    internal static class Tables
-    {
-        public static int MaxHuffPrecision(bool highSampleRate) => highSampleRate ? 1 : 7;
-        public static int MinBandCount(bool highSampleRate) => highSampleRate ? 1 : 3;
-        public static int MaxExtensionBand(bool highSampleRate) => highSampleRate ? 16 : 18;
-
-        public static readonly int[] SampleRates =
-        {
-            11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000,
-            44100, 48000, 64000, 88200, 96000, 128000, 176400, 192000
-        };
-
-        public static readonly byte[] SamplingRateIndexToFrameSamplesPower = { 6, 6, 7, 7, 7, 8, 8, 8, 6, 6, 7, 7, 7, 8, 8, 8 };
-
-        // From sampling rate index
-        public static readonly byte[] MaxBandCount = { 8, 8, 12, 12, 12, 18, 18, 18, 8, 8, 12, 12, 12, 16, 16, 16 };
-        public static readonly byte[] BandToQuantUnitCount = { 0, 4, 8, 10, 12, 13, 14, 15, 16, 18, 20, 21, 22, 23, 24, 25, 26, 28, 30 };
-
-        public static readonly byte[] QuantUnitToCoeffCount =
-        {
-            02, 02, 02, 02, 02, 02, 02, 02, 04, 04, 04, 04, 08, 08, 08,
-            08, 08, 08, 08, 08, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
-        };
-
-        public static readonly short[] QuantUnitToCoeffIndex =
-        {
-            0, 2, 4, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-            64, 72, 80, 88, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256
-        };
-
-        public static readonly byte[] QuantUnitToCodebookIndex =
-        {
-            0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2,
-            2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
-        };
-
-        public static readonly ChannelConfig[] ChannelConfig =
-        {
-            new ChannelConfig(BlockType.Mono),
-            new ChannelConfig(BlockType.Mono, BlockType.Mono),
-            new ChannelConfig(BlockType.Stereo),
-            new ChannelConfig(BlockType.Stereo, BlockType.Mono, BlockType.LFE, BlockType.Stereo),
-            new ChannelConfig(BlockType.Stereo, BlockType.Mono, BlockType.LFE, BlockType.Stereo, BlockType.Stereo),
-            new ChannelConfig(BlockType.Stereo, BlockType.Stereo)
-        };
-
-        public static readonly HuffmanCodebook[] HuffmanScaleFactorsUnsigned =
-            GenerateHuffmanCodebooks(HuffmanScaleFactorsACodes, HuffmanScaleFactorsABits, HuffmanScaleFactorsGroupSizes);
-        
-        public static readonly HuffmanCodebook[] HuffmanScaleFactorsSigned =
-            GenerateHuffmanCodebooks(HuffmanScaleFactorsBCodes, HuffmanScaleFactorsBBits, HuffmanScaleFactorsGroupSizes);
-
-        public static readonly HuffmanCodebook[][][] HuffmanSpectrum =
-        {
-            GenerateHuffmanCodebooks(HuffmanSpectrumACodes, HuffmanSpectrumABits, HuffmanSpectrumAGroupSizes),
-            GenerateHuffmanCodebooks(HuffmanSpectrumBCodes, HuffmanSpectrumBBits, HuffmanSpectrumBGroupSizes)
-        };
-
-        public static readonly double[][] ImdctWindow = { GenerateImdctWindow(6), GenerateImdctWindow(7), GenerateImdctWindow(8) };
-
-        public static readonly double[] SpectrumScale = Generate(32, SpectrumScaleFunction);
-        public static readonly double[] QuantizerStepSize = Generate(16, QuantizerStepSizeFunction);
-        public static readonly double[] QuantizerFineStepSize = Generate(16, QuantizerFineStepSizeFunction);
-
-        public static readonly byte[][] GradientCurves = BitAllocation.GenerateGradientCurves();
-
-        private static double QuantizerStepSizeFunction(int x) => 2.0 / ((1 << (x + 1)) - 1);
-        private static double QuantizerFineStepSizeFunction(int x) => QuantizerStepSizeFunction(x) / ushort.MaxValue;
-        private static double SpectrumScaleFunction(int x) => Math.Pow(2, x - 15);
-
-        private static double[] GenerateImdctWindow(int frameSizePower)
-        {
-            int frameSize = 1 << frameSizePower;
-            var output = new double[frameSize];
-
-            double[] a1 = GenerateMdctWindow(frameSizePower);
-
-            for (int i = 0; i < frameSize; i++)
-            {
-                output[i] = a1[i] / (a1[frameSize - 1 - i] * a1[frameSize - 1 - i] + a1[i] * a1[i]);
-            }
-            return output;
-        }
-
-        private static double[] GenerateMdctWindow(int frameSizePower)
-        {
-            int frameSize = 1 << frameSizePower;
-            var output = new double[frameSize];
-
-            for (int i = 0; i < frameSize; i++)
-            {
-                output[i] = (Math.Sin(((i + 0.5) / frameSize - 0.5) * Math.PI) + 1.0) * 0.5;
-            }
-
-            return output;
-        }
-
-        private static T[] Generate<T>(int count, Func<int, T> elementGenerator)
-        {
-            var table = new T[count];
-            for (int i = 0; i < count; i++)
-            {
-                table[i] = elementGenerator(i);
-            }
-            return table;
-        }
-
-        
-    }
-}

src/SharpEmu.GUI/Atrac9/Unpack.cs

@@ -1,426 +0,0 @@
-#nullable disable
-using System;
-using System.IO;
-using LibAtrac9.Utilities;
-
-namespace LibAtrac9
-{
-    internal static class Unpack
-    {
-        public static void UnpackFrame(BitReader reader, Frame frame)
-        {
-            foreach (Block block in frame.Blocks)
-            {
-                UnpackBlock(reader, block);
-            }
-        }
-
-        private static void UnpackBlock(BitReader reader, Block block)
-        {
-            ReadBlockHeader(reader, block);
-
-            if (block.BlockType == BlockType.LFE)
-            {
-                UnpackLfeBlock(reader, block);
-            }
-            else
-            {
-                UnpackStandardBlock(reader, block);
-            }
-
-            reader.AlignPosition(8);
-        }
-
-        private static void ReadBlockHeader(BitReader reader, Block block)
-        {
-            bool firstInSuperframe = block.Frame.FrameIndex == 0;
-            block.FirstInSuperframe = !reader.ReadBool();
-            block.ReuseBandParams = reader.ReadBool();
-
-            if (block.FirstInSuperframe != firstInSuperframe)
-            {
-                throw new InvalidDataException();
-            }
-
-            if (firstInSuperframe && block.ReuseBandParams && block.BlockType != BlockType.LFE)
-            {
-                throw new InvalidDataException();
-            }
-        }
-
-        private static void UnpackStandardBlock(BitReader reader, Block block)
-        {
-            Channel[] channels = block.Channels;
-
-            if (!block.ReuseBandParams)
-            {
-                ReadBandParams(reader, block);
-            }
-
-            ReadGradientParams(reader, block);
-            BitAllocation.CreateGradient(block);
-            ReadStereoParams(reader, block);
-            ReadExtensionParams(reader, block);
-
-            foreach (Channel channel in channels)
-            {
-                channel.UpdateCodedUnits();
-
-                ScaleFactors.Read(reader, channel);
-                BitAllocation.CalculateMask(channel);
-                BitAllocation.CalculatePrecisions(channel);
-                CalculateSpectrumCodebookIndex(channel);
-
-                ReadSpectra(reader, channel);
-                ReadSpectraFine(reader, channel);
-            }
-
-            block.QuantizationUnitsPrev = block.BandExtensionEnabled ? block.ExtensionUnit : block.QuantizationUnitCount;
-        }
-
-        private static void ReadBandParams(BitReader reader, Block block)
-        {
-            int minBandCount = Tables.MinBandCount(block.Config.HighSampleRate);
-            int maxExtensionBand = Tables.MaxExtensionBand(block.Config.HighSampleRate);
-            block.BandCount = reader.ReadInt(4);
-            block.BandCount += minBandCount;
-            block.QuantizationUnitCount = Tables.BandToQuantUnitCount[block.BandCount];
-            if (block.BandCount < minBandCount || block.BandCount >
-                Tables.MaxBandCount[block.Config.SampleRateIndex])
-            {
-                return;
-            }
-
-            if (block.BlockType == BlockType.Stereo)
-            {
-                block.StereoBand = reader.ReadInt(4);
-                block.StereoBand += minBandCount;
-                block.StereoQuantizationUnit = Tables.BandToQuantUnitCount[block.StereoBand];
-            }
-            else
-            {
-                block.StereoBand = block.BandCount;
-            }
-
-            block.BandExtensionEnabled = reader.ReadBool();
-            if (block.BandExtensionEnabled)
-            {
-                block.ExtensionBand = reader.ReadInt(4);
-                block.ExtensionBand += minBandCount;
-
-                if (block.ExtensionBand < block.BandCount || block.ExtensionBand > maxExtensionBand)
-                {
-                    throw new InvalidDataException();
-                }
-
-                block.ExtensionUnit = Tables.BandToQuantUnitCount[block.ExtensionBand];
-            }
-            else
-            {
-                block.ExtensionBand = block.BandCount;
-                block.ExtensionUnit = block.QuantizationUnitCount;
-            }
-        }
-
-        private static void ReadGradientParams(BitReader reader, Block block)
-        {
-            block.GradientMode = reader.ReadInt(2);
-            if (block.GradientMode > 0)
-            {
-                block.GradientEndUnit = 31;
-                block.GradientEndValue = 31;
-                block.GradientStartUnit = reader.ReadInt(5);
-                block.GradientStartValue = reader.ReadInt(5);
-            }
-            else
-            {
-                block.GradientStartUnit = reader.ReadInt(6);
-                block.GradientEndUnit = reader.ReadInt(6) + 1;
-                block.GradientStartValue = reader.ReadInt(5);
-                block.GradientEndValue = reader.ReadInt(5);
-            }
-            block.GradientBoundary = reader.ReadInt(4);
-
-            if (block.GradientBoundary > block.QuantizationUnitCount)
-            {
-                throw new InvalidDataException();
-            }
-            if (block.GradientStartUnit < 1 || block.GradientStartUnit >= 48)
-            {
-                throw new InvalidDataException();
-            }
-            if (block.GradientEndUnit < 1 || block.GradientEndUnit >= 48)
-            {
-                throw new InvalidDataException();
-            }
-            if (block.GradientStartUnit > block.GradientEndUnit)
-            {
-                throw new InvalidDataException();
-            }
-            if (block.GradientStartValue < 0 || block.GradientStartValue >= 32)
-            {
-                throw new InvalidDataException();
-            }
-            if (block.GradientEndValue < 0 || block.GradientEndValue >= 32)
-            {
-                throw new InvalidDataException();
-            }
-        }
-
-        private static void ReadStereoParams(BitReader reader, Block block)
-        {
-            if (block.BlockType != BlockType.Stereo) return;
-
-            block.PrimaryChannelIndex = reader.ReadInt(1);
-            block.HasJointStereoSigns = reader.ReadBool();
-            if (block.HasJointStereoSigns)
-            {
-                for (int i = block.StereoQuantizationUnit; i < block.QuantizationUnitCount; i++)
-                {
-                    block.JointStereoSigns[i] = reader.ReadInt(1);
-                }
-            }
-            else
-            {
-                Array.Clear(block.JointStereoSigns, 0, block.JointStereoSigns.Length);
-            }
-        }
-
-        private static void ReadExtensionParams(BitReader reader, Block block)
-        {
-            // ReSharper disable once RedundantAssignment
-            int bexBand = 0;
-            if (block.BandExtensionEnabled)
-            {
-                BandExtension.GetBexBandInfo(out bexBand, out _, out _, block.QuantizationUnitCount);
-                if (block.BlockType == BlockType.Stereo)
-                {
-                    ReadHeader(block.Channels[1]);
-                }
-                else
-                {
-                    reader.Position += 1;
-                }
-            }
-            block.HasExtensionData = reader.ReadBool();
-
-            if (!block.HasExtensionData) return;
-            if (!block.BandExtensionEnabled)
-            {
-                block.BexMode = reader.ReadInt(2);
-                block.BexDataLength = reader.ReadInt(5);
-                reader.Position += block.BexDataLength;
-                return;
-            }
-
-            ReadHeader(block.Channels[0]);
-
-            block.BexDataLength = reader.ReadInt(5);
-            if (block.BexDataLength <= 0) return;
-            int bexDataEnd = reader.Position + block.BexDataLength;
-
-            ReadData(block.Channels[0]);
-
-            if (block.BlockType == BlockType.Stereo)
-            {
-                ReadData(block.Channels[1]);
-            }
-
-            // Make sure we didn't read too many bits
-            if (reader.Position > bexDataEnd)
-            {
-                throw new InvalidDataException();
-            }
-
-            void ReadHeader(Channel channel)
-            {
-                int bexMode = reader.ReadInt(2);
-                channel.BexMode = bexBand > 2 ? bexMode : 4;
-                channel.BexValueCount = BandExtension.BexEncodedValueCounts[channel.BexMode][bexBand];
-            }
-
-            void ReadData(Channel channel)
-            {
-                for (int i = 0; i < channel.BexValueCount; i++)
-                {
-                    int dataLength = BandExtension.BexDataLengths[channel.BexMode][bexBand][i];
-                    channel.BexValues[i] = reader.ReadInt(dataLength);
-                }
-            }
-        }
-
-        private static void CalculateSpectrumCodebookIndex(Channel channel)
-        {
-            Array.Clear(channel.CodebookSet, 0, channel.CodebookSet.Length);
-            int quantUnits = channel.CodedQuantUnits;
-            int[] sf = channel.ScaleFactors;
-
-            if (quantUnits <= 1) return;
-            if (channel.Config.HighSampleRate) return;
-
-            // Temporarily setting this value allows for simpler code by
-            // making the last value a non-special case.
-            int originalScaleTmp = sf[quantUnits];
-            sf[quantUnits] = sf[quantUnits - 1];
-
-            int avg = 0;
-            if (quantUnits > 12)
-            {
-                for (int i = 0; i < 12; i++)
-                {
-                    avg += sf[i];
-                }
-                avg = (avg + 6) / 12;
-            }
-
-            for (int i = 8; i < quantUnits; i++)
-            {
-                int prevSf = sf[i - 1];
-                int nextSf = sf[i + 1];
-                int minSf = Math.Min(prevSf, nextSf);
-                if (sf[i] - minSf >= 3 || sf[i] - prevSf + sf[i] - nextSf >= 3)
-                {
-                    channel.CodebookSet[i] = 1;
-                }
-            }
-
-            for (int i = 12; i < quantUnits; i++)
-            {
-                if (channel.CodebookSet[i] == 0)
-                {
-                    int minSf = Math.Min(sf[i - 1], sf[i + 1]);
-                    if (sf[i] - minSf >= 2 && sf[i] >= avg - (Tables.QuantUnitToCoeffCount[i] == 16 ? 1 : 0))
-                    {
-                        channel.CodebookSet[i] = 1;
-                    }
-                }
-            }
-
-            sf[quantUnits] = originalScaleTmp;
-        }
-
-        private static void ReadSpectra(BitReader reader, Channel channel)
-        {
-            int[] values = channel.SpectraValuesBuffer;
-            Array.Clear(channel.QuantizedSpectra, 0, channel.QuantizedSpectra.Length);
-            int maxHuffPrecision = Tables.MaxHuffPrecision(channel.Config.HighSampleRate);
-
-            for (int i = 0; i < channel.CodedQuantUnits; i++)
-            {
-                int subbandCount = Tables.QuantUnitToCoeffCount[i];
-                int precision = channel.Precisions[i] + 1;
-                if (precision <= maxHuffPrecision)
-                {
-                    HuffmanCodebook huff = Tables.HuffmanSpectrum[channel.CodebookSet[i]][precision][Tables.QuantUnitToCodebookIndex[i]];
-                    int groupCount = subbandCount >> huff.ValueCountPower;
-                    for (int j = 0; j < groupCount; j++)
-                    {
-                        values[j] = ReadHuffmanValue(huff, reader);
-                    }
-
-                    DecodeHuffmanValues(channel.QuantizedSpectra, Tables.QuantUnitToCoeffIndex[i], subbandCount, huff, values);
-                }
-                else
-                {
-                    int subbandIndex = Tables.QuantUnitToCoeffIndex[i];
-                    for (int j = subbandIndex; j < Tables.QuantUnitToCoeffIndex[i + 1]; j++)
-                    {
-                        channel.QuantizedSpectra[j] = reader.ReadSignedInt(precision);
-                    }
-                }
-            }
-        }
-
-        private static void ReadSpectraFine(BitReader reader, Channel channel)
-        {
-            Array.Clear(channel.QuantizedSpectraFine, 0, channel.QuantizedSpectraFine.Length);
-
-            for (int i = 0; i < channel.CodedQuantUnits; i++)
-            {
-                if (channel.PrecisionsFine[i] > 0)
-                {
-                    int overflowBits = channel.PrecisionsFine[i] + 1;
-                    int startSubband = Tables.QuantUnitToCoeffIndex[i];
-                    int endSubband = Tables.QuantUnitToCoeffIndex[i + 1];
-
-                    for (int j = startSubband; j < endSubband; j++)
-                    {
-                        channel.QuantizedSpectraFine[j] = reader.ReadSignedInt(overflowBits);
-                    }
-                }
-            }
-        }
-
-        private static void DecodeHuffmanValues(int[] spectrum, int index, int bandCount, HuffmanCodebook huff, int[] values)
-        {
-            int valueCount = bandCount >> huff.ValueCountPower;
-            int mask = (1 << huff.ValueBits) - 1;
-
-            for (int i = 0; i < valueCount; i++)
-            {
-                int value = values[i];
-                for (int j = 0; j < huff.ValueCount; j++)
-                {
-                    spectrum[index++] = Bit.SignExtend32(value & mask, huff.ValueBits);
-                    value >>= huff.ValueBits;
-                }
-            }
-        }
-
-        public static int ReadHuffmanValue(HuffmanCodebook huff, BitReader reader, bool signed = false)
-        {
-            int code = reader.PeekInt(huff.MaxBitSize);
-            byte value = huff.Lookup[code];
-            int bits = huff.Bits[value];
-            reader.Position += bits;
-            return signed ? Bit.SignExtend32(value, huff.ValueBits) : value;
-        }
-
-        private static void UnpackLfeBlock(BitReader reader, Block block)
-        {
-            Channel channel = block.Channels[0];
-            block.QuantizationUnitCount = 2;
-
-            DecodeLfeScaleFactors(reader, channel);
-            CalculateLfePrecision(channel);
-            channel.CodedQuantUnits = block.QuantizationUnitCount;
-            ReadLfeSpectra(reader, channel);
-        }
-
-        private static void DecodeLfeScaleFactors(BitReader reader, Channel channel)
-        {
-            Array.Clear(channel.ScaleFactors, 0, channel.ScaleFactors.Length);
-            for (int i = 0; i < channel.Block.QuantizationUnitCount; i++)
-            {
-                channel.ScaleFactors[i] = reader.ReadInt(5);
-            }
-        }
-
-        private static void CalculateLfePrecision(Channel channel)
-        {
-            Block block = channel.Block;
-            int precision = block.ReuseBandParams ? 8 : 4;
-            for (int i = 0; i < block.QuantizationUnitCount; i++)
-            {
-                channel.Precisions[i] = precision;
-                channel.PrecisionsFine[i] = 0;
-            }
-        }
-
-        private static void ReadLfeSpectra(BitReader reader, Channel channel)
-        {
-            Array.Clear(channel.QuantizedSpectra, 0, channel.QuantizedSpectra.Length);
-
-            for (int i = 0; i < channel.CodedQuantUnits; i++)
-            {
-                if (channel.Precisions[i] <= 0) continue;
-
-                int precision = channel.Precisions[i] + 1;
-                for (int j = Tables.QuantUnitToCoeffIndex[i]; j < Tables.QuantUnitToCoeffIndex[i + 1]; j++)
-                {
-                    channel.QuantizedSpectra[j] = reader.ReadSignedInt(precision);
-                }
-            }
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Utilities/Bit.cs

@@ -1,23 +0,0 @@
-#nullable disable
-namespace LibAtrac9.Utilities
-{
-    internal static class Bit
-    {
-        private static uint BitReverse32(uint value)
-        {
-            value = ((value & 0xaaaaaaaa) >> 1) | ((value & 0x55555555) << 1);
-            value = ((value & 0xcccccccc) >> 2) | ((value & 0x33333333) << 2);
-            value = ((value & 0xf0f0f0f0) >> 4) | ((value & 0x0f0f0f0f) << 4);
-            value = ((value & 0xff00ff00) >> 8) | ((value & 0x00ff00ff) << 8);
-            return (value >> 16) | (value << 16);
-        }
-        private static uint BitReverse32(uint value, int bitCount) => BitReverse32(value) >> (32 - bitCount);
-        public static int BitReverse32(int value, int bitCount) => (int) BitReverse32((uint) value, bitCount);
-
-        public static int SignExtend32(int value, int bits)
-        {
-            int shift = 8 * sizeof(int) - bits;
-            return (value << shift) >> shift;
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Utilities/BitReader.cs

@@ -1,133 +0,0 @@
-#nullable disable
-using System;
-using System.Diagnostics;
-
-namespace LibAtrac9.Utilities
-{
-    internal class BitReader
-    {
-        private byte[] Buffer { get; set; }
-        private int LengthBits { get; set; }
-        public int Position { get; set; }
-        private int Remaining => LengthBits - Position;
-
-        public BitReader(byte[] buffer) => SetBuffer(buffer);
-
-        public void SetBuffer(byte[] buffer)
-        {
-            Buffer = buffer;
-            LengthBits = Buffer?.Length * 8 ?? 0;
-            Position = 0;
-        }
-
-        public int ReadInt(int bitCount)
-        {
-            int value = PeekInt(bitCount);
-            Position += bitCount;
-            return value;
-        }
-
-        public int ReadSignedInt(int bitCount)
-        {
-            int value = PeekInt(bitCount);
-            Position += bitCount;
-            return Bit.SignExtend32(value, bitCount);
-        }
-
-        public bool ReadBool() => ReadInt(1) == 1;
-
-        public int ReadOffsetBinary(int bitCount, OffsetBias bias)
-        {
-            int offset = (1 << (bitCount - 1)) - (int)bias;
-            int value = PeekInt(bitCount) - offset;
-            Position += bitCount;
-            return value;
-        }
-
-        public void AlignPosition(int multiple)
-        {
-            Position = Helpers.GetNextMultiple(Position, multiple);
-        }
-
-        public int PeekInt(int bitCount)
-        {
-            Debug.Assert(bitCount >= 0 && bitCount <= 32);
-
-            if (bitCount > Remaining)
-            {
-                if (Position >= LengthBits) return 0;
-
-                int extraBits = bitCount - Remaining;
-                return PeekIntFallback(Remaining) << extraBits;
-            }
-
-            int byteIndex = Position / 8;
-            int bitIndex = Position % 8;
-
-            if (bitCount <= 9 && Remaining >= 16)
-            {
-                int value = Buffer[byteIndex] << 8 | Buffer[byteIndex + 1];
-                value &= 0xFFFF >> bitIndex;
-                value >>= 16 - bitCount - bitIndex;
-                return value;
-            }
-
-            if (bitCount <= 17 && Remaining >= 24)
-            {
-                int value = Buffer[byteIndex] << 16 | Buffer[byteIndex + 1] << 8 | Buffer[byteIndex + 2];
-                value &= 0xFFFFFF >> bitIndex;
-                value >>= 24 - bitCount - bitIndex;
-                return value;
-            }
-
-            if (bitCount <= 25 && Remaining >= 32)
-            {
-                int value = Buffer[byteIndex] << 24 | Buffer[byteIndex + 1] << 16 | Buffer[byteIndex + 2] << 8 | Buffer[byteIndex + 3];
-                value &= (int)(0xFFFFFFFF >> bitIndex);
-                value >>= 32 - bitCount - bitIndex;
-                return value;
-            }
-            return PeekIntFallback(bitCount);
-        }
-
-        private int PeekIntFallback(int bitCount)
-        {
-            int value = 0;
-            int byteIndex = Position / 8;
-            int bitIndex = Position % 8;
-
-            while (bitCount > 0)
-            {
-                if (bitIndex >= 8)
-                {
-                    bitIndex = 0;
-                    byteIndex++;
-                }
-
-                int bitsToRead = Math.Min(bitCount, 8 - bitIndex);
-                int mask = 0xFF >> bitIndex;
-                int currentByte = (mask & Buffer[byteIndex]) >> (8 - bitIndex - bitsToRead);
-
-                value = (value << bitsToRead) | currentByte;
-                bitIndex += bitsToRead;
-                bitCount -= bitsToRead;
-            }
-            return value;
-        }
-
-        /// <summary>
-        /// Specifies the bias of an offset binary value. A positive bias can represent one more
-        /// positive value than negative value, and a negative bias can represent one more
-        /// negative value than positive value.
-        /// </summary>
-        /// <remarks>Example:
-        /// A 4-bit offset binary value with a positive bias can store
-        /// the values 8 through -7 inclusive.
-        /// A 4-bit offset binary value with a positive bias can store
-        /// the values 7 through -8 inclusive.</remarks>
-        public enum OffsetBias
-        {
-            Negative = 0
-        }
-    }
-}

src/SharpEmu.GUI/Atrac9/Utilities/Helpers.cs

@@ -1,51 +0,0 @@
-#nullable disable
-using System.Runtime.CompilerServices;
-
-namespace LibAtrac9.Utilities
-{
-    internal static class Helpers
-    {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static short Clamp16(int value)
-        {
-            if (value > short.MaxValue)
-                return short.MaxValue;
-            if (value < short.MinValue)
-                return short.MinValue;
-            return (short)value;
-        }
-
-        public static int GetNextMultiple(int value, int multiple)
-        {
-            if (multiple <= 0)
-                return value;
-
-            if (value % multiple == 0)
-                return value;
-
-            return value + multiple - value % multiple;
-        }
-
-        /// <summary>
-        /// Returns the floor of the base 2 logarithm of a specified number.
-        /// </summary>
-        /// <param name="value">The number whose logarithm is to be found.</param>
-        /// <returns>The floor of the base 2 logarithm of <paramref name="value"/>.</returns>
-        public static int Log2(int value)
-        {
-            value |= value >> 1;
-            value |= value >> 2;
-            value |= value >> 4;
-            value |= value >> 8;
-            value |= value >> 16;
-
-            return MultiplyDeBruijnBitPosition[(uint)(value * 0x07C4ACDDU) >> 27];
-        }
-
-        private static readonly int[] MultiplyDeBruijnBitPosition =
-        {
-            0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30,
-            8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31
-        };
-    }
-}

src/SharpEmu.GUI/Atrac9/Utilities/Mdct.cs

@@ -1,178 +0,0 @@
-#nullable disable
-using System;
-using System.Collections.Generic;
-
-namespace LibAtrac9.Utilities
-{
-    internal class Mdct
-    {
-        private int MdctBits { get; }
-        private int MdctSize { get; }
-        private double Scale { get; }
-
-        private static readonly object TableLock = new object();
-        private static int _tableBits = -1;
-        private static readonly List<double[]> SinTables = new List<double[]>();
-        private static readonly List<double[]> CosTables = new List<double[]>();
-        private static readonly List<int[]> ShuffleTables = new List<int[]>();
-
-        private readonly double[] _imdctPrevious;
-        private readonly double[] _imdctWindow;
-
-        private readonly double[] _scratchMdct;
-        private readonly double[] _scratchDct;
-
-        public Mdct(int mdctBits, double[] window, double scale = 1)
-        {
-            SetTables(mdctBits);
-
-            MdctBits = mdctBits;
-            MdctSize = 1 << mdctBits;
-            Scale = scale;
-
-            if (window.Length < MdctSize)
-            {
-                throw new ArgumentException("Window must be as long as the MDCT size.", nameof(window));
-            }
-
-            _imdctPrevious = new double[MdctSize];
-            _scratchMdct = new double[MdctSize];
-            _scratchDct = new double[MdctSize];
-            _imdctWindow = window;
-        }
-
-        private static void SetTables(int maxBits)
-        {
-            lock (TableLock)
-            {
-                if (maxBits > _tableBits)
-                {
-                    for (int i = _tableBits + 1; i <= maxBits; i++)
-                    {
-                        GenerateTrigTables(i, out double[] sin, out double[] cos);
-                        SinTables.Add(sin);
-                        CosTables.Add(cos);
-                        ShuffleTables.Add(GenerateShuffleTable(i));
-                    }
-                    _tableBits = maxBits;
-                }
-            }
-        }
-
-        public void RunImdct(double[] input, double[] output)
-        {
-            if (input.Length < MdctSize)
-            {
-                throw new ArgumentException("Input must be as long as the MDCT size.", nameof(input));
-            }
-
-            if (output.Length < MdctSize)
-            {
-                throw new ArgumentException("Output must be as long as the MDCT size.", nameof(output));
-            }
-
-            int size = MdctSize;
-            int half = size / 2;
-            double[] dctOut = _scratchMdct;
-
-            Dct4(input, dctOut);
-
-            for (int i = 0; i < half; i++)
-            {
-                output[i] = _imdctWindow[i] * dctOut[i + half] + _imdctPrevious[i];
-                output[i + half] = _imdctWindow[i + half] * -dctOut[size - 1 - i] - _imdctPrevious[i + half];
-                _imdctPrevious[i] = _imdctWindow[size - 1 - i] * -dctOut[half - i - 1];
-                _imdctPrevious[i + half] = _imdctWindow[half - i - 1] * dctOut[i];
-            }
-        }
-
-        /// <summary>
-        /// Does a Type-4 DCT.
-        /// </summary>
-        /// <param name="input">The input array containing the time or frequency-domain samples</param>
-        /// <param name="output">The output array that will contain the transformed time or frequency-domain samples</param>
-        private void Dct4(double[] input, double[] output)
-        {
-            int[] shuffleTable = ShuffleTables[MdctBits];
-            double[] sinTable = SinTables[MdctBits];
-            double[] cosTable = CosTables[MdctBits];
-            double[] dctTemp = _scratchDct;
-
-            int size = MdctSize;
-            int lastIndex = size - 1;
-            int halfSize = size / 2;
-
-            for (int i = 0; i < halfSize; i++)
-            {
-                int i2 = i * 2;
-                double a = input[i2];
-                double b = input[lastIndex - i2];
-                double sin = sinTable[i];
-                double cos = cosTable[i];
-                dctTemp[i2] = a * cos + b * sin;
-                dctTemp[i2 + 1] = a * sin - b * cos;
-            }
-            int stageCount = MdctBits - 1;
-
-            for (int stage = 0; stage < stageCount; stage++)
-            {
-                int blockCount = 1 << stage;
-                int blockSizeBits = stageCount - stage;
-                int blockHalfSizeBits = blockSizeBits - 1;
-                int blockSize = 1 << blockSizeBits;
-                int blockHalfSize = 1 << blockHalfSizeBits;
-                sinTable = SinTables[blockHalfSizeBits];
-                cosTable = CosTables[blockHalfSizeBits];
-
-                for (int block = 0; block < blockCount; block++)
-                {
-                    for (int i = 0; i < blockHalfSize; i++)
-                    {
-                        int frontPos = (block * blockSize + i) * 2;
-                        int backPos = frontPos + blockSize;
-                        double a = dctTemp[frontPos] - dctTemp[backPos];
-                        double b = dctTemp[frontPos + 1] - dctTemp[backPos + 1];
-                        double sin = sinTable[i];
-                        double cos = cosTable[i];
-                        dctTemp[frontPos] += dctTemp[backPos];
-                        dctTemp[frontPos + 1] += dctTemp[backPos + 1];
-                        dctTemp[backPos] = a * cos + b * sin;
-                        dctTemp[backPos + 1] = a * sin - b * cos;
-                    }
-                }
-            }
-
-            for (int i = 0; i < MdctSize; i++)
-            {
-                output[i] = dctTemp[shuffleTable[i]] * Scale;
-            }
-        }
-
-        internal static void GenerateTrigTables(int sizeBits, out double[] sin, out double[] cos)
-        {
-            int size = 1 << sizeBits;
-            sin = new double[size];
-            cos = new double[size];
-
-            for (int i = 0; i < size; i++)
-            {
-                double value = Math.PI * (4 * i + 1) / (4 * size);
-                sin[i] = Math.Sin(value);
-                cos[i] = Math.Cos(value);
-            }
-        }
-
-        internal static int[] GenerateShuffleTable(int sizeBits)
-        {
-            int size = 1 << sizeBits;
-            var table = new int[size];
-
-            for (int i = 0; i < size; i++)
-            {
-                table[i] = Bit.BitReverse32(i ^ (i / 2), sizeBits);
-            }
-
-            return table;
-        }
-    }
-}

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

@@ -1,652 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Text;
-using Microsoft.Win32.SafeHandles;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Owns an isolated emulator process. Guest virtual memory is fixed-address and
-/// cannot be reliably reused while guest-created host threads are still alive,
-/// so the GUI must never execute a game in its own process.
-/// </summary>
-internal sealed class EmulatorProcess : IDisposable
-{
-    public const int HostStopExitCode = -2;
-
-    private const uint ExtendedStartupInfoPresent = 0x00080000;
-    private const uint CreateNoWindow = 0x08000000;
-    private const int StartfUseStdHandles = 0x00000100;
-    private const uint HandleFlagInherit = 0x00000001;
-    private const uint Infinite = 0xFFFFFFFF;
-    private const int ProcThreadAttributeMitigationPolicy = 0x00020007;
-    private const uint JobObjectLimitKillOnJobClose = 0x00002000;
-    private const int JobObjectExtendedLimitInformationClass = 9;
-    private const string MitigatedChildFlag = "--sharpemu-mitigated-child";
-    private const string MitigatedChildEnvironment = "SHARPEMU_MITIGATED_CHILD";
-    private const ulong ControlFlowGuardAlwaysOff = 0x00000002UL << 40;
-    private const ulong CetUserShadowStacksAlwaysOff = 0x00000002UL << 28;
-    private const ulong UserCetSetContextIpValidationAlwaysOff = 0x00000002UL << 32;
-
-    private static readonly object EnvironmentGate = new();
-
-    private readonly object _sync = new();
-    private nint _processHandle;
-    private nint _jobHandle;
-    private Process? _fallbackProcess;
-    private bool _running;
-    private bool _stopRequested;
-    private bool _disposed;
-
-    public event Action<string, bool>? OutputReceived;
-
-    public event Action<int>? Exited;
-
-    public bool IsRunning
-    {
-        get
-        {
-            lock (_sync)
-            {
-                return _running;
-            }
-        }
-    }
-
-    public void Start(string exePath, IReadOnlyList<string> arguments, string? workingDirectory)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(exePath);
-        ArgumentNullException.ThrowIfNull(arguments);
-
-        lock (_sync)
-        {
-            ThrowIfDisposed();
-            if (_running)
-            {
-                throw new InvalidOperationException("The emulator process is already running.");
-            }
-
-            _stopRequested = false;
-        }
-
-        if (OperatingSystem.IsWindows())
-        {
-            StartWindows(exePath, arguments, workingDirectory);
-            return;
-        }
-
-        StartFallback(exePath, arguments, workingDirectory);
-    }
-
-    public void Stop()
-    {
-        nint processHandle;
-        nint jobHandle;
-        Process? fallbackProcess;
-        lock (_sync)
-        {
-            if (!_running)
-            {
-                return;
-            }
-
-            _stopRequested = true;
-            processHandle = _processHandle;
-            jobHandle = _jobHandle;
-            fallbackProcess = _fallbackProcess;
-        }
-
-        if (jobHandle != 0)
-        {
-            _ = TerminateJobObject(jobHandle, unchecked((uint)HostStopExitCode));
-            return;
-        }
-
-        if (processHandle != 0)
-        {
-            _ = TerminateProcess(processHandle, unchecked((uint)HostStopExitCode));
-            return;
-        }
-
-        try
-        {
-            if (fallbackProcess is { HasExited: false })
-            {
-                fallbackProcess.Kill(entireProcessTree: true);
-            }
-        }
-        catch (InvalidOperationException)
-        {
-            // The process exited while Stop was handling the request.
-        }
-    }
-
-    public void Dispose()
-    {
-        lock (_sync)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-        }
-
-        Stop();
-    }
-
-    private void StartFallback(string exePath, IReadOnlyList<string> arguments, string? workingDirectory)
-    {
-        var startInfo = new ProcessStartInfo(exePath)
-        {
-            WorkingDirectory = string.IsNullOrWhiteSpace(workingDirectory)
-                ? Path.GetDirectoryName(exePath) ?? Environment.CurrentDirectory
-                : workingDirectory,
-            UseShellExecute = false,
-            CreateNoWindow = true,
-            RedirectStandardOutput = true,
-            RedirectStandardError = true,
-            StandardOutputEncoding = Encoding.UTF8,
-            StandardErrorEncoding = Encoding.UTF8,
-        };
-        foreach (var argument in arguments)
-        {
-            startInfo.ArgumentList.Add(argument);
-        }
-
-        var process = Process.Start(startInfo)
-            ?? throw new InvalidOperationException("Could not start the emulator process.");
-        process.EnableRaisingEvents = true;
-        process.OutputDataReceived += (_, eventArgs) => ForwardOutput(eventArgs.Data, isError: false);
-        process.ErrorDataReceived += (_, eventArgs) => ForwardOutput(eventArgs.Data, isError: true);
-        process.Exited += (_, _) => OnExited(process.ExitCode);
-
-        lock (_sync)
-        {
-            _fallbackProcess = process;
-            _running = true;
-        }
-
-        process.BeginOutputReadLine();
-        process.BeginErrorReadLine();
-    }
-
-    private unsafe void StartWindows(string exePath, IReadOnlyList<string> arguments, string? workingDirectory)
-    {
-        nint stdoutRead = 0;
-        nint stdoutWrite = 0;
-        nint stderrRead = 0;
-        nint stderrWrite = 0;
-        nint attributeList = 0;
-        nint mitigationPolicies = 0;
-        nint processHandle = 0;
-        nint threadHandle = 0;
-
-        try
-        {
-            var security = new SecurityAttributes
-            {
-                Size = Marshal.SizeOf<SecurityAttributes>(),
-                InheritHandle = 1,
-            };
-            if (!CreatePipe(out stdoutRead, out stdoutWrite, ref security, 0) ||
-                !CreatePipe(out stderrRead, out stderrWrite, ref security, 0))
-            {
-                throw new InvalidOperationException($"Could not create emulator output pipes (Win32 error {Marshal.GetLastWin32Error()}).");
-            }
-
-            if (!SetHandleInformation(stdoutRead, HandleFlagInherit, 0) ||
-                !SetHandleInformation(stderrRead, HandleFlagInherit, 0))
-            {
-                throw new InvalidOperationException($"Could not configure emulator output pipes (Win32 error {Marshal.GetLastWin32Error()}).");
-            }
-
-            nuint attributeListSize = 0;
-            _ = InitializeProcThreadAttributeList(0, 1, 0, ref attributeListSize);
-            attributeList = Marshal.AllocHGlobal((nint)attributeListSize);
-            if (!InitializeProcThreadAttributeList(attributeList, 1, 0, ref attributeListSize))
-            {
-                throw new InvalidOperationException($"Could not initialize process mitigation attributes (Win32 error {Marshal.GetLastWin32Error()}).");
-            }
-
-            mitigationPolicies = Marshal.AllocHGlobal(sizeof(ulong) * 2);
-            Marshal.WriteInt64(mitigationPolicies, unchecked((long)ControlFlowGuardAlwaysOff));
-            Marshal.WriteInt64(
-                nint.Add(mitigationPolicies, sizeof(long)),
-                unchecked((long)(CetUserShadowStacksAlwaysOff | UserCetSetContextIpValidationAlwaysOff)));
-            if (!UpdateProcThreadAttribute(
-                    attributeList,
-                    0,
-                    (nint)ProcThreadAttributeMitigationPolicy,
-                    mitigationPolicies,
-                    (nuint)(sizeof(ulong) * 2),
-                    0,
-                    0))
-            {
-                throw new InvalidOperationException($"Could not apply process mitigations (Win32 error {Marshal.GetLastWin32Error()}).");
-            }
-
-            var startup = new StartupInfoEx();
-            startup.StartupInfo.Size = Marshal.SizeOf<StartupInfoEx>();
-            startup.StartupInfo.Flags = StartfUseStdHandles;
-            startup.StartupInfo.StdOutput = stdoutWrite;
-            startup.StartupInfo.StdError = stderrWrite;
-            startup.AttributeList = attributeList;
-
-            var childArguments = new List<string>(arguments.Count + 1) { MitigatedChildFlag };
-            childArguments.AddRange(arguments);
-            var commandLine = new StringBuilder(BuildCommandLine(exePath, childArguments));
-            ProcessInformation processInfo;
-            lock (EnvironmentGate)
-            {
-                var previousValue = Environment.GetEnvironmentVariable(MitigatedChildEnvironment);
-                try
-                {
-                    Environment.SetEnvironmentVariable(MitigatedChildEnvironment, "1");
-                    if (!CreateProcessW(
-                            exePath,
-                            commandLine,
-                            0,
-                            0,
-                            true,
-                            ExtendedStartupInfoPresent | CreateNoWindow,
-                            0,
-                            string.IsNullOrWhiteSpace(workingDirectory)
-                                ? Path.GetDirectoryName(exePath) ?? Environment.CurrentDirectory
-                                : workingDirectory,
-                            ref startup,
-                            out processInfo))
-                    {
-                        throw new InvalidOperationException($"Could not start the emulator process (Win32 error {Marshal.GetLastWin32Error()}).");
-                    }
-                }
-                finally
-                {
-                    Environment.SetEnvironmentVariable(MitigatedChildEnvironment, previousValue);
-                }
-            }
-
-            processHandle = processInfo.Process;
-            threadHandle = processInfo.Thread;
-            CloseHandle(stdoutWrite);
-            stdoutWrite = 0;
-            CloseHandle(stderrWrite);
-            stderrWrite = 0;
-
-            var jobHandle = CreateJobObjectW(0, null);
-            if (jobHandle != 0 &&
-                (!TryEnableKillOnJobClose(jobHandle) || !AssignProcessToJobObject(jobHandle, processHandle)))
-            {
-                CloseHandle(jobHandle);
-                jobHandle = 0;
-            }
-
-            lock (_sync)
-            {
-                _processHandle = processHandle;
-                _jobHandle = jobHandle;
-                _running = true;
-            }
-            processHandle = 0;
-
-            StartPipeReader(stdoutRead, isError: false);
-            stdoutRead = 0;
-            StartPipeReader(stderrRead, isError: true);
-            stderrRead = 0;
-            StartWindowsExitWatcher(_processHandle);
-        }
-        catch
-        {
-            if (processHandle != 0)
-            {
-                _ = TerminateProcess(processHandle, 1);
-            }
-
-            throw;
-        }
-        finally
-        {
-            if (threadHandle != 0)
-            {
-                CloseHandle(threadHandle);
-            }
-            if (processHandle != 0)
-            {
-                CloseHandle(processHandle);
-            }
-            if (stdoutRead != 0)
-            {
-                CloseHandle(stdoutRead);
-            }
-            if (stdoutWrite != 0)
-            {
-                CloseHandle(stdoutWrite);
-            }
-            if (stderrRead != 0)
-            {
-                CloseHandle(stderrRead);
-            }
-            if (stderrWrite != 0)
-            {
-                CloseHandle(stderrWrite);
-            }
-            if (attributeList != 0)
-            {
-                DeleteProcThreadAttributeList(attributeList);
-                Marshal.FreeHGlobal(attributeList);
-            }
-            if (mitigationPolicies != 0)
-            {
-                Marshal.FreeHGlobal(mitigationPolicies);
-            }
-        }
-    }
-
-    private void StartPipeReader(nint handle, bool isError)
-    {
-        var readerThread = new Thread(() =>
-        {
-            using var safeHandle = new SafeFileHandle(handle, ownsHandle: true);
-            using var stream = new FileStream(safeHandle, FileAccess.Read, 4096, isAsync: false);
-            using var reader = new StreamReader(stream, Encoding.UTF8, detectEncodingFromByteOrderMarks: true);
-            while (reader.ReadLine() is { } line)
-            {
-                ForwardOutput(line, isError);
-            }
-        }, 256 * 1024)
-        {
-            IsBackground = true,
-            Name = isError ? "SharpEmu stderr reader" : "SharpEmu stdout reader",
-        };
-        readerThread.Start();
-    }
-
-    private void StartWindowsExitWatcher(nint processHandle)
-    {
-        var watcher = new Thread(() =>
-        {
-            _ = WaitForSingleObject(processHandle, Infinite);
-            var exitCode = 1;
-            if (GetExitCodeProcess(processHandle, out var nativeExitCode))
-            {
-                exitCode = unchecked((int)nativeExitCode);
-            }
-
-            OnExited(exitCode);
-        }, 128 * 1024)
-        {
-            IsBackground = true,
-            Name = "SharpEmu exit watcher",
-        };
-        watcher.Start();
-    }
-
-    private void ForwardOutput(string? line, bool isError)
-    {
-        if (!string.IsNullOrEmpty(line))
-        {
-            OutputReceived?.Invoke(line, isError);
-        }
-    }
-
-    private void OnExited(int nativeExitCode)
-    {
-        int exitCode;
-        lock (_sync)
-        {
-            if (!_running)
-            {
-                return;
-            }
-
-            exitCode = _stopRequested ? HostStopExitCode : nativeExitCode;
-            _running = false;
-            if (_processHandle != 0)
-            {
-                CloseHandle(_processHandle);
-                _processHandle = 0;
-            }
-            if (_jobHandle != 0)
-            {
-                CloseHandle(_jobHandle);
-                _jobHandle = 0;
-            }
-
-            _fallbackProcess?.Dispose();
-            _fallbackProcess = null;
-        }
-
-        Exited?.Invoke(exitCode);
-    }
-
-    private static bool TryEnableKillOnJobClose(nint jobHandle)
-    {
-        var info = new JobObjectExtendedLimitInformation
-        {
-            BasicLimitInformation = new JobObjectBasicLimitInformation
-            {
-                LimitFlags = JobObjectLimitKillOnJobClose,
-            },
-        };
-        var size = Marshal.SizeOf<JobObjectExtendedLimitInformation>();
-        var memory = Marshal.AllocHGlobal(size);
-        try
-        {
-            Marshal.StructureToPtr(info, memory, false);
-            return SetInformationJobObject(jobHandle, JobObjectExtendedLimitInformationClass, memory, unchecked((uint)size));
-        }
-        finally
-        {
-            Marshal.FreeHGlobal(memory);
-        }
-    }
-
-    private static string BuildCommandLine(string processPath, IReadOnlyList<string> arguments)
-    {
-        var builder = new StringBuilder(QuoteArgument(processPath));
-        foreach (var argument in arguments)
-        {
-            builder.Append(' ');
-            builder.Append(QuoteArgument(argument));
-        }
-
-        return builder.ToString();
-    }
-
-    private static string QuoteArgument(string value)
-    {
-        if (value.Length == 0)
-        {
-            return "\"\"";
-        }
-
-        if (!value.Any(static c => char.IsWhiteSpace(c) || c == '"'))
-        {
-            return value;
-        }
-
-        var builder = new StringBuilder(value.Length + 2);
-        builder.Append('"');
-        var slashCount = 0;
-        foreach (var character in value)
-        {
-            if (character == '\\')
-            {
-                slashCount++;
-                continue;
-            }
-
-            if (character == '"')
-            {
-                builder.Append('\\', (slashCount * 2) + 1);
-                builder.Append(character);
-                slashCount = 0;
-                continue;
-            }
-
-            if (slashCount > 0)
-            {
-                builder.Append('\\', slashCount);
-                slashCount = 0;
-            }
-
-            builder.Append(character);
-        }
-
-        if (slashCount > 0)
-        {
-            builder.Append('\\', slashCount * 2);
-        }
-
-        builder.Append('"');
-        return builder.ToString();
-    }
-
-    private void ThrowIfDisposed()
-    {
-        if (_disposed)
-        {
-            throw new ObjectDisposedException(nameof(EmulatorProcess));
-        }
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct SecurityAttributes
-    {
-        public int Size;
-        public nint SecurityDescriptor;
-        public int InheritHandle;
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    private struct StartupInfo
-    {
-        public int Size;
-        public nint Reserved;
-        public nint Desktop;
-        public nint Title;
-        public int X;
-        public int Y;
-        public int XSize;
-        public int YSize;
-        public int XCountChars;
-        public int YCountChars;
-        public int FillAttribute;
-        public int Flags;
-        public short ShowWindow;
-        public short Reserved2Count;
-        public nint Reserved2;
-        public nint StdInput;
-        public nint StdOutput;
-        public nint StdError;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct StartupInfoEx
-    {
-        public StartupInfo StartupInfo;
-        public nint AttributeList;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct ProcessInformation
-    {
-        public nint Process;
-        public nint Thread;
-        public int ProcessId;
-        public int ThreadId;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct JobObjectBasicLimitInformation
-    {
-        public long PerProcessUserTimeLimit;
-        public long PerJobUserTimeLimit;
-        public uint LimitFlags;
-        public nuint MinimumWorkingSetSize;
-        public nuint MaximumWorkingSetSize;
-        public uint ActiveProcessLimit;
-        public nint Affinity;
-        public uint PriorityClass;
-        public uint SchedulingClass;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct IoCounters
-    {
-        public ulong ReadOperationCount;
-        public ulong WriteOperationCount;
-        public ulong OtherOperationCount;
-        public ulong ReadTransferCount;
-        public ulong WriteTransferCount;
-        public ulong OtherTransferCount;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct JobObjectExtendedLimitInformation
-    {
-        public JobObjectBasicLimitInformation BasicLimitInformation;
-        public IoCounters IoInfo;
-        public nuint ProcessMemoryLimit;
-        public nuint JobMemoryLimit;
-        public nuint PeakProcessMemoryUsed;
-        public nuint PeakJobMemoryUsed;
-    }
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool CreatePipe(out nint readPipe, out nint writePipe, ref SecurityAttributes attributes, uint size);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool SetHandleInformation(nint handle, uint mask, uint flags);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool InitializeProcThreadAttributeList(nint list, int count, int flags, ref nuint size);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool UpdateProcThreadAttribute(nint list, uint flags, nint attribute, nint value, nuint size, nint previousValue, nint returnSize);
-
-    [DllImport("kernel32.dll")]
-    private static extern void DeleteProcThreadAttributeList(nint list);
-
-    [DllImport("kernel32.dll", EntryPoint = "CreateJobObjectW", SetLastError = true, CharSet = CharSet.Unicode)]
-    private static extern nint CreateJobObjectW(nint attributes, string? name);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool SetInformationJobObject(nint job, int infoClass, nint info, uint size);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool AssignProcessToJobObject(nint job, nint process);
-
-    [DllImport("kernel32.dll", EntryPoint = "CreateProcessW", SetLastError = true, CharSet = CharSet.Unicode)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool CreateProcessW(string applicationName, StringBuilder commandLine, nint processAttributes, nint threadAttributes, [MarshalAs(UnmanagedType.Bool)] bool inheritHandles, uint flags, nint environment, string currentDirectory, ref StartupInfoEx startupInfo, out ProcessInformation processInformation);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    private static extern uint WaitForSingleObject(nint handle, uint milliseconds);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool GetExitCodeProcess(nint process, out uint exitCode);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    [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

@@ -1,167 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.ComponentModel;
-using Avalonia;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-
-namespace SharpEmu.GUI;
-
-public sealed class GameEntry : INotifyPropertyChanged
-{
-    // Placeholder gradients for games without cover art, picked
-    // deterministically from the game name so a game keeps its color.
-    private static readonly (Color Start, Color End)[] PlaceholderPalette =
-    {
-        (Color.Parse("#5B4B8A"), Color.Parse("#2C2A4A")),
-        (Color.Parse("#1F6E8C"), Color.Parse("#173B45")),
-        (Color.Parse("#7A4069"), Color.Parse("#3B1C32")),
-        (Color.Parse("#2D6A4F"), Color.Parse("#1B3A2B")),
-        (Color.Parse("#8C5425"), Color.Parse("#4A2B12")),
-        (Color.Parse("#4F6D9E"), Color.Parse("#263349")),
-        (Color.Parse("#8A4B4B"), Color.Parse("#3F2222")),
-        (Color.Parse("#3E7C7B"), Color.Parse("#1E3D3C")),
-    };
-
-    private Bitmap? _cover;
-    private IBrush? _placeholderBrush;
-    private long _sizeBytes;
-
-    public GameEntry(
-        string name, string? titleId, string? version, string path, long sizeBytes,
-        string? coverPath, string? backgroundPath)
-    {
-        Name = name;
-        TitleId = titleId;
-        Version = version;
-        Path = path;
-        _sizeBytes = sizeBytes;
-        CoverPath = coverPath;
-        BackgroundPath = backgroundPath;
-        Initials = ComputeInitials(name);
-    }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    public string Name { get; }
-
-    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>
-    /// Total size of the game. Initially the eboot's own size from the scan;
-    /// replaced with the full install folder size once computed in the
-    /// background.
-    /// </summary>
-    public long SizeBytes
-    {
-        get => _sizeBytes;
-        set
-        {
-            if (_sizeBytes == value)
-            {
-                return;
-            }
-
-            _sizeBytes = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SizeBytes)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SizeText)));
-        }
-    }
-
-    /// <summary>Path to the cover art image shipped with the game, if found.</summary>
-    public string? CoverPath { get; }
-
-    /// <summary>Path to the key art (pic0/pic1) shipped with the game, if found.</summary>
-    public string? BackgroundPath { get; }
-
-    /// <summary>
-    /// Decoded key art used as the window backdrop while this game is
-    /// selected. Loaded on demand and cached; not exposed via binding.
-    /// </summary>
-    public Bitmap? Background { get; set; }
-
-    public string Initials { get; }
-
-    // Built lazily: brushes are AvaloniaObjects that must be created on the
-    // UI thread, while GameEntry itself is constructed on the scan thread.
-    public IBrush PlaceholderBrush => _placeholderBrush ??= BuildPlaceholderBrush(Name);
-
-    /// <summary>Decoded cover art; loaded asynchronously after the library scan.</summary>
-    public Bitmap? Cover
-    {
-        get => _cover;
-        set
-        {
-            if (ReferenceEquals(_cover, value))
-            {
-                return;
-            }
-
-            _cover = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Cover)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasCover)));
-        }
-    }
-
-    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);
-
-    private static string ComputeInitials(string name)
-    {
-        var initials = name
-            .Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
-            .Where(word => char.IsLetterOrDigit(word[0]))
-            .Select(word => char.ToUpperInvariant(word[0]))
-            .Take(2)
-            .ToArray();
-
-        return initials.Length > 0 ? new string(initials) : "?";
-    }
-
-    private static IBrush BuildPlaceholderBrush(string name)
-    {
-        var hash = 0;
-        foreach (var ch in name)
-        {
-            hash = unchecked(hash * 31 + ch);
-        }
-
-        var (start, end) = PlaceholderPalette[(int)((uint)hash % PlaceholderPalette.Length)];
-        return new LinearGradientBrush
-        {
-            StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
-            EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
-            GradientStops =
-            {
-                new GradientStop(start, 0),
-                new GradientStop(end, 1),
-            },
-        };
-    }
-
-    private static string FormatSize(long bytes)
-    {
-        return bytes switch
-        {
-            >= 1L << 30 => $"{bytes / (double)(1L << 30):0.0} GiB",
-            >= 1L << 20 => $"{bytes / (double)(1L << 20):0.0} MiB",
-            >= 1L << 10 => $"{bytes / (double)(1L << 10):0.0} KiB",
-            _ => $"{bytes} B",
-        };
-    }
-}

src/SharpEmu.GUI/GameSurfaceHost.cs

@@ -1,613 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using SharpEmu.Libs.VideoOut;
-using System.Runtime.InteropServices;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Native child surface owned by Avalonia. The isolated emulator process uses
-/// its platform handle to create the Vulkan presentation surface, keeping the
-/// guest address space out of the GUI process.
-/// </summary>
-public sealed class GameSurfaceHost : NativeControlHost
-{
-    private const uint SwpNoSize = 0x0001;
-    private const uint SwpNoMove = 0x0002;
-    private const uint SwpNoZOrder = 0x0004;
-    private const uint SwpNoActivate = 0x0010;
-    private const uint SwpShowWindow = 0x0040;
-    private const uint SwpHideWindow = 0x0080;
-    private const uint WsChild = 0x40000000;
-    private const uint WsVisible = 0x10000000;
-    private const uint WsClipSiblings = 0x04000000;
-    private const uint WsClipChildren = 0x02000000;
-    private const uint CsOwnDc = 0x0020;
-    private const uint WmSetCursor = 0x0020;
-    private const uint WmMouseMove = 0x0200;
-    private const int IdcArrow = 32512;
-    private const int CursorHideDelayMs = 2500;
-
-    private VulkanHostSurface? _surface;
-    private nint _windowHandle;
-    private nint _x11Display;
-    private string? _win32ClassName;
-    private WindowProcedure? _windowProcedure;
-    private nint _metalLayer;
-    private bool _presentationVisible = true;
-    private DispatcherTimer? _cursorIdleTimer;
-    private bool _cursorAutoHide;
-    private bool _cursorHidden;
-    private long _lastPointerActivity;
-
-    public GameSurfaceHost()
-    {
-        PropertyChanged += (_, change) =>
-        {
-            if (change.Property == BoundsProperty)
-            {
-                UpdateSurfaceSize();
-            }
-        };
-        LayoutUpdated += (_, _) =>
-        {
-            // Fullscreen can change a monitor's DPI scale without changing
-            // the logical Bounds. Refresh the native child from physical size.
-            UpdateSurfaceSize();
-
-            // NativeControlHost may make its HWND visible again as part of a
-            // later arrange pass. Keep a loading surface hidden until its
-            // child process reports a real first frame.
-            if (!_presentationVisible)
-            {
-                ApplyPresentationVisibility();
-            }
-        };
-    }
-
-    public event EventHandler<VulkanHostSurface>? SurfaceAvailable;
-
-    public event EventHandler<VulkanHostSurface>? SurfaceDestroyed;
-
-    public VulkanHostSurface? Surface => _surface;
-
-    public void RefreshSurfaceSize() => UpdateSurfaceSize();
-
-    /// <summary>
-    /// Hides the platform child without detaching the Vulkan surface. This
-    /// allows the launcher to return to its library while guest teardown is
-    /// still finishing on the render thread.
-    /// </summary>
-    public void SetPresentationVisible(bool visible)
-    {
-        _presentationVisible = visible;
-        ApplyPresentationVisibility();
-    }
-
-    /// <summary>
-    /// Auto-hides the mouse cursor over the game surface after a short idle
-    /// period; any pointer movement brings it back. Enabling (again) restarts
-    /// the idle countdown, so both "first frame presented" and "entered
-    /// fullscreen" can arm it. Windows-only; a no-op elsewhere.
-    /// </summary>
-    public void SetCursorAutoHide(bool enabled)
-    {
-        if (!OperatingSystem.IsWindows())
-        {
-            return;
-        }
-
-        _cursorAutoHide = enabled;
-        _lastPointerActivity = System.Diagnostics.Stopwatch.GetTimestamp();
-        if (enabled)
-        {
-            _cursorIdleTimer ??= CreateCursorIdleTimer();
-            _cursorIdleTimer.Start();
-            return;
-        }
-
-        _cursorIdleTimer?.Stop();
-        ShowCursorNow();
-    }
-
-    private DispatcherTimer CreateCursorIdleTimer()
-    {
-        var timer = new DispatcherTimer
-        {
-            Interval = TimeSpan.FromMilliseconds(250),
-        };
-        timer.Tick += (_, _) => HideCursorWhenIdle();
-        return timer;
-    }
-
-    private void HideCursorWhenIdle()
-    {
-        if (!_cursorAutoHide || _cursorHidden || _windowHandle == 0)
-        {
-            return;
-        }
-
-        var idleMs = (System.Diagnostics.Stopwatch.GetTimestamp() - _lastPointerActivity) *
-            1000 / System.Diagnostics.Stopwatch.Frequency;
-        if (idleMs < CursorHideDelayMs)
-        {
-            return;
-        }
-
-        // Only swallow the cursor while it is actually over the game surface;
-        // hovering launcher chrome (console, toolbar) must keep the arrow.
-        if (!GetCursorPos(out var point) || WindowFromPoint(point) != _windowHandle)
-        {
-            return;
-        }
-
-        _cursorHidden = true;
-        _ = SetCursor(0);
-    }
-
-    private void ShowCursorNow()
-    {
-        if (!_cursorHidden)
-        {
-            return;
-        }
-
-        _cursorHidden = false;
-        _ = SetCursor(LoadCursorW(0, IdcArrow));
-    }
-
-    private void ApplyPresentationVisibility()
-    {
-        if (_windowHandle == 0)
-        {
-            return;
-        }
-
-        var visible = _presentationVisible;
-        if (OperatingSystem.IsWindows())
-        {
-            // SW_HIDE can be ignored for a window's initial show state. Force
-            // the state through SetWindowPos so an old child swapchain cannot
-            // remain composed while the next game is loading.
-            var flags = SwpNoSize | SwpNoMove | SwpNoZOrder | SwpNoActivate |
-                (visible ? SwpShowWindow : SwpHideWindow);
-            _ = SetWindowPos(_windowHandle, 0, 0, 0, 0, 0, flags);
-        }
-        else if (OperatingSystem.IsLinux() && _x11Display != 0)
-        {
-            _ = visible
-                ? XMapWindow(_x11Display, _windowHandle)
-                : XUnmapWindow(_x11Display, _windowHandle);
-            _ = XFlush(_x11Display);
-        }
-        else if (OperatingSystem.IsMacOS())
-        {
-            SendBool(_windowHandle, "setHidden:", !visible);
-        }
-    }
-
-    protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle control)
-    {
-        PlatformHandle handle;
-        if (OperatingSystem.IsWindows())
-        {
-            handle = CreateWin32(control);
-        }
-        else if (OperatingSystem.IsLinux())
-        {
-            handle = CreateX11(control);
-        }
-        else if (OperatingSystem.IsMacOS())
-        {
-            handle = CreateMacOS();
-        }
-        else
-        {
-            throw new PlatformNotSupportedException("SharpEmu's embedded Vulkan surface is unsupported on this platform.");
-        }
-
-        UpdateSurfaceSize();
-        if (_surface is { } surface)
-        {
-            SurfaceAvailable?.Invoke(this, surface);
-        }
-
-        return handle;
-    }
-
-    protected override void DestroyNativeControlCore(IPlatformHandle control)
-    {
-        if (OperatingSystem.IsWindows())
-        {
-            SetCursorAutoHide(false);
-        }
-
-        var surface = _surface;
-        _surface = null;
-
-        if (OperatingSystem.IsWindows())
-        {
-            DestroyWin32();
-        }
-        else if (OperatingSystem.IsLinux())
-        {
-            DestroyX11();
-        }
-        else if (OperatingSystem.IsMacOS())
-        {
-            DestroyMacOS();
-        }
-
-        if (surface is not null)
-        {
-            SurfaceDestroyed?.Invoke(this, surface);
-        }
-    }
-
-    private PlatformHandle CreateWin32(IPlatformHandle control)
-    {
-        _win32ClassName = $"SharpEmuGameSurface-{Guid.NewGuid():N}";
-        _windowProcedure = WindowProcedureImpl;
-        var classInfo = new WndClassEx
-        {
-            Size = (uint)Marshal.SizeOf<WndClassEx>(),
-            Style = CsOwnDc,
-            WindowProcedure = Marshal.GetFunctionPointerForDelegate(_windowProcedure),
-            Instance = GetModuleHandleW(null),
-            ClassName = _win32ClassName,
-        };
-
-        if (RegisterClassExW(ref classInfo) == 0)
-        {
-            throw new InvalidOperationException($"Could not register the embedded game window class (Win32 error {Marshal.GetLastWin32Error()}).");
-        }
-
-        _windowHandle = CreateWindowExW(
-            0,
-            _win32ClassName,
-            "SharpEmu Game Surface",
-            WsChild | (_presentationVisible ? WsVisible : 0) | WsClipSiblings | WsClipChildren,
-            0,
-            0,
-            1,
-            1,
-            control.Handle,
-            0,
-            classInfo.Instance,
-            0);
-        if (_windowHandle == 0)
-        {
-            var error = Marshal.GetLastWin32Error();
-            _ = UnregisterClassW(_win32ClassName, classInfo.Instance);
-            throw new InvalidOperationException($"Could not create the embedded game window (Win32 error {error}).");
-        }
-
-        _surface = new VulkanHostSurface(
-            VulkanHostSurfaceKind.Win32,
-            _windowHandle,
-            classInfo.Instance);
-        return new PlatformHandle(_windowHandle, "HWND");
-    }
-
-    private PlatformHandle CreateX11(IPlatformHandle control)
-    {
-        _x11Display = XOpenDisplay(0);
-        if (_x11Display == 0)
-        {
-            throw new InvalidOperationException("Could not connect to the X11 server for the embedded game surface.");
-        }
-
-        _windowHandle = XCreateSimpleWindow(
-            _x11Display,
-            control.Handle,
-            0,
-            0,
-            1,
-            1,
-            0,
-            0,
-            0);
-        if (_windowHandle == 0)
-        {
-            XCloseDisplay(_x11Display);
-            _x11Display = 0;
-            throw new InvalidOperationException("Could not create the X11 embedded game surface.");
-        }
-
-        if (_presentationVisible)
-        {
-            _ = XMapWindow(_x11Display, _windowHandle);
-        }
-        _ = XFlush(_x11Display);
-        _surface = new VulkanHostSurface(VulkanHostSurfaceKind.Xlib, _windowHandle, _x11Display);
-        return new PlatformHandle(_windowHandle, "X11");
-    }
-
-    private PlatformHandle CreateMacOS()
-    {
-        _metalLayer = CreateObjectiveCObject("CAMetalLayer");
-        _windowHandle = CreateObjectiveCObject("NSView");
-        SendBool(_windowHandle, "setWantsLayer:", true);
-        SendPointer(_windowHandle, "setLayer:", _metalLayer);
-        SendBool(_windowHandle, "setHidden:", !_presentationVisible);
-
-        _surface = new VulkanHostSurface(VulkanHostSurfaceKind.Metal, _windowHandle, metalLayerHandle: _metalLayer);
-        return new PlatformHandle(_windowHandle, "NSView");
-    }
-
-    private void UpdateSurfaceSize()
-    {
-        if (_surface is null)
-        {
-            return;
-        }
-
-        var renderScale = (VisualRoot as TopLevel)?.RenderScaling ?? 1.0;
-        var width = Math.Max(1, (int)Math.Round(Bounds.Width * renderScale));
-        var height = Math.Max(1, (int)Math.Round(Bounds.Height * renderScale));
-        var sizeChanged = _surface.PixelWidth != width || _surface.PixelHeight != height;
-        _surface.UpdatePixelSize(width, height);
-
-        if (!sizeChanged)
-        {
-            return;
-        }
-
-        if (OperatingSystem.IsWindows() && _windowHandle != 0)
-        {
-            _ = SetWindowPos(
-                _windowHandle,
-                0,
-                0,
-                0,
-                width,
-                height,
-                SwpNoMove | SwpNoZOrder | SwpNoActivate);
-        }
-        else if (OperatingSystem.IsLinux() && _x11Display != 0 && _windowHandle != 0)
-        {
-            _ = XResizeWindow(_x11Display, _windowHandle, (uint)width, (uint)height);
-            _ = XFlush(_x11Display);
-        }
-        else if (OperatingSystem.IsMacOS() && _metalLayer != 0)
-        {
-            SendDouble(_metalLayer, "setContentsScale:", renderScale);
-        }
-    }
-
-    private void DestroyWin32()
-    {
-        if (_windowHandle != 0)
-        {
-            _ = DestroyWindow(_windowHandle);
-            _windowHandle = 0;
-        }
-
-        if (!string.IsNullOrWhiteSpace(_win32ClassName))
-        {
-            _ = UnregisterClassW(_win32ClassName, GetModuleHandleW(null));
-            _win32ClassName = null;
-        }
-
-        _windowProcedure = null;
-    }
-
-    private void DestroyX11()
-    {
-        if (_x11Display != 0 && _windowHandle != 0)
-        {
-            _ = XDestroyWindow(_x11Display, _windowHandle);
-        }
-        if (_x11Display != 0)
-        {
-            _ = XCloseDisplay(_x11Display);
-        }
-
-        _windowHandle = 0;
-        _x11Display = 0;
-    }
-
-    private void DestroyMacOS()
-    {
-        if (_windowHandle != 0)
-        {
-            SendVoid(_windowHandle, "release");
-        }
-        if (_metalLayer != 0)
-        {
-            SendVoid(_metalLayer, "release");
-        }
-
-        _windowHandle = 0;
-        _metalLayer = 0;
-    }
-
-    private nint WindowProcedureImpl(nint window, uint message, nint wParam, nint lParam)
-    {
-        if (message == WmMouseMove)
-        {
-            _lastPointerActivity = System.Diagnostics.Stopwatch.GetTimestamp();
-            ShowCursorNow();
-        }
-        else if (message == WmSetCursor && _cursorHidden)
-        {
-            // Win32 re-resolves the cursor on every mouse message; returning
-            // TRUE here keeps the parent chain from restoring the arrow.
-            _ = SetCursor(0);
-            return 1;
-        }
-
-        return DefWindowProcW(window, message, wParam, lParam);
-    }
-
-    private static nint CreateObjectiveCObject(string className)
-    {
-        var classHandle = objc_getClass(className);
-        if (classHandle == 0)
-        {
-            throw new InvalidOperationException($"Objective-C class '{className}' is unavailable.");
-        }
-
-        var instance = objc_msgSend_id(classHandle, sel_registerName("alloc"));
-        instance = objc_msgSend_id(instance, sel_registerName("init"));
-        if (instance == 0)
-        {
-            throw new InvalidOperationException($"Could not create Objective-C '{className}'.");
-        }
-
-        return instance;
-    }
-
-    private static void SendVoid(nint receiver, string selector) =>
-        objc_msgSend_void(receiver, sel_registerName(selector));
-
-    private static void SendBool(nint receiver, string selector, bool value) =>
-        objc_msgSend_bool(receiver, sel_registerName(selector), value ? (byte)1 : (byte)0);
-
-    private static void SendPointer(nint receiver, string selector, nint value) =>
-        objc_msgSend_pointer(receiver, sel_registerName(selector), value);
-
-    private static void SendDouble(nint receiver, string selector, double value) =>
-        objc_msgSend_double(receiver, sel_registerName(selector), value);
-
-    private delegate nint WindowProcedure(nint window, uint message, nint wParam, nint lParam);
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    private struct WndClassEx
-    {
-        public uint Size;
-        public uint Style;
-        public nint WindowProcedure;
-        public int ClassExtra;
-        public int WindowExtra;
-        public nint Instance;
-        public nint Icon;
-        public nint Cursor;
-        public nint Background;
-        public string? MenuName;
-        public string? ClassName;
-        public nint IconSmall;
-    }
-
-    [DllImport("kernel32.dll", EntryPoint = "GetModuleHandleW", CharSet = CharSet.Unicode)]
-    private static extern nint GetModuleHandleW(string? moduleName);
-
-    [DllImport("user32.dll", EntryPoint = "RegisterClassExW", SetLastError = true, CharSet = CharSet.Unicode)]
-    private static extern ushort RegisterClassExW(ref WndClassEx classInfo);
-
-    [DllImport("user32.dll", EntryPoint = "UnregisterClassW", SetLastError = true, CharSet = CharSet.Unicode)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool UnregisterClassW(string className, nint instance);
-
-    [DllImport("user32.dll", EntryPoint = "CreateWindowExW", SetLastError = true, CharSet = CharSet.Unicode)]
-    private static extern nint CreateWindowExW(
-        uint extendedStyle,
-        string className,
-        string windowName,
-        uint style,
-        int x,
-        int y,
-        int width,
-        int height,
-        nint parent,
-        nint menu,
-        nint instance,
-        nint parameter);
-
-    [DllImport("user32.dll", EntryPoint = "DestroyWindow", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool DestroyWindow(nint window);
-
-    [DllImport("user32.dll", EntryPoint = "SetWindowPos", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool SetWindowPos(
-        nint window,
-        nint insertAfter,
-        int x,
-        int y,
-        int width,
-        int height,
-        uint flags);
-
-    [DllImport("user32.dll", EntryPoint = "DefWindowProcW", CharSet = CharSet.Unicode)]
-    private static extern nint DefWindowProcW(nint window, uint message, nint wParam, nint lParam);
-
-    [DllImport("user32.dll", EntryPoint = "SetCursor")]
-    private static extern nint SetCursor(nint cursor);
-
-    [DllImport("user32.dll", EntryPoint = "LoadCursorW", CharSet = CharSet.Unicode)]
-    private static extern nint LoadCursorW(nint instance, nint cursorName);
-
-    [DllImport("user32.dll", EntryPoint = "GetCursorPos")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool GetCursorPos(out NativePoint point);
-
-    [DllImport("user32.dll", EntryPoint = "WindowFromPoint")]
-    private static extern nint WindowFromPoint(NativePoint point);
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct NativePoint
-    {
-        public int X;
-        public int Y;
-    }
-
-    [DllImport("libX11.so.6", EntryPoint = "XOpenDisplay")]
-    private static extern nint XOpenDisplay(nint displayName);
-
-    [DllImport("libX11.so.6", EntryPoint = "XCreateSimpleWindow")]
-    private static extern nint XCreateSimpleWindow(
-        nint display,
-        nint parent,
-        int x,
-        int y,
-        uint width,
-        uint height,
-        uint borderWidth,
-        ulong border,
-        ulong background);
-
-    [DllImport("libX11.so.6", EntryPoint = "XMapWindow")]
-    private static extern int XMapWindow(nint display, nint window);
-
-    [DllImport("libX11.so.6", EntryPoint = "XUnmapWindow")]
-    private static extern int XUnmapWindow(nint display, nint window);
-
-    [DllImport("libX11.so.6", EntryPoint = "XResizeWindow")]
-    private static extern int XResizeWindow(nint display, nint window, uint width, uint height);
-
-    [DllImport("libX11.so.6", EntryPoint = "XDestroyWindow")]
-    private static extern int XDestroyWindow(nint display, nint window);
-
-    [DllImport("libX11.so.6", EntryPoint = "XCloseDisplay")]
-    private static extern int XCloseDisplay(nint display);
-
-    [DllImport("libX11.so.6", EntryPoint = "XFlush")]
-    private static extern int XFlush(nint display);
-
-    [DllImport("/usr/lib/libobjc.A.dylib")]
-    private static extern nint objc_getClass(string name);
-
-    [DllImport("/usr/lib/libobjc.A.dylib")]
-    private static extern nint sel_registerName(string name);
-
-    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
-    private static extern nint objc_msgSend_id(nint receiver, nint selector);
-
-    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
-    private static extern void objc_msgSend_void(nint receiver, nint selector);
-
-    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
-    private static extern void objc_msgSend_bool(nint receiver, nint selector, byte value);
-
-    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
-    private static extern void objc_msgSend_pointer(nint receiver, nint selector, nint value);
-
-    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
-    private static extern void objc_msgSend_double(nint receiver, nint selector, double value);
-}

src/SharpEmu.GUI/GuiConsoleMirror.cs

@@ -1,116 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Text;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Mirrors process-wide console output into the launcher console while
-/// retaining the original streams for shell users and file logging.
-/// </summary>
-internal sealed class GuiConsoleMirror : IDisposable
-{
-    private readonly TextWriter _originalOut;
-    private readonly TextWriter _originalError;
-    private int _disposed;
-
-    private GuiConsoleMirror(Action<string, bool> writeLine)
-    {
-        _originalOut = Console.Out;
-        _originalError = Console.Error;
-        Console.SetOut(new MirroringWriter(_originalOut, line => writeLine(line, false)));
-        Console.SetError(new MirroringWriter(_originalError, line => writeLine(line, true)));
-    }
-
-    public static GuiConsoleMirror Install(Action<string, bool> writeLine) => new(writeLine);
-
-    public void Dispose()
-    {
-        if (Interlocked.Exchange(ref _disposed, 1) != 0)
-        {
-            return;
-        }
-
-        Console.SetOut(_originalOut);
-        Console.SetError(_originalError);
-    }
-
-    private sealed class MirroringWriter : TextWriter
-    {
-        private readonly TextWriter _inner;
-        private readonly Action<string> _writeLine;
-        private readonly StringBuilder _line = new();
-        private readonly object _gate = new();
-
-        public MirroringWriter(TextWriter inner, Action<string> writeLine)
-        {
-            _inner = inner;
-            _writeLine = writeLine;
-        }
-
-        public override Encoding Encoding => _inner.Encoding;
-
-        public override void Write(char value)
-        {
-            lock (_gate)
-            {
-                _inner.Write(value);
-                Append(value);
-            }
-        }
-
-        public override void Write(string? value)
-        {
-            if (value is null)
-            {
-                return;
-            }
-
-            lock (_gate)
-            {
-                _inner.Write(value);
-                foreach (var character in value)
-                {
-                    Append(character);
-                }
-            }
-        }
-
-        public override void WriteLine(string? value)
-        {
-            lock (_gate)
-            {
-                _inner.WriteLine(value);
-                if (!string.IsNullOrEmpty(value))
-                {
-                    _line.Append(value);
-                }
-
-                FlushLine();
-            }
-        }
-
-        private void Append(char value)
-        {
-            if (value == '\r')
-            {
-                return;
-            }
-
-            if (value == '\n')
-            {
-                FlushLine();
-                return;
-            }
-
-            _line.Append(value);
-        }
-
-        private void FlushLine()
-        {
-            _writeLine(_line.ToString());
-            _line.Clear();
-        }
-    }
-}

src/SharpEmu.GUI/GuiLauncher.cs

@@ -1,47 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using Avalonia;
-
-namespace SharpEmu.GUI;
-
-/// <summary>
-/// Entry point for the desktop frontend, hosted by the SharpEmu executable
-/// when it is started without command-line arguments.
-/// </summary>
-public static class GuiLauncher
-{
-    public static int Run()
-    {
-        try
-        {
-            BuildAvaloniaApp().StartWithClassicDesktopLifetime(Array.Empty<string>());
-            return 0;
-        }
-        catch (Exception ex)
-        {
-            WriteCrashLog(ex);
-            throw;
-        }
-    }
-
-    public static AppBuilder BuildAvaloniaApp()
-        => AppBuilder.Configure<App>()
-            .UsePlatformDetect()
-            .WithInterFont()
-            .LogToTrace();
-
-    private static void WriteCrashLog(Exception ex)
-    {
-        try
-        {
-            File.AppendAllText(
-                Path.Combine(AppContext.BaseDirectory, "gui-crash.log"),
-                $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] {ex}{Environment.NewLine}{Environment.NewLine}");
-        }
-        catch (Exception)
-        {
-            // Crash logging is best-effort.
-        }
-    }
-}

src/SharpEmu.GUI/GuiSettings.cs

@@ -1,102 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Text.Json;
-
-namespace SharpEmu.GUI;
-
-public sealed class GuiSettings
-{
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = true,
-    };
-
-    public List<string> GameFolders { get; set; } = new();
-
-    /// <summary>Eboot paths hidden from the library via "Remove from library".</summary>
-    public List<string> ExcludedGames { get; set; } = new();
-
-    public string LogLevel { get; set; } = "Info";
-
-    public int ImportTraceLimit { get; set; }
-
-    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>
-    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;
-
-    public bool CheckForUpdatesOnStartup { get; set; } = true;
-
-    /// <summary>Names of SHARPEMU_* switches set to "1" in the emulator's environment at launch.</summary>
-    public List<string> EnvironmentToggles { get; set; } = new();
-
-    /// <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");
-
-    public static GuiSettings Load()
-    {
-        try
-        {
-            if (File.Exists(SettingsPath))
-            {
-                var json = File.ReadAllText(SettingsPath);
-                return JsonSerializer.Deserialize<GuiSettings>(json, SerializerOptions) ?? new GuiSettings();
-            }
-        }
-        catch (Exception)
-        {
-            // Corrupt or unreadable settings fall back to defaults.
-        }
-
-        return new GuiSettings();
-    }
-
-    public void Save()
-    {
-        try
-        {
-            var directory = Path.GetDirectoryName(SettingsPath);
-            if (!string.IsNullOrEmpty(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            File.WriteAllText(SettingsPath, JsonSerializer.Serialize(this, SerializerOptions));
-        }
-        catch (Exception)
-        {
-            // Settings persistence is best-effort.
-        }
-    }
-}

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,146 +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.Env.Tab": "Ambiente",
-  "Options.Section.Environment": "VARIÁVEIS DE AMBIENTE",
-  "Options.Env.Desc": "Variáveis de ambiente passadas ao emulador durante a inicialização.",
-  "Options.Env.Bthid.Desc": "Informa o Bluetooth HID como indisponível para títulos cujo middleware de volante/FFB fica verificando indefinidamente.\nNormalmente, deixe desativado. Alguns títulos travam quando a inicialização falha.",
-  "Options.Env.LoopGuard.Desc": "Não força o encerramento de títulos que repetem a mesma chamada por tempo excessivo.\nExperimente esta opção se um jogo fechar sozinho durante o carregamento.",
-  "Options.Env.VkValidation.Desc": "Ativa as camadas de validação do Vulkan para depuração de GPU.\nLento. Requer que o Vulkan SDK esteja instalado.",
-  "Options.Env.DumpSpirv.Desc": "Extrai os shaders AGC e suas traduções SPIR-V para a pasta shader-dumps.\nUse ao reportar bugs de shader ou renderização.",
-  "Options.Env.LogDirectMemory.Desc": "Registra alocações de memória direta e falhas no console.\nUse quando um jogo aborta ou fecha durante a inicialização (boot).",
-  "Options.Env.LogNp.Desc": "Registra chamadas da biblioteca NP (PlayStation Network) no console.",
-  "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": "Dividir",
-  "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",
-
-  "Options.About" : "Sobre",
-  "About.Github.Label": "GitHub",
-  "About.Github.Desc": "Código-fonte, problemas e desenvolvimento do projeto.",
-  "About.Discord.Label": "Discord",
-  "About.Discord.Desc": "Participe da comunidade, obtenha suporte e acompanhe o desenvolvimento.",
-  "About.GithubButton": "Contribua no GitHub!",
-  "About.DiscordButton": "Entre no nosso Discord!"
-}

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"
-}