[loader] cut import overhead

- Enable VertexPipelineStoresAndAtomics/FragmentStoresAndAtomics:
  fixes vkCreateGraphicsPipelines() rejecting guestBuffers storage
  descriptor as NonWritable in vertex/fragment stages.
- Enable ShaderInt64: fixes vkCreateShaderModule() rejecting SPIR-V
  using 64-bit integer capability.
- Query GetPhysicalDeviceFeatures first and only enable what the GPU
  actually reports as supported, with a warning fallback otherwise.

Also adds optional Vulkan Validation Layers (SHARPEMU_VK_VALIDATION=1)
to surface these VUID errors during development instead of silent
VK_ERROR_DEVICE_LOST.

.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,105 +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
-      SPIRV_HEADERS_COMMIT: ad9184e76a66b1001c29db9b0a3e87f646c64de0
-      # SpirvModuleBuilder emits SPIR-V 1.5 and VulkanVideoPresenter requests Vulkan 1.2.
-      SPIRV_TARGET_ENV: vulkan1.2
-      SPIRV_TOOLS_COMMIT: 0539c81f69a3daeb706fd3477dca61435b475156
-      SPIRV_TOOLS_VERSION: v2026.2
-    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: Build pinned SPIRV-Tools
-        if: matrix.rid == 'linux-x64'
-        run: |
-          git clone --no-checkout --filter=blob:none https://github.com/KhronosGroup/SPIRV-Tools.git "$RUNNER_TEMP/spirv-tools"
-          git -C "$RUNNER_TEMP/spirv-tools" checkout --detach "$SPIRV_TOOLS_COMMIT"
-          test "$(git -C "$RUNNER_TEMP/spirv-tools" rev-parse HEAD)" = "$SPIRV_TOOLS_COMMIT"
-
-          git clone --no-checkout --filter=blob:none https://github.com/KhronosGroup/SPIRV-Headers.git "$RUNNER_TEMP/spirv-tools/external/spirv-headers"
-          git -C "$RUNNER_TEMP/spirv-tools/external/spirv-headers" checkout --detach "$SPIRV_HEADERS_COMMIT"
-          test "$(git -C "$RUNNER_TEMP/spirv-tools/external/spirv-headers" rev-parse HEAD)" = "$SPIRV_HEADERS_COMMIT"
-
-          cmake -S "$RUNNER_TEMP/spirv-tools" -B "$RUNNER_TEMP/spirv-tools-build" \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DSPIRV_SKIP_TESTS=ON \
-            -DSPIRV_WERROR=OFF
-          cmake --build "$RUNNER_TEMP/spirv-tools-build" --target spirv-val
-
-      - name: Generate and validate synthetic SPIR-V
-        if: matrix.rid == 'linux-x64'
-        run: |
-          dotnet run --project tools/SharpEmu.Tools.ShaderDump/SharpEmu.Tools.ShaderDump.csproj -c Release -- artifacts/shader-dump
-          scripts/validate-synthetic-spirv.sh \
-            "$RUNNER_TEMP/spirv-tools-build/tools/spirv-val" \
-            "$SPIRV_TOOLS_VERSION" \
-            "$SPIRV_TARGET_ENV" \
-            artifacts/shader-dump
-
-      - 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:
@@ -242,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

@@ -32,13 +32,8 @@ packages/
 .nuget/
 .dotnet-home/
 .cache/
-__pycache__/
-*.py[cod]
 
 .DS_Store
 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,4 +1,4 @@
-<!--
+<!--
 Copyright (C) 2026 SharpEmu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->
@@ -7,23 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <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>
+</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

@@ -7,18 +7,11 @@ path = [
     "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/**"
 ]
 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,18 +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.DebugClient/SharpEmu.DebugClient.csproj" />
-    <Project Path="src/SharpEmu.Debugger/SharpEmu.Debugger.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.

docs/debugger-server.md

@@ -1,177 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-# Live debug server
-
-SharpEmu can expose a **live debug server** so an external process can inspect
-and control a running guest over TCP. The server lives in the emulator; the
-companion `SharpEmu.DebugClient` executable is one client, and the wire protocol
-is simple enough to script against directly.
-
-This document describes the moving parts and the wire protocol. For day-to-day
-client usage, see
-[`src/SharpEmu.DebugClient/DEVELOPER_READ.md`](../src/SharpEmu.DebugClient/DEVELOPER_READ.md).
-
-## Layering
-
-| Assembly | Role |
-| -------- | ---- |
-| `SharpEmu.Core` | Defines the dispatcher seam `ICpuDebugHook` / `ICpuDebugFrame` (namespace `SharpEmu.Core.Cpu.Debug`) and the `CpuExecutionOptions.DebugHook` slot. Core has **no** reference to the debugger. |
-| `SharpEmu.Debugger` | The debugger: `DebuggerSession` (implements the hook), `BreakpointStore`, the TCP `DebuggerServer`, the pluggable `IDebugProtocol` with a JSON-lines implementation, and the `DebuggerServerHost` one-call wiring. |
-| `SharpEmu.CLI` | Parses `--debug-server`, builds a `DebuggerServerHost`, hands its `Hook` to `SharpEmuRuntimeOptions.DebugHook`, and manages its lifetime. |
-| `SharpEmu.DebugClient` | A standalone client executable. Depends only on the BCL. |
-
-The dependency direction is important: Core stays debugger-agnostic and only
-publishes the seam. Anything that observes execution implements
-`ICpuDebugHook` and is injected through the options, so the debugger can evolve
-without touching the CPU core.
-
-## Execution model
-
-`CpuDispatcher` enters a fresh frame for the process entry point and for each
-module initializer. When a `DebugHook` is attached it is notified at those
-boundaries:
-
-- `OnFrameEnter(frame)` — before the native backend runs the frame. The
-  `DebuggerSession` decides whether to stop (pause request, breakpoint on the
-  entry address, single-step, or stop-at-entry). To stop, it **parks the
-  emulation thread** inside this call on a gate; the frame stays live, so a
-  client can read and write registers and memory while parked. `continue` /
-  `step` release the gate.
-- `OnFrameExit(frame, result)` — after the frame completes.
-
-Because pausing parks the one thread that owns the guest context, register and
-memory accessors are only served while the session reports `Paused`; otherwise
-they return "not paused" so a client never observes torn state.
-
-### What is and isn't live yet
-
-- **Live:** attach/handshake, run-state tracking, register read/write, memory
-  read/write, breakpoint management, execution breakpoints at frame entry,
-  pause, frame-level step, continue, and stop/resume/terminate events.
-- **Surface only (armed as the backend grows hooks):** per-instruction
-  stepping and data watchpoints (`readwatch` / `writewatch` / `accesswatch`).
-  The verbs and types exist so clients and tooling can be written now.
-
-## Enabling the server
-
-```bash
-SharpEmu --debug-server "/path/to/eboot.bin"            # 127.0.0.1:5714
-SharpEmu --debug-server=0.0.0.0:5714 "/path/to/eboot.bin"
-```
-
-The bind address defaults to loopback; a routable address must be given
-explicitly. With stop-at-entry (the default `DebuggerSessionOptions.StopAtEntry`),
-the guest parks at its first frame until a client connects and issues
-`continue`, giving you a window to set breakpoints before any guest code runs.
-
-## Browser frontend
-
-The dependency-free Python frontend can choose and launch an `eboot.bin`, attach
-to its debugger automatically, and provides execution controls, registers,
-memory inspection, breakpoint management, process output, and a live protocol
-activity stream:
-
-```bash
-./tools/SharpEmu.DebuggerFrontend/run.sh
-```
-
-It connects to `127.0.0.1:5714` and opens `http://127.0.0.1:8765/` by default.
-See [`tools/SharpEmu.DebuggerFrontend/README.md`](../tools/SharpEmu.DebuggerFrontend/README.md)
-for configuration and testing options.
-
-## Wire protocol (json-lines/1)
-
-One JSON object per line, UTF-8, `\n`-terminated, in both directions.
-
-### Requests
-
-A `command` string plus command-specific fields. Numeric fields accept a JSON
-number or a `0x`-prefixed hex string.
-
-| `command` | Fields | Reply `data` |
-| --------- | ------ | ------------ |
-| `ping` | — | — |
-| `status` (`info`) | — | `state`, `breakpoints`, `lastStop?` |
-| `state` | — | `state` |
-| `registers` (`regs`) | — | `registers` (rax..r15, rip, rflags, fs_base, gs_base) |
-| `set-register` | `register`, `value` | — |
-| `read-memory` | `address`, `length` (≤ 65536) | `address`, `length`, `bytes` (hex) |
-| `write-memory` | `address`, `bytes` (hex) | `written` |
-| `list-breakpoints` (`breakpoints`) | — | `breakpoints[]` |
-| `add-breakpoint` (`break`) | `address`, `kind?`, `length?` | `breakpoint` |
-| `remove-breakpoint` (`delete-breakpoint`) | `id` | — |
-| `enable-breakpoint` | `id`, `enabled?` (default true) | — |
-| `continue` (`cont`, `c`) | — | — |
-| `step` (`s`) | — | — |
-| `pause` | — | — |
-
-### Replies
-
-```json
-{"ok":true,"command":"registers","data":{ "registers": { "rax":"0x…", … } }}
-{"ok":false,"command":"read-memory","error":"Target is not paused."}
-```
-
-### Events (unsolicited)
-
-```json
-{"event":"hello","protocol":"json-lines/1","state":"Paused"}
-{"event":"stopped","reason":"Breakpoint","address":"0x…","frameKind":"ProcessEntry","frameLabel":"eboot.bin","registers":{…},"breakpoint":{…}}
-{"event":"resumed"}
-{"event":"terminated"}
-```
-
-`reason` is one of `EntryPoint`, `Breakpoint`, `Watchpoint`, `Step`, `Pause`,
-`Fault`, or `Stall`.
-
-Stall stops include structured evidence in addition to the human-readable
-detail. Import-loop evidence identifies the NID, resolved HLE export, repeating
-guest return site, dispatch count, and first two ABI arguments:
-
-```json
-{
-  "event": "stopped",
-  "reason": "Stall",
-  "stall": {
-    "kind": "ImportLoop",
-    "nid": "9UK1vLZQft4",
-    "instructionPointer": "0x0000000801CE2418",
-    "dispatchIndex": 40667904,
-    "argument0": "0x0000000812345000",
-    "argument1": "0x0000000000000000",
-    "resolved": true,
-    "library": "libKernel",
-    "function": "scePthreadMutexLock"
-  }
-}
-```
-
-The Python frontend uses this evidence to explain the likely failure class and
-rank concrete checks/fixes. Its diagnosis is intentionally labelled heuristic:
-it helps locate the responsible HLE/scheduler path but does not replace tracing.
-
-## Swapping the protocol
-
-`DebuggerServer` takes an `IDebugProtocol` factory. The default is
-`JsonLineDebugProtocol`; a GDB remote serial stub (or any other framing) can be
-dropped in without changing the session or command semantics, which live in
-`DebugCommandDispatcher`.
-
-## Embedding the server
-
-```csharp
-using SharpEmu.Debugger;
-using SharpEmu.Core.Runtime;
-
-await using var host = new DebuggerServerHost();
-host.Start();
-
-var options = new SharpEmuRuntimeOptions { DebugHook = host.Hook };
-using var runtime = SharpEmuRuntime.CreateDefault(options);
-var result = runtime.Run(ebootPath);
-
-host.NotifyRunCompleted();
-```

native/bink2-bridge/sharpemu_bink2_bridge.c

@@ -1,66 +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;
-
-    *movie = NULL;
-
-    bink = BinkOpen(path, 0);
-    if (!bink) return 0;
-
-    if (bink->Width == 0 || bink->Height == 0) {
-        BinkClose(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;
-    uint64_t min_stride;
-
-    if (!movie || !destination) return 0;
-
-    min_stride = (uint64_t)movie->Width * 4;
-    if ((uint64_t)stride < min_stride) 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;
-
-    if (!BinkDoFrame(movie)) return 0;
-
-    if (!BinkCopyToBuffer(movie, destination, stride, movie->Height, 0, 0, BINKSURFACE32RA)) return 0;
-
-    BinkNextFrame(movie);
-    return 1;
-}
-
-void sharpemu_bink2_close(HBINK movie) {
-   if (movie) BinkClose(movie);
-}

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"

scripts/validate-synthetic-spirv.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 SharpEmu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set -euo pipefail
-
-if [ "$#" -ne 4 ]; then
-  echo "usage: $0 <spirv-val> <expected-version> <target-env> <module-directory>" >&2
-  exit 2
-fi
-
-validator=$1
-expected_version=$2
-target_env=$3
-module_directory=$4
-
-if [ ! -x "$validator" ]; then
-  echo "SPIR-V validator is not executable: $validator" >&2
-  exit 2
-fi
-
-if [ ! -d "$module_directory" ]; then
-  echo "SPIR-V module directory does not exist: $module_directory" >&2
-  exit 2
-fi
-
-validator_version="$("$validator" --version | head -n 1)"
-if [[ "$validator_version" != *"SPIRV-Tools $expected_version"* ]]; then
-  echo "unexpected SPIRV-Tools version: $validator_version (expected $expected_version)" >&2
-  exit 2
-fi
-
-echo "Validator: $validator_version"
-echo "Target environment: $target_env"
-
-mapfile -d '' modules < <(find "$module_directory" -type f -name '*.spv' -print0 | sort -z)
-if [ "${#modules[@]}" -eq 0 ]; then
-  echo "no SPIR-V modules found in $module_directory" >&2
-  exit 1
-fi
-
-failures=0
-for module in "${modules[@]}"; do
-  echo "Validating module: $module"
-  if ! "$validator" --target-env "$target_env" "$module"; then
-    echo "SPIR-V validation failed: $module" >&2
-    failures=1
-  fi
-done
-
-if [ "$failures" -ne 0 ]; then
-  exit 1
-fi
-
-echo "Validated ${#modules[@]} synthetic SPIR-V modules."

src/SharpEmu.CLI/SharpEmu.CLI.csproj

@@ -7,42 +7,20 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
   <ItemGroup>
     <ProjectReference Include="..\SharpEmu.Core\SharpEmu.Core.csproj" />
-    <ProjectReference Include="..\SharpEmu.Debugger\SharpEmu.Debugger.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>
+    <!-- <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'">
@@ -55,37 +33,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
   <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,45 +68,18 @@
         "type": "Project",
         "dependencies": {
           "Iced": "[1.21.0, )",
-          "SharpEmu.HLE": "[0.0.2-beta.3, )",
-          "SharpEmu.Libs": "[0.0.2-beta.3, )",
-          "SharpEmu.Logging": "[0.0.2-beta.3, )"
-        }
-      },
-      "sharpemu.debugger": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.Core": "[0.0.2-beta.3, )",
-          "SharpEmu.HLE": "[0.0.2-beta.3, )",
-          "SharpEmu.Logging": "[0.0.2-beta.3, )"
-        }
-      },
-      "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.3, )",
-          "SharpEmu.Libs": "[0.0.2-beta.3, )",
-          "SharpEmu.Logging": "[0.0.2-beta.3, )",
-          "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.3, )"
-        }
+        "type": "Project"
       },
       "sharpemu.libs": {
         "type": "Project",
         "dependencies": {
-          "SharpEmu.HLE": "[0.0.2-beta.3, )",
-          "SharpEmu.ShaderCompiler": "[0.0.2-beta.3, )",
-          "SharpEmu.ShaderCompiler.Vulkan": "[0.0.2-beta.3, )",
-          "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, )",
@@ -264,76 +89,12 @@
       "sharpemu.logging": {
         "type": "Project"
       },
-      "sharpemu.shadercompiler": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.HLE": "[0.0.2-beta.3, )"
-        }
-      },
-      "sharpemu.shadercompiler.vulkan": {
-        "type": "Project",
-        "dependencies": {
-          "SharpEmu.ShaderCompiler": "[0.0.2-beta.3, )"
-        }
-      },
-      "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, )",
@@ -372,61 +133,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",
@@ -434,105 +143,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",
@@ -540,52 +150,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

@@ -3,7 +3,6 @@
 
 using System.Buffers.Binary;
 using System.Text;
-using SharpEmu.Core.Cpu.Debugging;
 using SharpEmu.Core.Cpu.Native;
 using SharpEmu.Core.Loader;
 using SharpEmu.Core.Memory;
@@ -19,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;
@@ -273,23 +265,7 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
             entryFrameDiagnostic,
             Environment.NewLine,
             "CpuEngine: native-only");
-        // Frame boundaries an attached debugger observes; null hook = a branch.
-        var debugHook = executionOptions.DebugHook;
-        var debugFrame = debugHook is null
-            ? null
-            : new CpuContextDebugFrame(
-                frameKind == EntryFrameKind.ProcessEntry
-                    ? CpuDebugFrameKind.ProcessEntry
-                    : CpuDebugFrameKind.ModuleInitializer,
-                entryPoint,
-                processImageName,
-                context,
-                effectiveImportStubs);
-        debugHook?.OnFrameEnter(debugFrame!);
-
         _nativeCpuBackend ??= new DirectExecutionBackend(_moduleManager);
-        // Let backend stall reports reference the same frame as entry.
-        (_nativeCpuBackend as DirectExecutionBackend)?.SetActiveDebugFrame(debugFrame);
         if (_nativeCpuBackend.TryExecute(
                 context,
                 entryPoint,
@@ -299,7 +275,6 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
                 executionOptions,
                 out var nativeResult))
         {
-            debugHook?.OnFrameExit(debugFrame!, nativeResult);
             LastSessionSummary = new CpuSessionSummary(
                 nativeResult,
                 nativeResult == OrbisGen2Result.ORBIS_GEN2_OK
@@ -314,8 +289,6 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
             return nativeResult;
         }
 
-        debugHook?.OnFrameExit(debugFrame!, OrbisGen2Result.ORBIS_GEN2_ERROR_NOT_IMPLEMENTED);
-
         var backendName = string.IsNullOrWhiteSpace(_nativeCpuBackend.BackendName)
             ? "native-backend"
             : _nativeCpuBackend.BackendName;
@@ -392,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)
@@ -430,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);
@@ -713,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)
@@ -727,7 +666,6 @@ public sealed class CpuDispatcher : ICpuDispatcher, IDisposable
             disposableBackend.Dispose();
         }
 
-        NativeSessionLeaked = _nativeCpuBackend is DirectExecutionBackend { GuestSessionLeaked: true };
         _nativeCpuBackend = null;
     }
 }

src/SharpEmu.Core/Cpu/CpuExecutionOptions.cs

@@ -1,26 +1,15 @@
 // Copyright (C) 2026 SharpEmu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-using SharpEmu.Core.Cpu.Debugging;
-
 namespace SharpEmu.Core.Cpu;
 
 public readonly struct CpuExecutionOptions
 {
     public bool EnableDisasmDiagnostics { get; init; }
-
+    
     public CpuExecutionEngine CpuEngine { get; init; }
 
     public bool StrictDynlibResolution { get; init; }
 
     public int ImportTraceLimit { get; init; }
-
-    /// <summary>
-    /// An optional debugger attached to this execution session. When set, the
-    /// dispatcher notifies it at each frame boundary via
-    /// <see cref="ICpuDebugHook.OnFrameEnter"/> / <see cref="ICpuDebugHook.OnFrameExit"/>.
-    /// Null when no debugger is attached, which is the default and imposes no
-    /// runtime cost.
-    /// </summary>
-    public ICpuDebugHook? DebugHook { get; init; }
 }

src/SharpEmu.Core/Cpu/Debugging/CpuContextDebugFrame.cs

@@ -1,66 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Debugging;
-
-/// <summary>
-/// Adapts a live <see cref="CpuContext"/> to <see cref="ICpuDebugFrame"/>. The
-/// dispatcher creates one of these around the guest context it is about to run
-/// and passes it to the attached <see cref="ICpuDebugHook"/>; every accessor
-/// forwards directly to the underlying context.
-/// </summary>
-internal sealed class CpuContextDebugFrame : ICpuDebugFrame
-{
-    private readonly CpuContext _context;
-
-    internal CpuContextDebugFrame(
-        CpuDebugFrameKind kind,
-        ulong entryPoint,
-        string label,
-        CpuContext context,
-        IReadOnlyDictionary<ulong, string> importStubs)
-    {
-        Kind = kind;
-        EntryPoint = entryPoint;
-        Label = label ?? string.Empty;
-        _context = context ?? throw new ArgumentNullException(nameof(context));
-        ImportStubs = importStubs ?? new Dictionary<ulong, string>();
-    }
-
-    public CpuDebugFrameKind Kind { get; }
-
-    public Generation Generation => _context.TargetGeneration;
-
-    public ulong EntryPoint { get; }
-
-    public string Label { get; }
-
-    public ICpuMemory Memory => _context.Memory;
-
-    public ulong GetRegister(CpuRegister register) => _context[register];
-
-    public void SetRegister(CpuRegister register, ulong value) => _context[register] = value;
-
-    public ulong Rip
-    {
-        get => _context.Rip;
-        set => _context.Rip = value;
-    }
-
-    public ulong Rflags
-    {
-        get => _context.Rflags;
-        set => _context.Rflags = value;
-    }
-
-    public ulong FsBase => _context.FsBase;
-
-    public ulong GsBase => _context.GsBase;
-
-    public void GetXmm(int registerIndex, out ulong low, out ulong high)
-        => _context.GetXmmRegister(registerIndex, out low, out high);
-
-    public IReadOnlyDictionary<ulong, string> ImportStubs { get; }
-}

src/SharpEmu.Core/Cpu/Debugging/CpuDebugFrameKind.cs

@@ -1,18 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Core.Cpu.Debugging;
-
-/// <summary>
-/// Identifies the kind of guest entry frame a debugger is observing. The
-/// dispatcher enters a fresh frame for the process entry point and for every
-/// module initializer, so the debug layer can label stops accordingly.
-/// </summary>
-public enum CpuDebugFrameKind
-{
-    /// <summary>The guest process entry point (<c>eboot.bin</c> start).</summary>
-    ProcessEntry,
-
-    /// <summary>A module DT_INIT / initializer routine.</summary>
-    ModuleInitializer,
-}

src/SharpEmu.Core/Cpu/Debugging/CpuStallInfo.cs

@@ -1,70 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Core.Cpu.Debugging;
-
-/// <summary>The kind of execution stall the backend detected.</summary>
-public enum CpuStallKind
-{
-    /// <summary>
-    /// The guest is repeatedly re-dispatching the same import with no forward
-    /// progress — most commonly a spin on a mutex lock/unlock pair.
-    /// </summary>
-    ImportLoop,
-}
-
-/// <summary>
-/// Details of a detected stall handed to <see cref="ICpuDebugHook.OnStall"/>.
-/// Reported from the emulation thread at the point the backend recognises the
-/// livelock, before it forces the guest out of the loop.
-/// </summary>
-public readonly struct CpuStallInfo
-{
-    public CpuStallInfo(
-        CpuStallKind kind,
-        string? nid,
-        ulong instructionPointer,
-        long dispatchIndex,
-        ulong argument0,
-        ulong argument1,
-        string detail,
-        string? libraryName = null,
-        string? functionName = null)
-    {
-        Kind = kind;
-        Nid = nid;
-        InstructionPointer = instructionPointer;
-        DispatchIndex = dispatchIndex;
-        Argument0 = argument0;
-        Argument1 = argument1;
-        Detail = detail ?? string.Empty;
-        LibraryName = libraryName;
-        FunctionName = functionName;
-    }
-
-    public CpuStallKind Kind { get; }
-
-    /// <summary>The NID of the import being spun on, when known.</summary>
-    public string? Nid { get; }
-
-    /// <summary>The guest return address of the looping import dispatch.</summary>
-    public ulong InstructionPointer { get; }
-
-    /// <summary>The import dispatch counter at detection time.</summary>
-    public long DispatchIndex { get; }
-
-    /// <summary>The first two guest ABI arguments at stall detection.</summary>
-    public ulong Argument0 { get; }
-
-    public ulong Argument1 { get; }
-
-    /// <summary>The resolved HLE export, when the NID is registered.</summary>
-    public string? LibraryName { get; }
-
-    public string? FunctionName { get; }
-
-    public bool IsResolved => !string.IsNullOrWhiteSpace(FunctionName);
-
-    /// <summary>A human-readable one-line summary of the stall.</summary>
-    public string Detail { get; }
-}

src/SharpEmu.Core/Cpu/Debugging/ICpuDebugFrame.cs

@@ -1,66 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Debugging;
-
-/// <summary>
-/// A live view of the guest CPU state at a dispatch boundary, handed to an
-/// <see cref="ICpuDebugHook"/> so a debugger can read and mutate registers and
-/// guest memory without taking a dependency on the concrete
-/// <c>CpuContext</c>/<c>CpuDispatcher</c> types.
-/// </summary>
-/// <remarks>
-/// The frame instance is only valid for the duration of the hook call that
-/// receives it (between <see cref="ICpuDebugHook.OnFrameEnter"/> and the
-/// matching <see cref="ICpuDebugHook.OnFrameExit"/>). Reads and writes are
-/// forwarded straight to the underlying guest context, so mutations made from
-/// a hook are observed by the CPU backend when it resumes the frame.
-/// </remarks>
-public interface ICpuDebugFrame
-{
-    /// <summary>The kind of frame being executed.</summary>
-    CpuDebugFrameKind Kind { get; }
-
-    /// <summary>The guest ABI generation this frame targets.</summary>
-    Generation Generation { get; }
-
-    /// <summary>The guest virtual address the frame begins executing at.</summary>
-    ulong EntryPoint { get; }
-
-    /// <summary>
-    /// A human-readable label for the frame (process image name or module name).
-    /// </summary>
-    string Label { get; }
-
-    /// <summary>Guest-addressable memory for this frame.</summary>
-    ICpuMemory Memory { get; }
-
-    /// <summary>Reads a general-purpose register.</summary>
-    ulong GetRegister(CpuRegister register);
-
-    /// <summary>Overwrites a general-purpose register.</summary>
-    void SetRegister(CpuRegister register, ulong value);
-
-    /// <summary>The instruction pointer.</summary>
-    ulong Rip { get; set; }
-
-    /// <summary>The flags register.</summary>
-    ulong Rflags { get; set; }
-
-    /// <summary>The FS segment base (guest TLS pointer).</summary>
-    ulong FsBase { get; }
-
-    /// <summary>The GS segment base.</summary>
-    ulong GsBase { get; }
-
-    /// <summary>Reads the 128-bit value of an XMM register.</summary>
-    void GetXmm(int registerIndex, out ulong low, out ulong high);
-
-    /// <summary>
-    /// The import stubs (guest address to NID) resolved for this frame, so a
-    /// debugger can annotate calls into HLE exports.
-    /// </summary>
-    IReadOnlyDictionary<ulong, string> ImportStubs { get; }
-}

src/SharpEmu.Core/Cpu/Debugging/ICpuDebugHook.cs

@@ -1,49 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Core.Cpu.Debugging;
-
-/// <summary>
-/// The seam the CPU dispatcher uses to notify an attached debugger when guest
-/// execution crosses a frame boundary. Implemented outside of Core (for
-/// example by <c>SharpEmu.Debugger</c>) and supplied through
-/// <see cref="CpuExecutionOptions.DebugHook"/>.
-/// </summary>
-/// <remarks>
-/// This is intentionally coarse-grained: it exposes the entry and exit of each
-/// dispatched frame rather than per-instruction stepping. Per-instruction
-/// control requires cooperation from the native execution backend and is layered
-/// on top of this seam as the backend gains support; keeping the dispatcher-level
-/// contract stable lets the debugger infrastructure exist independently of that
-/// work. Implementations must be thread-safe: frames may be dispatched from the
-/// dedicated emulation thread while a debug server services clients on its own
-/// threads.
-/// </remarks>
-public interface ICpuDebugHook
-{
-    /// <summary>
-    /// Invoked immediately before the native backend begins executing a frame.
-    /// The debugger may inspect or mutate <paramref name="frame"/> and may block
-    /// the calling thread (for example, to honour a pause request) before
-    /// returning to allow execution to proceed.
-    /// </summary>
-    void OnFrameEnter(ICpuDebugFrame frame);
-
-    /// <summary>
-    /// Invoked after a frame completes, whether it returned to the host or
-    /// terminated with an error. <paramref name="frame"/> reflects the final
-    /// guest state.
-    /// </summary>
-    void OnFrameExit(ICpuDebugFrame frame, OrbisGen2Result result);
-
-    /// <summary>
-    /// Invoked from the emulation thread when the backend detects an execution
-    /// stall (for example a mutex spin loop) in the running frame, before it
-    /// forces the guest out of the loop. As with <see cref="OnFrameEnter"/>, the
-    /// implementation may inspect <paramref name="frame"/> and block to honour a
-    /// break before returning to let the backend proceed.
-    /// </summary>
-    void OnStall(ICpuDebugFrame frame, CpuStallInfo info);
-}

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,15 +4,11 @@
 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();
@@ -29,127 +25,37 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
     private const ulong DefaultLazyReservePrimeBytes = 0x0400_0000UL; // 64 MiB
     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 ulong _guestAllocationOffset;
     private static readonly ulong LazyReservePrimeBytes = ResolveLazyReservePrimeBytes();
 
-    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 +67,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;
         }
@@ -198,24 +104,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         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,33 +112,33 @@ 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;
 
-        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)
             {
@@ -258,32 +146,32 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             }
 
             TraceVmem($"Could not allocate at 0x{desiredAddress:X16}, trying any address...");
-            result = _hostMemory.Allocate(0, alignedSize, hostProtection);
+            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 +184,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;
                     }
@@ -367,35 +256,6 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
         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;
-        }
-
         for (var attempt = 0; attempt < 0x10000; attempt++)
         {
             if (cursor == 0 || ulong.MaxValue - cursor < alignedSize)
@@ -409,10 +269,19 @@ 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)
+                {
+                    UpdateAllocationSearchCursor(desiredAddress, effectiveAlignment, executable, actualAddress + alignedSize);
+                    return true;
+                }
+
+                actualAddress = 0;
+            }
+            catch
             {
-                UpdateAllocationSearchCursor(desiredAddress, effectiveAlignment, executable, actualAddress + alignedSize);
-                return true;
             }
 
             cursor = AlignUp(cursor + effectiveAlignment, effectiveAlignment);
@@ -421,28 +290,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 +309,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
                         GuestAllocationArenaSize,
                         executable: false,
                         allowAlternative: true);
-                    _guestAllocationFreeRanges.Add(
-                        GuestAllocationArenaStartOffset,
-                        GuestAllocationArenaSize - GuestAllocationArenaStartOffset);
+                    _guestAllocationOffset = GuestAllocationArenaStartOffset;
                 }
                 catch (Exception)
                 {
@@ -472,128 +317,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,7 +338,7 @@ 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();
@@ -618,8 +353,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             }
 
             _guestAllocationArenaBase = 0;
-            _guestAllocationFreeRanges.Clear();
-            _guestAllocations.Clear();
+            _guestAllocationOffset = 0;
         }
     }
 
@@ -678,67 +412,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 +543,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 +682,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 +696,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 +721,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
         {
@@ -1258,12 +925,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 +944,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 +958,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 +991,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 +1008,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 _);
         }
     }
 
@@ -1381,7 +1048,7 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
             return;
         }
 
-        Log.Debug(message);
+        Console.Error.WriteLine($"[VMEM] {message}");
     }
 
     public void Dispose()
@@ -1402,4 +1069,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)
     {
@@ -68,7 +66,6 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             CpuEngine = cpuExecutionOptions.CpuEngine,
             StrictDynlibResolution = cpuExecutionOptions.StrictDynlibResolution,
             ImportTraceLimit = Math.Max(0, cpuExecutionOptions.ImportTraceLimit),
-            DebugHook = cpuExecutionOptions.DebugHook,
         };
         _fileSystem = fileSystem ?? new PhysicalFileSystem();
     }
@@ -80,12 +77,10 @@ public sealed class SharpEmuRuntime : ISharpEmuRuntime
             CpuEngine = options.CpuEngine,
             StrictDynlibResolution = options.StrictDynlibResolution,
             ImportTraceLimit = Math.Max(0, options.ImportTraceLimit),
-            DebugHook = options.DebugHook,
         };
         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();
@@ -139,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;
@@ -191,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);
@@ -385,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);
     }
@@ -444,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,
@@ -503,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))
             {
@@ -535,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(
@@ -635,17 +541,12 @@ 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"),
+            Path.Combine(ebootDirectory, "Media", "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)
@@ -655,25 +556,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 =>
+                .EnumerateFiles(directory)
+                .OrderBy(path => path, StringComparer.OrdinalIgnoreCase))
+            .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)
             .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)
@@ -686,15 +585,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);
@@ -719,13 +617,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(
@@ -743,28 +636,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,
@@ -969,7 +840,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))
         {
@@ -977,27 +848,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)
@@ -1164,16 +1023,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/Runtime/SharpEmuRuntimeOptions.cs

@@ -4,7 +4,6 @@
 namespace SharpEmu.Core.Runtime;
 
 using SharpEmu.Core.Cpu;
-using SharpEmu.Core.Cpu.Debugging;
 
 public readonly struct SharpEmuRuntimeOptions
 {
@@ -13,11 +12,4 @@ public readonly struct SharpEmuRuntimeOptions
     public bool StrictDynlibResolution { get; init; }
 
     public int ImportTraceLimit { get; init; }
-
-    /// <summary>
-    /// An optional debugger to attach to guest execution. Flows through to
-    /// <see cref="CpuExecutionOptions.DebugHook"/>. Null (the default) runs with
-    /// no debugger attached.
-    /// </summary>
-    public ICpuDebugHook? DebugHook { get; init; }
 }

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,124 @@
+{
+  "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.EXT": "[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.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, )",
+        "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.DebugClient/ClientEndpoint.cs

@@ -1,54 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net;
-
-namespace SharpEmu.DebugClient;
-
-/// <summary>
-/// Parses the <c>host:port</c> the client connects to. Mirrors the server's
-/// defaults (loopback, port 5714) so a bare invocation attaches to a local
-/// emulator with no arguments.
-/// </summary>
-internal static class ClientEndpoint
-{
-    public const int DefaultPort = 5714;
-
-    public static bool TryParse(string? text, out string host, out int port, out string error)
-    {
-        host = "127.0.0.1";
-        port = DefaultPort;
-        error = string.Empty;
-        if (string.IsNullOrWhiteSpace(text))
-        {
-            return true;
-        }
-
-        var value = text.Trim();
-        var separator = value.LastIndexOf(':');
-        if (separator >= 0)
-        {
-            var portText = value[(separator + 1)..];
-            if (portText.Length > 0 && (!int.TryParse(portText, out port) || port is <= 0 or > 65535))
-            {
-                error = $"Invalid port '{portText}'.";
-                return false;
-            }
-
-            value = value[..separator];
-        }
-
-        if (!string.IsNullOrWhiteSpace(value))
-        {
-            host = string.Equals(value, "localhost", StringComparison.OrdinalIgnoreCase) ? "127.0.0.1" : value;
-        }
-
-        if (!IPAddress.TryParse(host, out _) && !Uri.CheckHostName(host).Equals(UriHostNameType.Dns))
-        {
-            error = $"Invalid host '{host}'.";
-            return false;
-        }
-
-        return true;
-    }
-}

src/SharpEmu.DebugClient/CommandTranslator.cs

@@ -1,160 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Text.Json;
-
-namespace SharpEmu.DebugClient;
-
-/// <summary>
-/// Turns a friendly REPL line (<c>mem 0x1000 64</c>) into the JSON request the
-/// server understands. Local-only verbs (help, quit) are reported back to the
-/// caller instead of producing a request.
-/// </summary>
-internal static class CommandTranslator
-{
-    public enum ActionKind
-    {
-        SendRequest,
-        ShowHelp,
-        Quit,
-        Ignore,
-        Error,
-    }
-
-    public readonly record struct Result(ActionKind Kind, string? Payload = null, string? Error = null);
-
-    public static Result Translate(string line)
-    {
-        var trimmed = line.Trim();
-        if (trimmed.Length == 0)
-        {
-            return new Result(ActionKind.Ignore);
-        }
-
-        var parts = trimmed.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries);
-        var verb = parts[0].ToLowerInvariant();
-        switch (verb)
-        {
-            case "help" or "?":
-                return new Result(ActionKind.ShowHelp);
-            case "quit" or "exit" or "q":
-                return new Result(ActionKind.Quit);
-            case "raw":
-                var json = trimmed[verb.Length..].Trim();
-                return json.Length == 0
-                    ? Error("raw requires a JSON object argument.")
-                    : Send(json);
-
-            case "ping":
-                return Request("ping");
-            case "status" or "info":
-                return Request("status");
-            case "state":
-                return Request("state");
-            case "regs" or "registers":
-                return Request("registers");
-            case "continue" or "cont" or "c":
-                return Request("continue");
-            case "step" or "s":
-                return Request("step");
-            case "pause" or "p":
-                return Request("pause");
-            case "bp" or "breakpoints" or "bl":
-                return Request("list-breakpoints");
-
-            case "setreg":
-                return parts.Length >= 3
-                    ? Request("set-register", ("register", parts[1]), ("value", parts[2]))
-                    : Error("Usage: setreg <register> <value>");
-            case "mem" or "read":
-                return parts.Length >= 3
-                    ? Request("read-memory", ("address", parts[1]), ("length", parts[2]))
-                    : Error("Usage: mem <address> <length>");
-            case "write":
-                return parts.Length >= 3
-                    ? Request("write-memory", ("address", parts[1]), ("bytes", parts[2]))
-                    : Error("Usage: write <address> <hex-bytes>");
-            case "break" or "b":
-                if (parts.Length < 2)
-                {
-                    return Error("Usage: break <address> [kind] [length]");
-                }
-
-                var breakArgs = new List<(string, string)> { ("address", parts[1]) };
-                if (parts.Length >= 3)
-                {
-                    breakArgs.Add(("kind", parts[2]));
-                }
-
-                if (parts.Length >= 4)
-                {
-                    breakArgs.Add(("length", parts[3]));
-                }
-
-                return Request("add-breakpoint", breakArgs.ToArray());
-            case "del" or "rm" or "delete":
-                return parts.Length >= 2
-                    ? Request("remove-breakpoint", ("id", parts[1]))
-                    : Error("Usage: del <id>");
-            case "enable":
-                return parts.Length >= 2
-                    ? Request("enable-breakpoint", ("id", parts[1]), ("enabled", "true"))
-                    : Error("Usage: enable <id>");
-            case "disable":
-                return parts.Length >= 2
-                    ? RequestWithBool("enable-breakpoint", ("id", parts[1]), enabledName: "enabled", enabled: false)
-                    : Error("Usage: disable <id>");
-
-            default:
-                return Error($"Unknown command '{verb}'. Type 'help' for the command list.");
-        }
-    }
-
-    private static Result Request(string command, params (string Name, string Value)[] args)
-    {
-        var payload = new Dictionary<string, object?> { ["command"] = command };
-        foreach (var (name, value) in args)
-        {
-            payload[name] = value;
-        }
-
-        return Send(JsonSerializer.Serialize(payload));
-    }
-
-    private static Result RequestWithBool(string command, (string Name, string Value) idArg, string enabledName, bool enabled)
-    {
-        var payload = new Dictionary<string, object?>
-        {
-            ["command"] = command,
-            [idArg.Name] = idArg.Value,
-            [enabledName] = enabled,
-        };
-        return Send(JsonSerializer.Serialize(payload));
-    }
-
-    private static Result Send(string json) => new(ActionKind.SendRequest, json);
-
-    private static Result Error(string message) => new(ActionKind.Error, Error: message);
-
-    public const string HelpText = """
-        SharpEmu debug client commands:
-          status | info            Show target state and last stop
-          state                    Show run state only
-          regs | registers         Dump integer registers (paused only)
-          setreg <reg> <value>     Set a register (rip/rflags/gp, paused only)
-          mem <addr> <len>         Read guest memory as hex (paused only)
-          write <addr> <hex>       Write guest memory from hex (paused only)
-          break <addr> [kind] [len]  Add a breakpoint (kind: execute/readwatch/writewatch/accesswatch)
-          bp | breakpoints         List breakpoints
-          del <id>                 Remove a breakpoint
-          enable <id> / disable <id>  Toggle a breakpoint
-          continue | c             Resume the target
-          step | s                 Resume and stop at the next frame
-          pause                    Ask a running target to stop
-          ping                     Round-trip check
-          raw <json>               Send a literal JSON request
-          help | ?                 Show this help
-          quit | exit              Disconnect and exit
-        Addresses and values accept decimal or 0x-prefixed hex.
-        """;
-}

src/SharpEmu.DebugClient/DEVELOPER_READ.md

@@ -1,153 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-# SharpEmu.DebugClient
-
-A small, standalone command-line client that connects to the SharpEmu
-emulator's **live debug server** and drives it interactively. It ships as its
-own executable (`SharpEmu.DebugClient`) and takes no dependency on the emulator
-assemblies — it speaks the server's line-delimited JSON protocol directly over
-TCP, so you can also drive the server from `nc`, a script, or your own tool.
-
-> **Status:** infrastructure. The transport, protocol, session model, and
-> breakpoint store are in place. Stops are delivered at **frame boundaries**
-> (process entry and each module initializer); per-instruction stepping and data
-> watchpoints are part of the surface and become live as the CPU backend grows
-> the corresponding hooks. See [`docs/debugger-server.md`](../../docs/debugger-server.md)
-> for the architecture and protocol reference.
-
-## How it fits together
-
-```
-+-------------------------+           TCP (JSON lines)         +----------------------+
-|  SharpEmu (emulator)    |  <------------------------------>  |  SharpEmu.DebugClient |
-|  --debug-server         |                                    |  (this executable)    |
-|                         |                                    |                       |
-|  DebuggerServerHost     |                                    |  REPL / --exec        |
-|   +- DebuggerServer     |  frame boundaries via ICpuDebugHook|                       |
-|   +- DebuggerSession  <-+------ CPU dispatcher ------------  |                       |
-+-------------------------+                                    +----------------------+
-```
-
-The emulator is the **server**; this client is a separate process that connects
-to it and issues commands. The two never share memory — everything crosses the
-socket as JSON.
-
-## Building
-
-```bash
-dotnet build src/SharpEmu.DebugClient/SharpEmu.DebugClient.csproj
-```
-
-## Quick start
-
-1. Launch the emulator with the debug server enabled. It listens on
-   `127.0.0.1:5714` by default and, with stop-at-entry on, parks the guest at
-   its first frame until you continue:
-
-   ```bash
-   SharpEmu --debug-server "/path/to/game/eboot.bin"
-   # or choose an endpoint:
-   SharpEmu --debug-server=127.0.0.1:5714 "/path/to/game/eboot.bin"
-   ```
-
-2. In another terminal, attach the client:
-
-   ```bash
-   SharpEmu.DebugClient                 # defaults to 127.0.0.1:5714
-   SharpEmu.DebugClient 127.0.0.1:5714  # explicit endpoint
-   ```
-
-3. Drive the target:
-
-   ```
-   status
-   regs
-   break 0x00000008801234a0
-   continue
-   mem 0x00000008802000000 64
-   ```
-
-## Invocation
-
-```
-SharpEmu.DebugClient [host:port] [--exec "<command>"]... [--quiet]
-```
-
-| Option        | Meaning                                                        |
-| ------------- | ------------------------------------------------------------- |
-| `host:port`   | Server endpoint. Default `127.0.0.1:5714`. `localhost` is fine. |
-| `--exec, -e`  | Run one command non-interactively, then exit. Repeatable.     |
-| `--quiet`     | Suppress the connection banner.                               |
-| `--help, -h`  | Show usage and the command list.                              |
-
-Non-interactive example (scriptable):
-
-```bash
-SharpEmu.DebugClient --exec "break 0x8801234a0" --exec "continue"
-```
-
-## Commands
-
-Addresses and values accept decimal or `0x`-prefixed hex. Register and memory
-commands only succeed while the target is **paused**.
-
-| Command | Server verb | Description |
-| ------- | ----------- | ----------- |
-| `status` \| `info` | `status` | Target state plus the last stop. |
-| `state` | `state` | Run state only (`Running`/`Paused`/…). |
-| `regs` \| `registers` | `registers` | Dump the integer registers. |
-| `setreg <reg> <value>` | `set-register` | Set `rip`, `rflags`, or a GP register. |
-| `mem <addr> <len>` \| `read <addr> <len>` | `read-memory` | Read guest memory as hex. |
-| `write <addr> <hex>` | `write-memory` | Write guest memory from a hex string. |
-| `break <addr> [kind] [len]` \| `b …` | `add-breakpoint` | Add a breakpoint. `kind`: `execute` (default), `readwatch`, `writewatch`, `accesswatch`. |
-| `bp` \| `breakpoints` | `list-breakpoints` | List breakpoints. |
-| `del <id>` \| `rm <id>` | `remove-breakpoint` | Remove a breakpoint. |
-| `enable <id>` / `disable <id>` | `enable-breakpoint` | Toggle a breakpoint. |
-| `continue` \| `c` | `continue` | Resume a paused target. |
-| `step` \| `s` | `step` | Resume and stop at the next frame boundary. |
-| `pause` | `pause` | Ask a running target to stop at the next boundary. |
-| `ping` | `ping` | Round-trip liveness check. |
-| `raw <json>` | *(passthrough)* | Send a literal JSON request. |
-| `help` \| `?` | — | Show the command list (local). |
-| `quit` \| `exit` | — | Disconnect and exit (local). |
-
-## Output
-
-The client prints two kinds of lines as they arrive:
-
-- `reply>` — the response to a command you sent (`ok`, plus `data` or `error`).
-- `event>` — an unsolicited notification: `hello` on connect, `stopped` when the
-  target hits a breakpoint / entry / step / pause, `resumed` on continue, and
-  `terminated` when the run ends.
-
-Because replies and events share one stream, the client prints everything it
-receives rather than pairing replies to requests — a `stopped` event may arrive
-between your command and its reply.
-
-## Protocol (for building your own client)
-
-One JSON object per line, UTF-8, `\n`-terminated, in both directions.
-
-Request:
-
-```json
-{"command":"read-memory","address":"0x8802000000","length":64}
-```
-
-Reply:
-
-```json
-{"ok":true,"command":"read-memory","data":{"address":"0x0000000880200000","length":64,"bytes":"48894C24.."}}
-```
-
-Event:
-
-```json
-{"event":"stopped","reason":"Breakpoint","address":"0x00000008801234A0","frameKind":"ProcessEntry","frameLabel":"eboot.bin","registers":{ ... }}
-```
-
-The full verb list and payload fields live in
-[`docs/debugger-server.md`](../../docs/debugger-server.md).

src/SharpEmu.DebugClient/DebugClientConnection.cs

@@ -1,120 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net.Sockets;
-using System.Text;
-using System.Text.Json;
-
-namespace SharpEmu.DebugClient;
-
-/// <summary>
-/// A thin TCP wrapper around the server's line-delimited JSON protocol: it
-/// writes request lines and runs a background loop that prints incoming
-/// responses and events as they arrive. Because the stream interleaves replies
-/// with asynchronous stop/resume events, a single reader printing everything is
-/// simpler and more robust than correlating request/response pairs.
-/// </summary>
-internal sealed class DebugClientConnection : IAsyncDisposable
-{
-    private static readonly UTF8Encoding Utf8NoBom = new(encoderShouldEmitUTF8Identifier: false);
-    private static readonly JsonSerializerOptions PrettyOptions = new() { WriteIndented = true };
-
-    private readonly TcpClient _client;
-    private readonly StreamReader _reader;
-    private readonly StreamWriter _writer;
-    private readonly SemaphoreSlim _writeLock = new(1, 1);
-
-    private DebugClientConnection(TcpClient client, NetworkStream stream)
-    {
-        _client = client;
-        _reader = new StreamReader(stream, Utf8NoBom);
-        _writer = new StreamWriter(stream, Utf8NoBom) { AutoFlush = false };
-    }
-
-    public static async Task<DebugClientConnection> ConnectAsync(string host, int port, CancellationToken cancellationToken)
-    {
-        var client = new TcpClient();
-        await client.ConnectAsync(host, port, cancellationToken).ConfigureAwait(false);
-        return new DebugClientConnection(client, client.GetStream());
-    }
-
-    /// <summary>Continuously prints incoming lines until the stream closes.</summary>
-    public async Task ReceiveLoopAsync(CancellationToken cancellationToken)
-    {
-        try
-        {
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                var line = await _reader.ReadLineAsync(cancellationToken).ConfigureAwait(false);
-                if (line is null)
-                {
-                    Console.WriteLine();
-                    Console.WriteLine("[connection closed by server]");
-                    return;
-                }
-
-                Print(line);
-            }
-        }
-        catch (OperationCanceledException)
-        {
-        }
-        catch (IOException)
-        {
-            Console.WriteLine();
-            Console.WriteLine("[connection lost]");
-        }
-    }
-
-    public async Task SendAsync(string json, CancellationToken cancellationToken)
-    {
-        await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-        try
-        {
-            await _writer.WriteLineAsync(json.AsMemory(), cancellationToken).ConfigureAwait(false);
-            await _writer.FlushAsync(cancellationToken).ConfigureAwait(false);
-        }
-        finally
-        {
-            _writeLock.Release();
-        }
-    }
-
-    private static void Print(string line)
-    {
-        try
-        {
-            using var document = JsonDocument.Parse(line);
-            var root = document.RootElement;
-            var isEvent = root.TryGetProperty("event", out _);
-            var prefix = isEvent ? "event>" : "reply>";
-            var pretty = JsonSerializer.Serialize(root, PrettyOptions);
-            Console.WriteLine();
-            Console.WriteLine($"{prefix}\n{pretty}");
-        }
-        catch (JsonException)
-        {
-            Console.WriteLine();
-            Console.WriteLine(line);
-        }
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        try
-        {
-            await _writer.FlushAsync().ConfigureAwait(false);
-        }
-        catch (IOException)
-        {
-        }
-        catch (ObjectDisposedException)
-        {
-        }
-
-        _writeLock.Dispose();
-        _reader.Dispose();
-        await _writer.DisposeAsync().ConfigureAwait(false);
-        _client.Dispose();
-    }
-}

src/SharpEmu.DebugClient/Program.cs

@@ -1,193 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net.Sockets;
-using SharpEmu.DebugClient;
-
-return await ClientProgram.RunAsync(args).ConfigureAwait(false);
-
-internal static class ClientProgram
-{
-    public static async Task<int> RunAsync(string[] args)
-    {
-        if (args.Any(a => a is "--help" or "-h"))
-        {
-            PrintUsage();
-            return 0;
-        }
-
-        string? endpointArg = null;
-        var execCommands = new List<string>();
-        var quiet = false;
-        for (var i = 0; i < args.Length; i++)
-        {
-            var arg = args[i];
-            if (string.Equals(arg, "--exec", StringComparison.OrdinalIgnoreCase) || string.Equals(arg, "-e", StringComparison.OrdinalIgnoreCase))
-            {
-                if (i + 1 >= args.Length)
-                {
-                    Console.Error.WriteLine("--exec requires a command argument.");
-                    return 2;
-                }
-
-                execCommands.Add(args[++i]);
-                continue;
-            }
-
-            if (string.Equals(arg, "--quiet", StringComparison.OrdinalIgnoreCase))
-            {
-                quiet = true;
-                continue;
-            }
-
-            if (arg.StartsWith('-'))
-            {
-                Console.Error.WriteLine($"Unknown option '{arg}'.");
-                PrintUsage();
-                return 2;
-            }
-
-            endpointArg ??= arg;
-        }
-
-        if (!ClientEndpoint.TryParse(endpointArg, out var host, out var port, out var endpointError))
-        {
-            Console.Error.WriteLine(endpointError);
-            return 2;
-        }
-
-        using var shutdown = new CancellationTokenSource();
-        Console.CancelKeyPress += (_, eventArgs) =>
-        {
-            eventArgs.Cancel = true;
-            shutdown.Cancel();
-        };
-
-        DebugClientConnection connection;
-        try
-        {
-            connection = await DebugClientConnection.ConnectAsync(host, port, shutdown.Token).ConfigureAwait(false);
-        }
-        catch (Exception ex) when (ex is SocketException or OperationCanceledException)
-        {
-            Console.Error.WriteLine($"Could not connect to {host}:{port}: {ex.Message}");
-            Console.Error.WriteLine("Start the emulator with --debug-server first.");
-            return 3;
-        }
-
-        await using (connection)
-        {
-            var receiveTask = connection.ReceiveLoopAsync(shutdown.Token);
-
-            if (execCommands.Count > 0)
-            {
-                await RunOneShotAsync(connection, execCommands, shutdown.Token).ConfigureAwait(false);
-            }
-            else
-            {
-                if (!quiet)
-                {
-                    Console.WriteLine($"Connected to SharpEmu debug server at {host}:{port}.");
-                    Console.WriteLine("Type 'help' for commands, 'quit' to exit.");
-                }
-
-                await RunReplAsync(connection, shutdown).ConfigureAwait(false);
-            }
-
-            shutdown.Cancel();
-            try
-            {
-                await receiveTask.ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-            }
-        }
-
-        return 0;
-    }
-
-    private static async Task RunOneShotAsync(
-        DebugClientConnection connection,
-        IReadOnlyList<string> commands,
-        CancellationToken cancellationToken)
-    {
-        foreach (var command in commands)
-        {
-            var result = CommandTranslator.Translate(command);
-            switch (result.Kind)
-            {
-                case CommandTranslator.ActionKind.SendRequest:
-                    await connection.SendAsync(result.Payload!, cancellationToken).ConfigureAwait(false);
-                    break;
-                case CommandTranslator.ActionKind.Error:
-                    Console.Error.WriteLine(result.Error);
-                    break;
-                case CommandTranslator.ActionKind.ShowHelp:
-                    Console.WriteLine(CommandTranslator.HelpText);
-                    break;
-            }
-        }
-
-        // Give the server a moment to answer before the client exits.
-        try
-        {
-            await Task.Delay(TimeSpan.FromMilliseconds(500), cancellationToken).ConfigureAwait(false);
-        }
-        catch (OperationCanceledException)
-        {
-        }
-    }
-
-    private static async Task RunReplAsync(DebugClientConnection connection, CancellationTokenSource shutdown)
-    {
-        while (!shutdown.IsCancellationRequested)
-        {
-            var line = await Console.In.ReadLineAsync(shutdown.Token).ConfigureAwait(false);
-            if (line is null)
-            {
-                break;
-            }
-
-            var result = CommandTranslator.Translate(line);
-            switch (result.Kind)
-            {
-                case CommandTranslator.ActionKind.Quit:
-                    return;
-                case CommandTranslator.ActionKind.ShowHelp:
-                    Console.WriteLine(CommandTranslator.HelpText);
-                    break;
-                case CommandTranslator.ActionKind.Error:
-                    Console.Error.WriteLine(result.Error);
-                    break;
-                case CommandTranslator.ActionKind.Ignore:
-                    break;
-                case CommandTranslator.ActionKind.SendRequest:
-                    try
-                    {
-                        await connection.SendAsync(result.Payload!, shutdown.Token).ConfigureAwait(false);
-                    }
-                    catch (Exception ex) when (ex is IOException or ObjectDisposedException)
-                    {
-                        Console.Error.WriteLine("Send failed; the connection is closed.");
-                        return;
-                    }
-
-                    break;
-            }
-        }
-    }
-
-    private static void PrintUsage()
-    {
-        Console.WriteLine("SharpEmu.DebugClient — live debugger client for the SharpEmu debug server.");
-        Console.WriteLine();
-        Console.WriteLine("Usage: SharpEmu.DebugClient [host:port] [--exec \"<command>\"]... [--quiet]");
-        Console.WriteLine("  host:port   Server endpoint (default 127.0.0.1:5714).");
-        Console.WriteLine("  --exec, -e  Run a command non-interactively (repeatable), then exit.");
-        Console.WriteLine("  --quiet     Suppress the connection banner.");
-        Console.WriteLine("  --help, -h  Show this help.");
-        Console.WriteLine();
-        Console.WriteLine(CommandTranslator.HelpText);
-    }
-}

src/SharpEmu.DebugClient/SharpEmu.DebugClient.csproj

@@ -1,16 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- A small, standalone console tool: it speaks the debug server's
-         line-delimited JSON protocol directly over TCP and takes no dependency
-         on the emulator assemblies, so it builds and ships independently. -->
-    <OutputType>Exe</OutputType>
-    <AssemblyName>SharpEmu.DebugClient</AssemblyName>
-    <RootNamespace>SharpEmu.DebugClient</RootNamespace>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-  </PropertyGroup>
-</Project>

src/SharpEmu.Debugger/Breakpoints/Breakpoint.cs

@@ -1,48 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Breakpoints;
-
-/// <summary>
-/// A single breakpoint or watchpoint. Instances are immutable; the owning
-/// <see cref="BreakpointStore"/> replaces an entry to change its enabled state.
-/// </summary>
-public sealed class Breakpoint
-{
-    public Breakpoint(int id, BreakpointKind kind, ulong address, ulong length = 1, bool enabled = true)
-    {
-        if (length == 0)
-        {
-            throw new ArgumentOutOfRangeException(nameof(length), "Breakpoint length must be at least one byte.");
-        }
-
-        Id = id;
-        Kind = kind;
-        Address = address;
-        Length = length;
-        Enabled = enabled;
-    }
-
-    /// <summary>The store-assigned identifier used by clients to reference it.</summary>
-    public int Id { get; }
-
-    public BreakpointKind Kind { get; }
-
-    /// <summary>The first guest address the breakpoint covers.</summary>
-    public ulong Address { get; }
-
-    /// <summary>
-    /// The number of bytes the breakpoint covers. Always one for
-    /// <see cref="BreakpointKind.Execute"/>; the watch kinds may span a range.
-    /// </summary>
-    public ulong Length { get; }
-
-    public bool Enabled { get; }
-
-    /// <summary>True when <paramref name="address"/> falls within this breakpoint.</summary>
-    public bool Covers(ulong address) => address >= Address && address < Address + Length;
-
-    /// <summary>Returns a copy with a different enabled state.</summary>
-    public Breakpoint WithEnabled(bool enabled)
-        => enabled == Enabled ? this : new Breakpoint(Id, Kind, Address, Length, enabled);
-}

src/SharpEmu.Debugger/Breakpoints/BreakpointKind.cs

@@ -1,26 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Breakpoints;
-
-/// <summary>
-/// The kind of stop a breakpoint requests. Execution breakpoints are honoured
-/// at the frame-boundary seam that exists today; the data-watch kinds are part
-/// of the surface so client protocols and tooling can be built against them,
-/// and are armed once the execution backend can report the corresponding
-/// accesses.
-/// </summary>
-public enum BreakpointKind
-{
-    /// <summary>Stop when the instruction pointer reaches the address.</summary>
-    Execute,
-
-    /// <summary>Stop when the guest reads from the address range.</summary>
-    ReadWatch,
-
-    /// <summary>Stop when the guest writes to the address range.</summary>
-    WriteWatch,
-
-    /// <summary>Stop when the guest reads from or writes to the address range.</summary>
-    AccessWatch,
-}

src/SharpEmu.Debugger/Breakpoints/BreakpointStore.cs

@@ -1,90 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Breakpoints;
-
-/// <summary>
-/// A thread-safe registry of breakpoints. The debug server mutates it from
-/// client-servicing threads while the emulation thread queries it at frame
-/// boundaries, so every operation takes the same lock.
-/// </summary>
-public sealed class BreakpointStore
-{
-    private readonly object _sync = new();
-    private readonly Dictionary<int, Breakpoint> _breakpoints = new();
-    private int _nextId = 1;
-
-    /// <summary>Adds a breakpoint and returns the created entry with its id.</summary>
-    public Breakpoint Add(BreakpointKind kind, ulong address, ulong length = 1)
-    {
-        lock (_sync)
-        {
-            var effectiveLength = kind == BreakpointKind.Execute ? 1UL : Math.Max(1UL, length);
-            var breakpoint = new Breakpoint(_nextId++, kind, address, effectiveLength);
-            _breakpoints[breakpoint.Id] = breakpoint;
-            return breakpoint;
-        }
-    }
-
-    /// <summary>Removes a breakpoint by id. Returns false when it did not exist.</summary>
-    public bool Remove(int id)
-    {
-        lock (_sync)
-        {
-            return _breakpoints.Remove(id);
-        }
-    }
-
-    /// <summary>Enables or disables a breakpoint by id.</summary>
-    public bool SetEnabled(int id, bool enabled)
-    {
-        lock (_sync)
-        {
-            if (!_breakpoints.TryGetValue(id, out var breakpoint))
-            {
-                return false;
-            }
-
-            _breakpoints[id] = breakpoint.WithEnabled(enabled);
-            return true;
-        }
-    }
-
-    /// <summary>Removes every breakpoint.</summary>
-    public void Clear()
-    {
-        lock (_sync)
-        {
-            _breakpoints.Clear();
-        }
-    }
-
-    /// <summary>Returns a point-in-time copy of all breakpoints.</summary>
-    public IReadOnlyList<Breakpoint> Snapshot()
-    {
-        lock (_sync)
-        {
-            return _breakpoints.Values.ToArray();
-        }
-    }
-
-    /// <summary>
-    /// Finds the first enabled execution breakpoint covering <paramref name="address"/>,
-    /// or null when none applies.
-    /// </summary>
-    public Breakpoint? FindExecuteHit(ulong address)
-    {
-        lock (_sync)
-        {
-            foreach (var breakpoint in _breakpoints.Values)
-            {
-                if (breakpoint.Enabled && breakpoint.Kind == BreakpointKind.Execute && breakpoint.Covers(address))
-                {
-                    return breakpoint;
-                }
-            }
-
-            return null;
-        }
-    }
-}

src/SharpEmu.Debugger/DebugRegisterFile.cs

@@ -1,73 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.Core.Cpu.Debugging;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Debugger;
-
-/// <summary>
-/// An immutable snapshot of the guest integer register state at a stop. XMM/YMM
-/// state is intentionally omitted here and read on demand through the target to
-/// keep the common register-dump path cheap.
-/// </summary>
-public readonly struct DebugRegisterFile
-{
-    private readonly ulong[] _generalPurpose;
-
-    public DebugRegisterFile(
-        ulong[] generalPurpose,
-        ulong rip,
-        ulong rflags,
-        ulong fsBase,
-        ulong gsBase)
-    {
-        ArgumentNullException.ThrowIfNull(generalPurpose);
-        if (generalPurpose.Length != 16)
-        {
-            throw new ArgumentException("Expected 16 general-purpose registers.", nameof(generalPurpose));
-        }
-
-        _generalPurpose = generalPurpose;
-        Rip = rip;
-        Rflags = rflags;
-        FsBase = fsBase;
-        GsBase = gsBase;
-    }
-
-    public ulong Rip { get; }
-
-    public ulong Rflags { get; }
-
-    public ulong FsBase { get; }
-
-    public ulong GsBase { get; }
-
-    /// <summary>Reads a register by identifier.</summary>
-    public ulong this[DebugRegisterId id] => id switch
-    {
-        DebugRegisterId.Rip => Rip,
-        DebugRegisterId.Rflags => Rflags,
-        DebugRegisterId.FsBase => FsBase,
-        DebugRegisterId.GsBase => GsBase,
-        _ when id.IsGeneralPurpose() => _generalPurpose[(int)id],
-        _ => throw new ArgumentOutOfRangeException(nameof(id), id, null),
-    };
-
-    /// <summary>Reads a general-purpose register.</summary>
-    public ulong this[CpuRegister register] => _generalPurpose[(int)register];
-
-    /// <summary>Captures the integer register state of a live debug frame.</summary>
-    public static DebugRegisterFile Capture(ICpuDebugFrame frame)
-    {
-        ArgumentNullException.ThrowIfNull(frame);
-
-        var gpr = new ulong[16];
-        for (var i = 0; i < gpr.Length; i++)
-        {
-            gpr[i] = frame.GetRegister((CpuRegister)i);
-        }
-
-        return new DebugRegisterFile(gpr, frame.Rip, frame.Rflags, frame.FsBase, frame.GsBase);
-    }
-}

src/SharpEmu.Debugger/DebugRegisterId.cs

@@ -1,62 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.HLE;
-
-namespace SharpEmu.Debugger;
-
-/// <summary>
-/// The registers a debugger can name. The first sixteen values line up with
-/// <see cref="CpuRegister"/> so a general-purpose register can be converted
-/// between the two enums by casting; the remaining values cover the special
-/// registers a debug frame exposes.
-/// </summary>
-public enum DebugRegisterId
-{
-    Rax = 0,
-    Rcx = 1,
-    Rdx = 2,
-    Rbx = 3,
-    Rsp = 4,
-    Rbp = 5,
-    Rsi = 6,
-    Rdi = 7,
-    R8 = 8,
-    R9 = 9,
-    R10 = 10,
-    R11 = 11,
-    R12 = 12,
-    R13 = 13,
-    R14 = 14,
-    R15 = 15,
-
-    Rip = 16,
-    Rflags = 17,
-    FsBase = 18,
-    GsBase = 19,
-}
-
-/// <summary>Helpers for mapping between debug and CPU register identifiers.</summary>
-public static class DebugRegisterIdExtensions
-{
-    /// <summary>
-    /// True when the identifier names one of the sixteen general-purpose
-    /// registers and can be cast to <see cref="CpuRegister"/>.
-    /// </summary>
-    public static bool IsGeneralPurpose(this DebugRegisterId id)
-        => id is >= DebugRegisterId.Rax and <= DebugRegisterId.R15;
-
-    /// <summary>
-    /// Converts a general-purpose identifier to its <see cref="CpuRegister"/>.
-    /// Throws when <paramref name="id"/> is a special register.
-    /// </summary>
-    public static CpuRegister ToCpuRegister(this DebugRegisterId id)
-    {
-        if (!id.IsGeneralPurpose())
-        {
-            throw new ArgumentOutOfRangeException(nameof(id), id, "Not a general-purpose register.");
-        }
-
-        return (CpuRegister)(int)id;
-    }
-}

src/SharpEmu.Debugger/DebuggerServerHost.cs

@@ -1,59 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net;
-using SharpEmu.Core.Cpu.Debugging;
-using SharpEmu.Debugger.Server;
-using SharpEmu.Debugger.Session;
-
-namespace SharpEmu.Debugger;
-
-/// <summary>
-/// One-call wiring of the live debugger: it owns a <see cref="DebuggerSession"/>
-/// and a <see cref="DebuggerServer"/>, exposes the <see cref="Hook"/> to attach
-/// to <c>SharpEmuRuntimeOptions.DebugHook</c>, and starts/stops the network
-/// front-end. A host constructs one, hands <see cref="Hook"/> to the runtime,
-/// calls <see cref="Start"/>, and calls <see cref="NotifyRunCompleted"/> once the
-/// runtime returns.
-/// </summary>
-public sealed class DebuggerServerHost : IAsyncDisposable
-{
-    private readonly DebuggerSession _session;
-    private readonly DebuggerServer _server;
-
-    public DebuggerServerHost(
-        DebuggerServerOptions? serverOptions = null,
-        DebuggerSessionOptions? sessionOptions = null)
-    {
-        _session = new DebuggerSession(sessionOptions);
-        _server = new DebuggerServer(_session, serverOptions);
-    }
-
-    /// <summary>The session driving the target.</summary>
-    public IDebuggerSession Session => _session;
-
-    /// <summary>
-    /// The dispatcher hook to hand to the runtime so guest frames route through
-    /// the debugger.
-    /// </summary>
-    public ICpuDebugHook Hook => _session.Hook;
-
-    /// <summary>The endpoint the server bound to, or null before <see cref="Start"/>.</summary>
-    public IPEndPoint? Endpoint => _server.Endpoint;
-
-    /// <summary>Begins accepting debugger clients.</summary>
-    public void Start() => _server.Start();
-
-    /// <summary>
-    /// Releases a parked emulation thread and marks the target terminated. Call
-    /// after the runtime's run returns so any attached client is notified and the
-    /// guest thread is never left blocked in the debugger.
-    /// </summary>
-    public void NotifyRunCompleted() => _session.NotifyTerminated();
-
-    public async ValueTask DisposeAsync()
-    {
-        _session.NotifyTerminated();
-        await _server.DisposeAsync().ConfigureAwait(false);
-    }
-}

src/SharpEmu.Debugger/Protocol/DebugCommandDispatcher.cs

@@ -1,340 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.Debugger.Breakpoints;
-using SharpEmu.Debugger.Session;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Debugger.Protocol;
-
-/// <summary>
-/// Translates parsed <see cref="DebugRequest"/> verbs into operations on an
-/// <see cref="IDebuggerSession"/> and packages the outcome as a
-/// <see cref="DebugResponse"/>. This is the single place command semantics live,
-/// so it is shared by every connection and independent of the wire format.
-/// </summary>
-public sealed class DebugCommandDispatcher
-{
-    private readonly IDebuggerSession _session;
-
-    public DebugCommandDispatcher(IDebuggerSession session)
-    {
-        _session = session ?? throw new ArgumentNullException(nameof(session));
-    }
-
-    public DebugResponse Dispatch(DebugRequest request)
-    {
-        return request.Command switch
-        {
-            JsonLineDebugProtocol.ParseErrorCommand => ParseError(request),
-            "ping" => DebugResponse.Success(request.Command),
-            "status" or "info" => Status(request),
-            "state" => DebugResponse.Success(request.Command, new Dictionary<string, object?>
-            {
-                ["state"] = _session.State.ToString(),
-            }),
-            "registers" or "regs" => Registers(request),
-            "set-register" or "set-reg" => SetRegister(request),
-            "read-memory" or "read-mem" => ReadMemory(request),
-            "write-memory" or "write-mem" => WriteMemory(request),
-            "list-breakpoints" or "breakpoints" => ListBreakpoints(request),
-            "add-breakpoint" or "break" => AddBreakpoint(request),
-            "remove-breakpoint" or "delete-breakpoint" => RemoveBreakpoint(request),
-            "enable-breakpoint" => EnableBreakpoint(request),
-            "continue" or "cont" or "c" => Simple(request, _session.Continue(), "Target is not paused."),
-            "step" or "s" => Simple(request, _session.StepFrame(), "Target is not paused."),
-            "pause" => Pause(request),
-            _ => DebugResponse.Failure(request.Command, $"Unknown command '{request.Command}'."),
-        };
-    }
-
-    private static DebugResponse ParseError(DebugRequest request)
-    {
-        var message = request.TryGetString("message", out var text) ? text : "Malformed request.";
-        return DebugResponse.Failure(request.Command, message);
-    }
-
-    private DebugResponse Status(DebugRequest request)
-    {
-        var data = new Dictionary<string, object?>
-        {
-            ["state"] = _session.State.ToString(),
-            ["breakpoints"] = _session.Breakpoints.Snapshot().Count,
-        };
-
-        if (_session.LastStop is { } stop)
-        {
-            data["lastStop"] = DescribeStop(stop);
-        }
-
-        return DebugResponse.Success(request.Command, data);
-    }
-
-    private DebugResponse Registers(DebugRequest request)
-    {
-        if (!_session.TryGetRegisters(out var registers))
-        {
-            return NotPaused(request);
-        }
-
-        return DebugResponse.Success(request.Command, new Dictionary<string, object?>
-        {
-            ["registers"] = DescribeRegisters(registers),
-        });
-    }
-
-    private DebugResponse SetRegister(DebugRequest request)
-    {
-        if (!request.TryGetString("register", out var name) || !TryParseRegister(name, out var id))
-        {
-            return DebugResponse.Failure(request.Command, "Expected a valid 'register' name.");
-        }
-
-        if (!request.TryGetUInt64("value", out var value))
-        {
-            return DebugResponse.Failure(request.Command, "Expected a 'value'.");
-        }
-
-        return _session.TrySetRegister(id, value)
-            ? DebugResponse.Success(request.Command)
-            : DebugResponse.Failure(request.Command, "Register is not writable or target is not paused.");
-    }
-
-    private DebugResponse ReadMemory(DebugRequest request)
-    {
-        if (!request.TryGetUInt64("address", out var address))
-        {
-            return DebugResponse.Failure(request.Command, "Expected an 'address'.");
-        }
-
-        if (!request.TryGetInt32("length", out var length) || length <= 0 || length > MaxMemoryChunk)
-        {
-            return DebugResponse.Failure(request.Command, $"Expected a 'length' between 1 and {MaxMemoryChunk}.");
-        }
-
-        var buffer = new byte[length];
-        if (!_session.TryReadMemory(address, buffer))
-        {
-            return DebugResponse.Failure(request.Command, "Memory is unreadable or target is not paused.");
-        }
-
-        return DebugResponse.Success(request.Command, new Dictionary<string, object?>
-        {
-            ["address"] = FormatAddress(address),
-            ["length"] = length,
-            ["bytes"] = Convert.ToHexString(buffer),
-        });
-    }
-
-    private DebugResponse WriteMemory(DebugRequest request)
-    {
-        if (!request.TryGetUInt64("address", out var address))
-        {
-            return DebugResponse.Failure(request.Command, "Expected an 'address'.");
-        }
-
-        if (!request.TryGetString("bytes", out var hex) || hex.Length == 0 || (hex.Length & 1) != 0)
-        {
-            return DebugResponse.Failure(request.Command, "Expected 'bytes' as an even-length hex string.");
-        }
-
-        byte[] data;
-        try
-        {
-            data = Convert.FromHexString(hex);
-        }
-        catch (FormatException)
-        {
-            return DebugResponse.Failure(request.Command, "'bytes' is not valid hex.");
-        }
-
-        if (data.Length > MaxMemoryChunk)
-        {
-            return DebugResponse.Failure(request.Command, $"Cannot write more than {MaxMemoryChunk} bytes at once.");
-        }
-
-        return _session.TryWriteMemory(address, data)
-            ? DebugResponse.Success(request.Command, new Dictionary<string, object?> { ["written"] = data.Length })
-            : DebugResponse.Failure(request.Command, "Memory is unwritable or target is not paused.");
-    }
-
-    private DebugResponse ListBreakpoints(DebugRequest request)
-    {
-        var breakpoints = _session.Breakpoints.Snapshot()
-            .OrderBy(breakpoint => breakpoint.Id)
-            .Select(DescribeBreakpoint)
-            .ToArray();
-
-        return DebugResponse.Success(request.Command, new Dictionary<string, object?>
-        {
-            ["breakpoints"] = breakpoints,
-        });
-    }
-
-    private DebugResponse AddBreakpoint(DebugRequest request)
-    {
-        if (!request.TryGetUInt64("address", out var address))
-        {
-            return DebugResponse.Failure(request.Command, "Expected an 'address'.");
-        }
-
-        var kind = BreakpointKind.Execute;
-        if (request.TryGetString("kind", out var kindText) && !TryParseBreakpointKind(kindText, out kind))
-        {
-            return DebugResponse.Failure(request.Command, $"Unknown breakpoint kind '{kindText}'.");
-        }
-
-        var length = 1UL;
-        if (request.TryGetUInt64("length", out var requestedLength) && requestedLength > 0)
-        {
-            length = requestedLength;
-        }
-
-        var breakpoint = _session.Breakpoints.Add(kind, address, length);
-        return DebugResponse.Success(request.Command, new Dictionary<string, object?>
-        {
-            ["breakpoint"] = DescribeBreakpoint(breakpoint),
-        });
-    }
-
-    private DebugResponse RemoveBreakpoint(DebugRequest request)
-    {
-        if (!request.TryGetInt32("id", out var id))
-        {
-            return DebugResponse.Failure(request.Command, "Expected an 'id'.");
-        }
-
-        return _session.Breakpoints.Remove(id)
-            ? DebugResponse.Success(request.Command)
-            : DebugResponse.Failure(request.Command, $"No breakpoint with id {id}.");
-    }
-
-    private DebugResponse EnableBreakpoint(DebugRequest request)
-    {
-        if (!request.TryGetInt32("id", out var id))
-        {
-            return DebugResponse.Failure(request.Command, "Expected an 'id'.");
-        }
-
-        var enabled = !request.TryGetBool("enabled", out var requested) || requested;
-        return _session.Breakpoints.SetEnabled(id, enabled)
-            ? DebugResponse.Success(request.Command)
-            : DebugResponse.Failure(request.Command, $"No breakpoint with id {id}.");
-    }
-
-    private DebugResponse Pause(DebugRequest request)
-    {
-        _session.RequestPause();
-        return DebugResponse.Success(request.Command);
-    }
-
-    private static DebugResponse Simple(DebugRequest request, bool succeeded, string failureMessage)
-        => succeeded ? DebugResponse.Success(request.Command) : DebugResponse.Failure(request.Command, failureMessage);
-
-    private static DebugResponse NotPaused(DebugRequest request)
-        => DebugResponse.Failure(request.Command, "Target is not paused.");
-
-    internal static IReadOnlyDictionary<string, object?> DescribeStop(DebugStopEvent stop)
-    {
-        var data = new Dictionary<string, object?>
-        {
-            ["reason"] = stop.Reason.ToString(),
-            ["address"] = FormatAddress(stop.Address),
-            ["frameKind"] = stop.FrameKind.ToString(),
-            ["frameLabel"] = stop.FrameLabel,
-            ["registers"] = DescribeRegisters(stop.Registers),
-        };
-
-        if (stop.Breakpoint is { } breakpoint)
-        {
-            data["breakpoint"] = DescribeBreakpoint(breakpoint);
-        }
-
-        if (stop.Result is { } result)
-        {
-            data["result"] = result.ToString();
-        }
-
-        if (stop.Detail is { } detail)
-        {
-            data["detail"] = detail;
-        }
-
-        if (stop.OpcodeBytes is { } opcodeBytes)
-        {
-            data["opcodeBytes"] = opcodeBytes;
-        }
-
-        if (stop.StallInfo is { } stall)
-        {
-            data["stall"] = new Dictionary<string, object?>
-            {
-                ["kind"] = stall.Kind.ToString(),
-                ["nid"] = stall.Nid,
-                ["instructionPointer"] = FormatAddress(stall.InstructionPointer),
-                ["dispatchIndex"] = stall.DispatchIndex,
-                ["argument0"] = FormatAddress(stall.Argument0),
-                ["argument1"] = FormatAddress(stall.Argument1),
-                ["resolved"] = stall.IsResolved,
-                ["library"] = stall.LibraryName,
-                ["function"] = stall.FunctionName,
-            };
-        }
-
-        return data;
-    }
-
-    private static IReadOnlyDictionary<string, object?> DescribeRegisters(DebugRegisterFile registers)
-    {
-        var result = new Dictionary<string, object?>(20);
-        for (var i = 0; i < 16; i++)
-        {
-            result[((CpuRegister)i).ToString().ToLowerInvariant()] = FormatAddress(registers[(CpuRegister)i]);
-        }
-
-        result["rip"] = FormatAddress(registers.Rip);
-        result["rflags"] = FormatAddress(registers.Rflags);
-        result["fs_base"] = FormatAddress(registers.FsBase);
-        result["gs_base"] = FormatAddress(registers.GsBase);
-        return result;
-    }
-
-    private static IReadOnlyDictionary<string, object?> DescribeBreakpoint(Breakpoint breakpoint)
-        => new Dictionary<string, object?>
-        {
-            ["id"] = breakpoint.Id,
-            ["kind"] = breakpoint.Kind.ToString(),
-            ["address"] = FormatAddress(breakpoint.Address),
-            ["length"] = breakpoint.Length,
-            ["enabled"] = breakpoint.Enabled,
-        };
-
-    private static string FormatAddress(ulong value) => $"0x{value:X16}";
-
-    private static bool TryParseRegister(string name, out DebugRegisterId id)
-    {
-        var normalized = name.Trim().ToLowerInvariant();
-        switch (normalized)
-        {
-            case "rip":
-                id = DebugRegisterId.Rip;
-                return true;
-            case "rflags":
-                id = DebugRegisterId.Rflags;
-                return true;
-            case "fs_base" or "fsbase":
-                id = DebugRegisterId.FsBase;
-                return true;
-            case "gs_base" or "gsbase":
-                id = DebugRegisterId.GsBase;
-                return true;
-        }
-
-        return Enum.TryParse(normalized, ignoreCase: true, out id) && Enum.IsDefined(id);
-    }
-
-    private static bool TryParseBreakpointKind(string text, out BreakpointKind kind)
-        => Enum.TryParse(text.Trim(), ignoreCase: true, out kind) && Enum.IsDefined(kind);
-
-    private const int MaxMemoryChunk = 64 * 1024;
-}

src/SharpEmu.Debugger/Protocol/DebugRequest.cs

@@ -1,152 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Globalization;
-using System.Text.Json;
-
-namespace SharpEmu.Debugger.Protocol;
-
-/// <summary>
-/// A parsed client request: a <see cref="Command"/> verb plus a bag of named
-/// arguments backed by the original JSON. Numeric arguments accept either JSON
-/// numbers or <c>"0x"</c>-prefixed hex strings so addresses read naturally on
-/// the wire.
-/// </summary>
-public sealed class DebugRequest
-{
-    private readonly JsonElement _root;
-
-    private DebugRequest(string command, JsonElement root)
-    {
-        Command = command;
-        _root = root;
-    }
-
-    /// <summary>The lower-cased command verb.</summary>
-    public string Command { get; }
-
-    /// <summary>
-    /// Parses a single JSON object into a request. Returns false when the text is
-    /// not a JSON object or is missing a string <c>command</c> field.
-    /// </summary>
-    public static bool TryParse(string json, out DebugRequest request, out string error)
-    {
-        request = null!;
-        error = string.Empty;
-        try
-        {
-            using var document = JsonDocument.Parse(json);
-            var root = document.RootElement.Clone();
-            if (root.ValueKind != JsonValueKind.Object)
-            {
-                error = "Request must be a JSON object.";
-                return false;
-            }
-
-            if (!root.TryGetProperty("command", out var commandElement) ||
-                commandElement.ValueKind != JsonValueKind.String)
-            {
-                error = "Request is missing a string 'command'.";
-                return false;
-            }
-
-            var command = commandElement.GetString() ?? string.Empty;
-            request = new DebugRequest(command.Trim().ToLowerInvariant(), root);
-            return true;
-        }
-        catch (JsonException ex)
-        {
-            error = $"Malformed JSON: {ex.Message}";
-            return false;
-        }
-    }
-
-    public bool TryGetString(string name, out string value)
-    {
-        if (_root.TryGetProperty(name, out var element) && element.ValueKind == JsonValueKind.String)
-        {
-            value = element.GetString() ?? string.Empty;
-            return true;
-        }
-
-        value = string.Empty;
-        return false;
-    }
-
-    public bool TryGetUInt64(string name, out ulong value)
-    {
-        value = 0;
-        if (!_root.TryGetProperty(name, out var element))
-        {
-            return false;
-        }
-
-        switch (element.ValueKind)
-        {
-            case JsonValueKind.Number:
-                return element.TryGetUInt64(out value);
-            case JsonValueKind.String:
-                return TryParseNumber(element.GetString(), out value);
-            default:
-                return false;
-        }
-    }
-
-    public bool TryGetInt32(string name, out int value)
-    {
-        value = 0;
-        if (!_root.TryGetProperty(name, out var element))
-        {
-            return false;
-        }
-
-        switch (element.ValueKind)
-        {
-            case JsonValueKind.Number:
-                return element.TryGetInt32(out value);
-            case JsonValueKind.String when TryParseNumber(element.GetString(), out var parsed) && parsed <= int.MaxValue:
-                value = (int)parsed;
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    public bool TryGetBool(string name, out bool value)
-    {
-        value = false;
-        if (!_root.TryGetProperty(name, out var element))
-        {
-            return false;
-        }
-
-        switch (element.ValueKind)
-        {
-            case JsonValueKind.True:
-                value = true;
-                return true;
-            case JsonValueKind.False:
-                value = false;
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private static bool TryParseNumber(string? text, out ulong value)
-    {
-        value = 0;
-        if (string.IsNullOrWhiteSpace(text))
-        {
-            return false;
-        }
-
-        text = text.Trim();
-        if (text.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
-        {
-            return ulong.TryParse(text.AsSpan(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out value);
-        }
-
-        return ulong.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out value);
-    }
-}

src/SharpEmu.Debugger/Protocol/DebugResponse.cs

@@ -1,34 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Protocol;
-
-/// <summary>
-/// The reply to a <see cref="DebugRequest"/>: either success with an optional
-/// data payload, or a failure with a human-readable message.
-/// </summary>
-public sealed class DebugResponse
-{
-    private DebugResponse(bool ok, string? command, IReadOnlyDictionary<string, object?>? data, string? error)
-    {
-        Ok = ok;
-        Command = command;
-        Data = data;
-        Error = error;
-    }
-
-    public bool Ok { get; }
-
-    /// <summary>Echoes the command the reply answers, when known.</summary>
-    public string? Command { get; }
-
-    public IReadOnlyDictionary<string, object?>? Data { get; }
-
-    public string? Error { get; }
-
-    public static DebugResponse Success(string command, IReadOnlyDictionary<string, object?>? data = null)
-        => new(ok: true, command, data, error: null);
-
-    public static DebugResponse Failure(string command, string error)
-        => new(ok: false, command, data: null, error);
-}

src/SharpEmu.Debugger/Protocol/IDebugProtocol.cs

@@ -1,33 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Protocol;
-
-/// <summary>
-/// Frames debugger traffic on a connection. A protocol turns bytes into
-/// <see cref="DebugRequest"/> objects and serialises <see cref="DebugResponse"/>
-/// replies plus asynchronous events (stops, resumes, termination) back to the
-/// client. Swapping the implementation (line-delimited JSON today, a GDB remote
-/// serial stub later) leaves the session and server untouched.
-/// </summary>
-public interface IDebugProtocol
-{
-    /// <summary>A short protocol name reported in the handshake.</summary>
-    string Name { get; }
-
-    /// <summary>
-    /// Reads the next request, or null at end of stream. Parse failures are
-    /// surfaced as a request with a reserved error command rather than throwing.
-    /// </summary>
-    Task<DebugRequest?> ReadRequestAsync(TextReader reader, CancellationToken cancellationToken);
-
-    /// <summary>Writes a reply to a request.</summary>
-    Task WriteResponseAsync(TextWriter writer, DebugResponse response, CancellationToken cancellationToken);
-
-    /// <summary>Writes an unsolicited event (for example a stop notification).</summary>
-    Task WriteEventAsync(
-        TextWriter writer,
-        string eventName,
-        IReadOnlyDictionary<string, object?> data,
-        CancellationToken cancellationToken);
-}

src/SharpEmu.Debugger/Protocol/JsonLineDebugProtocol.cs

@@ -1,112 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Text.Json;
-
-namespace SharpEmu.Debugger.Protocol;
-
-/// <summary>
-/// A newline-delimited JSON protocol: one JSON object per line in each
-/// direction. Requests carry a <c>command</c>; replies carry <c>ok</c> plus
-/// <c>data</c>/<c>error</c>; events carry an <c>event</c> name. It is trivial to
-/// drive from a socket, <c>nc</c>, or a small script, which suits bring-up and
-/// tooling while a richer protocol is layered on later.
-/// </summary>
-public sealed class JsonLineDebugProtocol : IDebugProtocol
-{
-    /// <summary>The command assigned to a request that failed to parse.</summary>
-    public const string ParseErrorCommand = "$parse-error";
-
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = false,
-    };
-
-    public string Name => "json-lines/1";
-
-    public async Task<DebugRequest?> ReadRequestAsync(TextReader reader, CancellationToken cancellationToken)
-    {
-        while (true)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            var line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false);
-            if (line is null)
-            {
-                return null;
-            }
-
-            if (string.IsNullOrWhiteSpace(line))
-            {
-                continue;
-            }
-
-            if (DebugRequest.TryParse(line, out var request, out var error))
-            {
-                return request;
-            }
-
-            // Surface the parse failure as a synthetic request so the connection
-            // loop can reply with an error rather than dropping the client.
-            var envelope = $"{{\"command\":\"{ParseErrorCommand}\",\"message\":{JsonSerializer.Serialize(error)}}}";
-            if (DebugRequest.TryParse(envelope, out var errorRequest, out _))
-            {
-                return errorRequest;
-            }
-        }
-    }
-
-    public async Task WriteResponseAsync(TextWriter writer, DebugResponse response, CancellationToken cancellationToken)
-    {
-        var payload = new Dictionary<string, object?>
-        {
-            ["ok"] = response.Ok,
-        };
-
-        if (response.Command is not null)
-        {
-            payload["command"] = response.Command;
-        }
-
-        if (response.Data is not null)
-        {
-            payload["data"] = response.Data;
-        }
-
-        if (response.Error is not null)
-        {
-            payload["error"] = response.Error;
-        }
-
-        await WriteLineAsync(writer, payload, cancellationToken).ConfigureAwait(false);
-    }
-
-    public async Task WriteEventAsync(
-        TextWriter writer,
-        string eventName,
-        IReadOnlyDictionary<string, object?> data,
-        CancellationToken cancellationToken)
-    {
-        var payload = new Dictionary<string, object?>(data.Count + 1)
-        {
-            ["event"] = eventName,
-        };
-
-        foreach (var (key, value) in data)
-        {
-            payload[key] = value;
-        }
-
-        await WriteLineAsync(writer, payload, cancellationToken).ConfigureAwait(false);
-    }
-
-    private static async Task WriteLineAsync(
-        TextWriter writer,
-        IReadOnlyDictionary<string, object?> payload,
-        CancellationToken cancellationToken)
-    {
-        cancellationToken.ThrowIfCancellationRequested();
-        var json = JsonSerializer.Serialize(payload, SerializerOptions);
-        await writer.WriteLineAsync(json.AsMemory(), cancellationToken).ConfigureAwait(false);
-        await writer.FlushAsync(cancellationToken).ConfigureAwait(false);
-    }
-}

src/SharpEmu.Debugger/Server/DebuggerClientConnection.cs

@@ -1,158 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net.Sockets;
-using System.Text;
-using SharpEmu.Debugger.Protocol;
-using SharpEmu.Debugger.Session;
-using SharpEmu.Logging;
-
-namespace SharpEmu.Debugger.Server;
-
-/// <summary>
-/// Services a single connected client: reads requests, dispatches them against
-/// the shared session, and pushes session lifecycle events. Writes from the
-/// request loop and from event callbacks are serialised through one lock so the
-/// two never interleave a half-written line.
-/// </summary>
-internal sealed class DebuggerClientConnection : IAsyncDisposable
-{
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("SharpEmu.Debugger");
-    private static readonly UTF8Encoding Utf8NoBom = new(encoderShouldEmitUTF8Identifier: false);
-
-    private readonly TcpClient _client;
-    private readonly IDebuggerSession _session;
-    private readonly IDebugProtocol _protocol;
-    private readonly DebugCommandDispatcher _dispatcher;
-    private readonly SemaphoreSlim _writeLock = new(1, 1);
-
-    private TextWriter? _writer;
-    private CancellationToken _cancellationToken;
-
-    public DebuggerClientConnection(TcpClient client, IDebuggerSession session, IDebugProtocol protocol)
-    {
-        _client = client;
-        _session = session;
-        _protocol = protocol;
-        _dispatcher = new DebugCommandDispatcher(session);
-    }
-
-    public async Task RunAsync(CancellationToken cancellationToken)
-    {
-        _cancellationToken = cancellationToken;
-        var endpoint = _client.Client.RemoteEndPoint?.ToString() ?? "unknown";
-        Log.Info($"Debugger client connected: {endpoint}");
-
-        using var stream = _client.GetStream();
-        using var reader = new StreamReader(stream, Utf8NoBom);
-        await using var writer = new StreamWriter(stream, Utf8NoBom) { AutoFlush = false };
-        _writer = writer;
-
-        _session.Stopped += OnStopped;
-        _session.Resumed += OnResumed;
-        _session.Terminated += OnTerminated;
-        try
-        {
-            await SendEventAsync("hello", new Dictionary<string, object?>
-            {
-                ["protocol"] = _protocol.Name,
-                ["state"] = _session.State.ToString(),
-            }).ConfigureAwait(false);
-
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                var request = await _protocol.ReadRequestAsync(reader, cancellationToken).ConfigureAwait(false);
-                if (request is null)
-                {
-                    break;
-                }
-
-                var response = _dispatcher.Dispatch(request);
-                await WriteResponseAsync(response).ConfigureAwait(false);
-            }
-        }
-        catch (OperationCanceledException)
-        {
-            // Server shutting down.
-        }
-        catch (IOException)
-        {
-            // Client dropped the connection.
-        }
-        catch (Exception ex)
-        {
-            Log.Warn($"Debugger client error ({endpoint}): {ex.Message}");
-        }
-        finally
-        {
-            _session.Stopped -= OnStopped;
-            _session.Resumed -= OnResumed;
-            _session.Terminated -= OnTerminated;
-            _writer = null;
-            Log.Info($"Debugger client disconnected: {endpoint}");
-        }
-    }
-
-    private void OnStopped(object? sender, DebugStopEvent stop)
-        => _ = SendEventAsync("stopped", DebugCommandDispatcher.DescribeStop(stop));
-
-    private void OnResumed(object? sender, EventArgs e)
-        => _ = SendEventAsync("resumed", EmptyData);
-
-    private void OnTerminated(object? sender, EventArgs e)
-        => _ = SendEventAsync("terminated", EmptyData);
-
-    private async Task WriteResponseAsync(DebugResponse response)
-    {
-        var writer = _writer;
-        if (writer is null)
-        {
-            return;
-        }
-
-        await _writeLock.WaitAsync(_cancellationToken).ConfigureAwait(false);
-        try
-        {
-            await _protocol.WriteResponseAsync(writer, response, _cancellationToken).ConfigureAwait(false);
-        }
-        finally
-        {
-            _writeLock.Release();
-        }
-    }
-
-    private async Task SendEventAsync(string name, IReadOnlyDictionary<string, object?> data)
-    {
-        var writer = _writer;
-        if (writer is null)
-        {
-            return;
-        }
-
-        try
-        {
-            await _writeLock.WaitAsync(_cancellationToken).ConfigureAwait(false);
-            try
-            {
-                await _protocol.WriteEventAsync(writer, name, data, _cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                _writeLock.Release();
-            }
-        }
-        catch (Exception ex) when (ex is IOException or OperationCanceledException or ObjectDisposedException)
-        {
-            // The client went away between the event firing and the write.
-        }
-    }
-
-    public ValueTask DisposeAsync()
-    {
-        _writeLock.Dispose();
-        _client.Dispose();
-        return ValueTask.CompletedTask;
-    }
-
-    private static readonly IReadOnlyDictionary<string, object?> EmptyData = new Dictionary<string, object?>();
-}

src/SharpEmu.Debugger/Server/DebuggerServer.cs

@@ -1,136 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Collections.Concurrent;
-using System.Net;
-using System.Net.Sockets;
-using SharpEmu.Debugger.Protocol;
-using SharpEmu.Debugger.Session;
-using SharpEmu.Logging;
-
-namespace SharpEmu.Debugger.Server;
-
-/// <summary>
-/// A TCP server that exposes an <see cref="IDebuggerSession"/> to remote
-/// clients over a pluggable <see cref="IDebugProtocol"/>. Every connection sees
-/// the same session, so multiple clients (for example a UI and a scripted
-/// probe) observe a consistent view of the target.
-/// </summary>
-public sealed class DebuggerServer : IDebuggerServer
-{
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("SharpEmu.Debugger");
-
-    private readonly IDebuggerSession _session;
-    private readonly DebuggerServerOptions _options;
-    private readonly Func<IDebugProtocol> _protocolFactory;
-    private readonly ConcurrentDictionary<DebuggerClientConnection, Task> _connections = new();
-    private readonly CancellationTokenSource _shutdown = new();
-
-    private TcpListener? _listener;
-    private Task? _acceptLoop;
-
-    public DebuggerServer(
-        IDebuggerSession session,
-        DebuggerServerOptions? options = null,
-        Func<IDebugProtocol>? protocolFactory = null)
-    {
-        _session = session ?? throw new ArgumentNullException(nameof(session));
-        _options = options ?? new DebuggerServerOptions();
-        _protocolFactory = protocolFactory ?? (static () => new JsonLineDebugProtocol());
-    }
-
-    public bool IsListening => _listener is not null;
-
-    public IPEndPoint? Endpoint { get; private set; }
-
-    public void Start()
-    {
-        if (_listener is not null)
-        {
-            return;
-        }
-
-        var listener = new TcpListener(_options.BindAddress, _options.Port);
-        listener.Start(_options.MaxClients);
-        _listener = listener;
-        Endpoint = (IPEndPoint?)listener.LocalEndpoint;
-        Log.Info($"Debug server listening on {Endpoint} (protocol {_protocolFactory().Name})");
-        _acceptLoop = Task.Run(() => AcceptLoopAsync(listener, _shutdown.Token));
-    }
-
-    private async Task AcceptLoopAsync(TcpListener listener, CancellationToken cancellationToken)
-    {
-        while (!cancellationToken.IsCancellationRequested)
-        {
-            TcpClient client;
-            try
-            {
-                client = await listener.AcceptTcpClientAsync(cancellationToken).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-                break;
-            }
-            catch (SocketException) when (cancellationToken.IsCancellationRequested)
-            {
-                break;
-            }
-            catch (ObjectDisposedException)
-            {
-                break;
-            }
-
-            var connection = new DebuggerClientConnection(client, _session, _protocolFactory());
-            var task = Task.Run(() => ServeAsync(connection, cancellationToken), cancellationToken);
-            _connections[connection] = task;
-        }
-    }
-
-    private async Task ServeAsync(DebuggerClientConnection connection, CancellationToken cancellationToken)
-    {
-        try
-        {
-            await connection.RunAsync(cancellationToken).ConfigureAwait(false);
-        }
-        finally
-        {
-            _connections.TryRemove(connection, out _);
-            await connection.DisposeAsync().ConfigureAwait(false);
-        }
-    }
-
-    public async Task StopAsync()
-    {
-        if (_listener is null)
-        {
-            return;
-        }
-
-        await _shutdown.CancelAsync().ConfigureAwait(false);
-        _listener.Stop();
-        _listener = null;
-
-        try
-        {
-            if (_acceptLoop is not null)
-            {
-                await _acceptLoop.ConfigureAwait(false);
-            }
-
-            await Task.WhenAll(_connections.Values).ConfigureAwait(false);
-        }
-        catch (Exception ex) when (ex is OperationCanceledException or SocketException or ObjectDisposedException)
-        {
-            // Expected while tearing connections down.
-        }
-
-        _connections.Clear();
-        Log.Info("Debug server stopped.");
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        await StopAsync().ConfigureAwait(false);
-        _shutdown.Dispose();
-    }
-}

src/SharpEmu.Debugger/Server/DebuggerServerOptions.cs

@@ -1,78 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net;
-
-namespace SharpEmu.Debugger.Server;
-
-/// <summary>Network configuration for a <see cref="DebuggerServer"/>.</summary>
-public sealed class DebuggerServerOptions
-{
-    /// <summary>The default TCP port the debug server listens on.</summary>
-    public const int DefaultPort = 5714;
-
-    /// <summary>
-    /// The address to bind. Defaults to loopback so the debug surface is not
-    /// exposed off-box; a caller must opt in to a routable address explicitly.
-    /// </summary>
-    public IPAddress BindAddress { get; init; } = IPAddress.Loopback;
-
-    /// <summary>The TCP port to listen on.</summary>
-    public int Port { get; init; } = DefaultPort;
-
-    /// <summary>
-    /// The maximum number of simultaneous client connections. Additional
-    /// connections wait in the accept backlog.
-    /// </summary>
-    public int MaxClients { get; init; } = 4;
-
-    /// <summary>
-    /// Parses a <c>host:port</c>, bare <c>port</c>, or bare host into options.
-    /// Returns false when the text cannot be interpreted.
-    /// </summary>
-    public static bool TryParseEndpoint(string? text, out DebuggerServerOptions options, out string error)
-    {
-        options = new DebuggerServerOptions();
-        error = string.Empty;
-        if (string.IsNullOrWhiteSpace(text))
-        {
-            return true;
-        }
-
-        var value = text.Trim();
-        var host = value;
-        var port = DefaultPort;
-
-        var separator = value.LastIndexOf(':');
-        if (separator >= 0)
-        {
-            var portText = value[(separator + 1)..];
-            if (portText.Length > 0)
-            {
-                if (!int.TryParse(portText, out port) || port is <= 0 or > 65535)
-                {
-                    error = $"Invalid port '{portText}'.";
-                    return false;
-                }
-            }
-
-            host = value[..separator];
-        }
-
-        var address = IPAddress.Loopback;
-        if (!string.IsNullOrWhiteSpace(host) &&
-            !string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase) &&
-            !IPAddress.TryParse(host, out address!))
-        {
-            error = $"Invalid bind address '{host}'.";
-            return false;
-        }
-
-        options = new DebuggerServerOptions
-        {
-            BindAddress = address ?? IPAddress.Loopback,
-            Port = port,
-        };
-        return true;
-    }
-}

src/SharpEmu.Debugger/Server/IDebuggerServer.cs

@@ -1,24 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using System.Net;
-
-namespace SharpEmu.Debugger.Server;
-
-/// <summary>
-/// A network front-end that exposes a debugger session to remote clients.
-/// </summary>
-public interface IDebuggerServer : IAsyncDisposable
-{
-    /// <summary>True once the listener is accepting connections.</summary>
-    bool IsListening { get; }
-
-    /// <summary>The endpoint the server is bound to, or null before start.</summary>
-    IPEndPoint? Endpoint { get; }
-
-    /// <summary>Binds and begins accepting client connections.</summary>
-    void Start();
-
-    /// <summary>Stops accepting connections and closes active clients.</summary>
-    Task StopAsync();
-}

src/SharpEmu.Debugger/Session/DebugStopEvent.cs

@@ -1,69 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.Core.Cpu.Debugging;
-using SharpEmu.Debugger.Breakpoints;
-using SharpEmu.HLE;
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>
-/// Describes a stop delivered to debugger clients: why the target stopped,
-/// where, and the register snapshot at that point.
-/// </summary>
-public sealed class DebugStopEvent
-{
-    public DebugStopEvent(
-        DebugStopReason reason,
-        DebugRegisterFile registers,
-        CpuDebugFrameKind frameKind,
-        string frameLabel,
-        Breakpoint? breakpoint = null,
-        OrbisGen2Result? result = null,
-        string? detail = null,
-        string? opcodeBytes = null,
-        CpuStallInfo? stallInfo = null)
-    {
-        Reason = reason;
-        Registers = registers;
-        FrameKind = frameKind;
-        FrameLabel = frameLabel ?? string.Empty;
-        Breakpoint = breakpoint;
-        Result = result;
-        Detail = detail;
-        OpcodeBytes = opcodeBytes;
-        StallInfo = stallInfo;
-    }
-
-    public DebugStopReason Reason { get; }
-
-    /// <summary>The instruction pointer where the target stopped.</summary>
-    public ulong Address => Registers.Rip;
-
-    public DebugRegisterFile Registers { get; }
-
-    public CpuDebugFrameKind FrameKind { get; }
-
-    public string FrameLabel { get; }
-
-    /// <summary>The breakpoint responsible for the stop, when applicable.</summary>
-    public Breakpoint? Breakpoint { get; }
-
-    /// <summary>
-    /// The frame result for a <see cref="DebugStopReason.Fault"/> stop; null for
-    /// non-fault stops.
-    /// </summary>
-    public OrbisGen2Result? Result { get; }
-
-    /// <summary>A human-readable summary of a fault, when applicable.</summary>
-    public string? Detail { get; }
-
-    /// <summary>
-    /// A hex preview of the bytes at <see cref="Address"/> (the faulting
-    /// instruction), when the stop is a fault and the bytes were readable.
-    /// </summary>
-    public string? OpcodeBytes { get; }
-
-    /// <summary>Structured backend evidence for a stall stop.</summary>
-    public CpuStallInfo? StallInfo { get; }
-}

src/SharpEmu.Debugger/Session/DebugStopReason.cs

@@ -1,32 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>Why the target stopped and handed control to the debugger.</summary>
-public enum DebugStopReason
-{
-    /// <summary>Stopped at the configured entry point before running any frame.</summary>
-    EntryPoint,
-
-    /// <summary>An execution breakpoint was hit.</summary>
-    Breakpoint,
-
-    /// <summary>A data watchpoint was hit.</summary>
-    Watchpoint,
-
-    /// <summary>A single-step (frame step) request completed.</summary>
-    Step,
-
-    /// <summary>A client-requested pause took effect.</summary>
-    Pause,
-
-    /// <summary>The guest raised a fault or trap.</summary>
-    Fault,
-
-    /// <summary>
-    /// The backend detected an execution stall (for example a mutex spin loop /
-    /// livelock) with no forward progress.
-    /// </summary>
-    Stall,
-}

src/SharpEmu.Debugger/Session/DebuggerRunState.cs

@@ -1,23 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>The execution state of a debugged target as seen by the debugger.</summary>
-public enum DebuggerRunState
-{
-    /// <summary>No guest frame has entered the debugger yet.</summary>
-    Detached,
-
-    /// <summary>The guest is executing and cannot be inspected safely.</summary>
-    Running,
-
-    /// <summary>
-    /// The guest is parked at a frame boundary. Registers and memory can be
-    /// read and written, and breakpoints can be edited.
-    /// </summary>
-    Paused,
-
-    /// <summary>The guest has finished; no further frames will run.</summary>
-    Terminated,
-}

src/SharpEmu.Debugger/Session/DebuggerSession.cs

@@ -1,425 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.Core.Cpu.Debugging;
-using SharpEmu.Debugger.Breakpoints;
-using SharpEmu.HLE;
-using SharpEmu.Logging;
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>
-/// The default <see cref="IDebuggerSession"/>. It plugs into the CPU dispatcher
-/// as an <see cref="ICpuDebugHook"/>: when a frame boundary warrants a stop it
-/// parks the emulation thread inside <see cref="ICpuDebugHook.OnFrameEnter"/>
-/// while a debug client inspects and edits state, then releases it on
-/// continue/step.
-/// </summary>
-/// <remarks>
-/// Pausing works by blocking the emulation thread on <see cref="_resumeGate"/>
-/// from within the hook call. Because that thread is the one that owns the guest
-/// context, register and memory accessors are safe to serve from other threads
-/// only while it is parked — which is exactly the <see cref="DebuggerRunState.Paused"/>
-/// window the accessors gate on.
-/// </remarks>
-public sealed class DebuggerSession : IDebuggerSession, ICpuDebugHook
-{
-    private static readonly SharpEmuLogger Log = SharpEmuLog.For("SharpEmu.Debugger");
-
-    private readonly object _sync = new();
-    private readonly ManualResetEventSlim _resumeGate = new(initialState: false);
-    private readonly DebuggerSessionOptions _options;
-
-    private ICpuDebugFrame? _currentFrame;
-    private DebuggerRunState _state = DebuggerRunState.Detached;
-    private DebugStopEvent? _lastStop;
-    private bool _seenFirstFrame;
-    private bool _pausePending;
-    private bool _stepPending;
-
-    public DebuggerSession(DebuggerSessionOptions? options = null)
-    {
-        _options = options ?? new DebuggerSessionOptions();
-        Breakpoints = new BreakpointStore();
-    }
-
-    public BreakpointStore Breakpoints { get; }
-
-    public ICpuDebugHook Hook => this;
-
-    public event EventHandler<DebugStopEvent>? Stopped;
-
-    public event EventHandler? Resumed;
-
-    public event EventHandler? Terminated;
-
-    public DebuggerRunState State
-    {
-        get
-        {
-            lock (_sync)
-            {
-                return _state;
-            }
-        }
-    }
-
-    public DebugStopEvent? LastStop
-    {
-        get
-        {
-            lock (_sync)
-            {
-                return _lastStop;
-            }
-        }
-    }
-
-    void ICpuDebugHook.OnFrameEnter(ICpuDebugFrame frame)
-    {
-        DebugStopEvent? stop;
-        lock (_sync)
-        {
-            _currentFrame = frame;
-            var firstFrame = !_seenFirstFrame;
-            _seenFirstFrame = true;
-
-            var reason = ResolveStopReason(frame, firstFrame, out var breakpoint);
-            if (reason is null)
-            {
-                _state = DebuggerRunState.Running;
-                return;
-            }
-
-            _state = DebuggerRunState.Paused;
-            _lastStop = new DebugStopEvent(
-                reason.Value,
-                DebugRegisterFile.Capture(frame),
-                frame.Kind,
-                frame.Label,
-                breakpoint);
-            stop = _lastStop;
-            _resumeGate.Reset();
-        }
-
-        Log.Debug($"Debugger stop: {stop!.Reason} at 0x{stop.Address:X16} ({stop.FrameLabel})");
-        Stopped?.Invoke(this, stop);
-
-        // Park the emulation thread until a client resumes the target. The frame
-        // stays live and inspectable for the whole wait.
-        _resumeGate.Wait();
-
-        lock (_sync)
-        {
-            if (_state != DebuggerRunState.Terminated)
-            {
-                _state = DebuggerRunState.Running;
-            }
-        }
-
-        Resumed?.Invoke(this, EventArgs.Empty);
-    }
-
-    void ICpuDebugHook.OnFrameExit(ICpuDebugFrame frame, OrbisGen2Result result)
-    {
-        DebugStopEvent? stop = null;
-        lock (_sync)
-        {
-            if (_options.BreakOnFault &&
-                result != OrbisGen2Result.ORBIS_GEN2_OK &&
-                _state != DebuggerRunState.Terminated)
-            {
-                // Parking here keeps the post-fault frame inspectable.
-                _currentFrame = frame;
-                _state = DebuggerRunState.Paused;
-                _lastStop = BuildFaultStop(frame, result);
-                stop = _lastStop;
-                _resumeGate.Reset();
-            }
-        }
-
-        if (stop is not null)
-        {
-            Log.Debug($"Debugger fault stop: {stop.Result} at 0x{stop.Address:X16} ({stop.FrameLabel})");
-            Stopped?.Invoke(this, stop);
-            _resumeGate.Wait();
-            Resumed?.Invoke(this, EventArgs.Empty);
-        }
-
-        lock (_sync)
-        {
-            if (ReferenceEquals(_currentFrame, frame))
-            {
-                _currentFrame = null;
-            }
-
-            if (_state != DebuggerRunState.Terminated)
-            {
-                _state = DebuggerRunState.Running;
-            }
-        }
-    }
-
-    void ICpuDebugHook.OnStall(ICpuDebugFrame frame, CpuStallInfo info)
-    {
-        if (!_options.BreakOnStall)
-        {
-            return;
-        }
-
-        DebugStopEvent? stop = null;
-        lock (_sync)
-        {
-            if (_state == DebuggerRunState.Terminated)
-            {
-                return;
-            }
-
-            _currentFrame = frame;
-            _state = DebuggerRunState.Paused;
-            _lastStop = new DebugStopEvent(
-                DebugStopReason.Stall,
-                DebugRegisterFile.Capture(frame),
-                frame.Kind,
-                frame.Label,
-                breakpoint: null,
-                result: null,
-                detail: info.Detail,
-                opcodeBytes: ReadOpcodePreview(frame, info.InstructionPointer, 16),
-                stallInfo: info);
-            stop = _lastStop;
-            _resumeGate.Reset();
-        }
-
-        Log.Debug($"Debugger stall stop: {info.Kind} nid={info.Nid} at 0x{info.InstructionPointer:X16}");
-        Stopped?.Invoke(this, stop);
-        _resumeGate.Wait();
-
-        lock (_sync)
-        {
-            if (ReferenceEquals(_currentFrame, frame))
-            {
-                _currentFrame = null;
-            }
-
-            if (_state != DebuggerRunState.Terminated)
-            {
-                _state = DebuggerRunState.Running;
-            }
-        }
-
-        Resumed?.Invoke(this, EventArgs.Empty);
-    }
-
-    private static DebugStopEvent BuildFaultStop(ICpuDebugFrame frame, OrbisGen2Result result)
-    {
-        var opcodeBytes = ReadOpcodePreview(frame, frame.Rip, 16);
-        var detail = $"result={result}";
-        if (opcodeBytes is not null)
-        {
-            detail += $", bytes={opcodeBytes}";
-        }
-
-        return new DebugStopEvent(
-            DebugStopReason.Fault,
-            DebugRegisterFile.Capture(frame),
-            frame.Kind,
-            frame.Label,
-            breakpoint: null,
-            result: result,
-            detail: detail,
-            opcodeBytes: opcodeBytes);
-    }
-
-    private static string? ReadOpcodePreview(ICpuDebugFrame frame, ulong address, int maxBytes)
-    {
-        Span<byte> buffer = stackalloc byte[maxBytes];
-        var count = 0;
-        for (; count < maxBytes; count++)
-        {
-            if (!frame.Memory.TryRead(address + (ulong)count, buffer.Slice(count, 1)))
-            {
-                break;
-            }
-        }
-
-        return count == 0 ? null : Convert.ToHexString(buffer[..count]);
-    }
-
-    /// <summary>
-    /// Signals that the whole guest run has finished. Releases any parked
-    /// emulation thread and moves the session to
-    /// <see cref="DebuggerRunState.Terminated"/>.
-    /// </summary>
-    public void NotifyTerminated()
-    {
-        lock (_sync)
-        {
-            _state = DebuggerRunState.Terminated;
-            _currentFrame = null;
-        }
-
-        _resumeGate.Set();
-        Terminated?.Invoke(this, EventArgs.Empty);
-    }
-
-    private DebugStopReason? ResolveStopReason(ICpuDebugFrame frame, bool firstFrame, out Breakpoint? breakpoint)
-    {
-        breakpoint = null;
-        if (_pausePending)
-        {
-            _pausePending = false;
-            return DebugStopReason.Pause;
-        }
-
-        if (_stepPending)
-        {
-            _stepPending = false;
-            return DebugStopReason.Step;
-        }
-
-        var hit = Breakpoints.FindExecuteHit(frame.EntryPoint);
-        if (hit is not null)
-        {
-            breakpoint = hit;
-            return DebugStopReason.Breakpoint;
-        }
-
-        if (_options.StopAtEntry && firstFrame)
-        {
-            return DebugStopReason.EntryPoint;
-        }
-
-        return null;
-    }
-
-    public bool TryGetRegisters(out DebugRegisterFile registers)
-    {
-        lock (_sync)
-        {
-            if (!IsPausedWithFrame(out var frame))
-            {
-                registers = default;
-                return false;
-            }
-
-            registers = DebugRegisterFile.Capture(frame);
-            return true;
-        }
-    }
-
-    public bool TrySetRegister(DebugRegisterId id, ulong value)
-    {
-        lock (_sync)
-        {
-            if (!IsPausedWithFrame(out var frame))
-            {
-                return false;
-            }
-
-            if (id.IsGeneralPurpose())
-            {
-                frame.SetRegister(id.ToCpuRegister(), value);
-                return true;
-            }
-
-            switch (id)
-            {
-                case DebugRegisterId.Rip:
-                    frame.Rip = value;
-                    return true;
-                case DebugRegisterId.Rflags:
-                    frame.Rflags = value;
-                    return true;
-                default:
-                    // FS/GS bases are owned by the TLS setup and are read-only here.
-                    return false;
-            }
-        }
-    }
-
-    public bool TryReadMemory(ulong address, Span<byte> destination)
-    {
-        lock (_sync)
-        {
-            return IsPausedWithFrame(out var frame) && frame.Memory.TryRead(address, destination);
-        }
-    }
-
-    public bool TryWriteMemory(ulong address, ReadOnlySpan<byte> source)
-    {
-        lock (_sync)
-        {
-            return IsPausedWithFrame(out var frame) && frame.Memory.TryWrite(address, source);
-        }
-    }
-
-    public bool TryReadXmm(int registerIndex, out ulong low, out ulong high)
-    {
-        lock (_sync)
-        {
-            if (!IsPausedWithFrame(out var frame) || (uint)registerIndex >= 16)
-            {
-                low = 0;
-                high = 0;
-                return false;
-            }
-
-            frame.GetXmm(registerIndex, out low, out high);
-            return true;
-        }
-    }
-
-    public bool Continue()
-    {
-        lock (_sync)
-        {
-            if (_state != DebuggerRunState.Paused)
-            {
-                return false;
-            }
-
-            _resumeGate.Set();
-            return true;
-        }
-    }
-
-    public bool StepFrame()
-    {
-        lock (_sync)
-        {
-            if (_state != DebuggerRunState.Paused)
-            {
-                return false;
-            }
-
-            _stepPending = true;
-            _resumeGate.Set();
-            return true;
-        }
-    }
-
-    public void RequestPause()
-    {
-        lock (_sync)
-        {
-            if (_state == DebuggerRunState.Running)
-            {
-                _pausePending = true;
-            }
-        }
-    }
-
-    private bool IsPausedWithFrame(out ICpuDebugFrame frame)
-    {
-        // Callers must hold _sync.
-        if (_state == DebuggerRunState.Paused && _currentFrame is not null)
-        {
-            frame = _currentFrame;
-            return true;
-        }
-
-        frame = null!;
-        return false;
-    }
-}

src/SharpEmu.Debugger/Session/DebuggerSessionOptions.cs

@@ -1,31 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>Configuration for a <see cref="DebuggerSession"/>.</summary>
-public sealed class DebuggerSessionOptions
-{
-    /// <summary>
-    /// When true, the session pauses at the first frame it observes so a client
-    /// can attach breakpoints before the guest runs. Defaults to true, matching
-    /// the "stop at entry" behaviour most debuggers expose.
-    /// </summary>
-    public bool StopAtEntry { get; init; } = true;
-
-    /// <summary>
-    /// When true, the session pauses when a frame ends with a non-OK result (a
-    /// CPU trap, memory fault, or unimplemented path) so a client can inspect the
-    /// post-fault register/memory state before the frame is torn down. Defaults
-    /// to true. The stop reports <see cref="DebugStopReason.Fault"/>.
-    /// </summary>
-    public bool BreakOnFault { get; init; } = true;
-
-    /// <summary>
-    /// When true, the session pauses when the backend detects an execution stall
-    /// (a mutex spin loop / livelock) before the guest is forced out of the loop,
-    /// so a client can inspect the stalled state. Defaults to true. The stop
-    /// reports <see cref="DebugStopReason.Stall"/>.
-    /// </summary>
-    public bool BreakOnStall { get; init; } = true;
-}

src/SharpEmu.Debugger/Session/IDebugTarget.cs

@@ -1,51 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>
-/// The inspection and control surface a debugger front-end (for example a
-/// network server) drives. Register and memory accessors succeed only while the
-/// target is <see cref="DebuggerRunState.Paused"/>; they return <c>false</c>
-/// otherwise so callers never read torn state from a running guest.
-/// </summary>
-public interface IDebugTarget
-{
-    /// <summary>The current execution state.</summary>
-    DebuggerRunState State { get; }
-
-    /// <summary>The most recent stop, or null if the target has not stopped yet.</summary>
-    DebugStopEvent? LastStop { get; }
-
-    /// <summary>Reads the integer register file. Fails unless paused.</summary>
-    bool TryGetRegisters(out DebugRegisterFile registers);
-
-    /// <summary>Writes a single register. Fails unless paused.</summary>
-    bool TrySetRegister(DebugRegisterId id, ulong value);
-
-    /// <summary>Reads guest memory into <paramref name="destination"/>. Fails unless paused.</summary>
-    bool TryReadMemory(ulong address, Span<byte> destination);
-
-    /// <summary>Writes guest memory from <paramref name="source"/>. Fails unless paused.</summary>
-    bool TryWriteMemory(ulong address, ReadOnlySpan<byte> source);
-
-    /// <summary>Reads a 128-bit XMM register. Fails unless paused.</summary>
-    bool TryReadXmm(int registerIndex, out ulong low, out ulong high);
-
-    /// <summary>
-    /// Resumes a paused target. Returns false when the target was not paused.
-    /// </summary>
-    bool Continue();
-
-    /// <summary>
-    /// Resumes a paused target and stops again at the next frame boundary.
-    /// Returns false when the target was not paused.
-    /// </summary>
-    bool StepFrame();
-
-    /// <summary>
-    /// Requests that a running target stop at the next frame boundary. Has no
-    /// effect if the target is already paused or terminated.
-    /// </summary>
-    void RequestPause();
-}

src/SharpEmu.Debugger/Session/IDebuggerSession.cs

@@ -1,43 +0,0 @@
-// Copyright (C) 2026 SharpEmu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-using SharpEmu.Core.Cpu.Debugging;
-using SharpEmu.Debugger.Breakpoints;
-
-namespace SharpEmu.Debugger.Session;
-
-/// <summary>
-/// The debugger's coordination point. It bridges the CPU dispatcher seam
-/// (<see cref="Hook"/>) to the inspection surface (<see cref="IDebugTarget"/>),
-/// owns breakpoint state, and raises lifecycle events that a server relays to
-/// connected clients.
-/// </summary>
-public interface IDebuggerSession : IDebugTarget
-{
-    /// <summary>The breakpoints armed for this session.</summary>
-    BreakpointStore Breakpoints { get; }
-
-    /// <summary>
-    /// The dispatcher-facing hook. Assign this to
-    /// <c>SharpEmuRuntimeOptions.DebugHook</c> so guest frames are routed through
-    /// the session.
-    /// </summary>
-    ICpuDebugHook Hook { get; }
-
-    /// <summary>Raised on the emulation thread each time the target stops.</summary>
-    event EventHandler<DebugStopEvent>? Stopped;
-
-    /// <summary>Raised when a paused target resumes.</summary>
-    event EventHandler? Resumed;
-
-    /// <summary>Raised once the target has terminated.</summary>
-    event EventHandler? Terminated;
-
-    /// <summary>
-    /// Signals that the guest run has finished. Releases any parked emulation
-    /// thread and transitions the session to
-    /// <see cref="DebuggerRunState.Terminated"/>. Hosts call this after the
-    /// runtime returns.
-    /// </summary>
-    void NotifyTerminated();
-}

src/SharpEmu.Debugger/SharpEmu.Debugger.csproj

@@ -1,16 +0,0 @@
-<!--
-Copyright (C) 2026 SharpEmu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\SharpEmu.Core\SharpEmu.Core.csproj" />
-    <ProjectReference Include="..\SharpEmu.HLE\SharpEmu.HLE.csproj" />
-    <ProjectReference Include="..\SharpEmu.Logging\SharpEmu.Logging.csproj" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-  </PropertyGroup>
-</Project>

src/SharpEmu.GUI/App.axaml

@@ -1,267 +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"
-             xmlns:local="clr-namespace:SharpEmu.GUI"
-             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" />
-
-    <ControlTheme x:Key="{x:Type local:SettingRow}" TargetType="local:SettingRow">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Grid ColumnDefinitions="*,Auto">
-            <StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
-              <TextBlock x:Name="PART_Label" Text="{TemplateBinding Label}" FontSize="13" />
-              <TextBlock Text="{TemplateBinding Description}" FontSize="11"
-                         Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap"
-                         IsVisible="{Binding Description, RelativeSource={RelativeSource TemplatedParent},
-                                     Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
-            </StackPanel>
-            <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="10" VerticalAlignment="Center">
-              <ToggleSwitch OnContent="Override" OffContent="Override" MinWidth="0"
-                            VerticalAlignment="Center"
-                            IsVisible="{TemplateBinding ShowOverride}"
-                            IsChecked="{Binding IsOverridden, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-              <ContentPresenter x:Name="PART_Slot" Content="{TemplateBinding Content}" VerticalAlignment="Center" />
-            </StackPanel>
-          </Grid>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
-  </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>