Merge f3e1d9cd50 into 3b5f6170d1

misc: chore: move Rainbow updating to a separate task started/stopped as needed
update gommon & use the Event class from it to allow easily clearing all handlers when the apphost exits to avoid leftover invalid event handlers in the rainbow event handler list. More robust config application logic to ensure what needs to happen only happens once
2025-01-24 23:27:47 -06:00 · 2025-01-24 23:06:59 -06:00 · 2025-01-24 17:00:50 -06:00 · 2025-01-24 16:52:20 -06:00 · 2025-01-24 14:47:36 -06:00 · 2025-01-23 17:39:34 -06:00
190 changed files with 7795 additions and 2726 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,7 +22,7 @@ body:
    id: log
    attributes:
      label: Log file
-      description: A log file will help our developers to better diagnose and fix the issue.
+      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
      placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
    validations:
      required: true
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -18,6 +18,10 @@ gpu:
 - changed-files:
  - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']

+'graphics-backend:metal':
+  - changed-files:
+      - any-glob-to-any-file: ['src/Ryujinx.Graphics.Metal/**', 'src/Ryujinx.Graphics.Metal.SharpMetalExtensions/**']
+
 gui:
 - changed-files:
  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,11 +129,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 14
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -108,6 +108,7 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/Ryujinx.desktop          
        shell: bash

      - name: Create output dir
@@ -115,71 +116,69 @@ jobs:

      - name: Publish
        run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
        run: |
-          pushd publish_ava
-          rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          pushd publish
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash

      - name: Packing Linux builds
        if: matrix.platform.os == 'ubuntu-latest'
        run: |
-          pushd publish_ava
-          rm publish/libarmeilleure-jitsupport.dylib
-          chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          pushd publish
+          rm libarmeilleure-jitsupport.dylib
+          chmod +x Ryujinx.sh Ryujinx
+          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd
        shell: bash
      
-      #- name: Build AppImage (Linux)
-      #  if: matrix.platform.os == 'ubuntu-latest'
-      #  run: |
-      #    BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-      #    PLATFORM_NAME="${{ matrix.platform.name }}"
+      - name: Build AppImage (Linux)
+        if: matrix.platform.os == 'ubuntu-latest'
+        run: |
+          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
+          PLATFORM_NAME="${{ matrix.platform.name }}"

-      #    sudo apt install -y zsync desktop-file-utils appstream
+          sudo apt install -y zsync desktop-file-utils appstream

-      #    mkdir -p tools
-      #    export PATH="$PATH:$(readlink -f tools)"
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"

          # Setup appimagetool
-      #    wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-      #    chmod +x tools/appimagetool
-      #    chmod +x distribution/linux/appimage/build-appimage.sh
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
+          chmod +x distribution/linux/appimage/build-appimage.sh

          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-      #    if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-      #      ARCH_NAME=x64
-      #      export ARCH=x86_64
-      #    elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-      #      ARCH_NAME=arm64
-      #      export ARCH=aarch64
-      #    else
-      #      echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-      #      exit 1
-      #    fi
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
+            export ARCH=x86_64
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
+            export ARCH=aarch64
+          else
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+            exit 1
+          fi

-      #    export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-      #    BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh
+          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|Canary-Releases|latest|*-$ARCH_NAME.AppImage.zsync"
+          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh

-          # Add to release output
-      #    pushd publish_ava_appimage
-      #    mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
-      #    mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
-      #    popd
-      #  shell: bash
+          pushd publish_appimage
+          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+          popd          
+        shell: bash 

      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "release_output/*.tar.gz,release_output/*.zip"
-          #artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
+          artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: |
            # Canary builds:
@@ -203,7 +202,7 @@ jobs:

  macos_release:
    name: Release MacOS universal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v4

@@ -211,11 +210,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/nightly_pr_comment.yml
+++ b/.github/workflows/nightly_pr_comment.yml
@@ -37,11 +37,11 @@ jobs:
            if (!artifacts.length) {
              return core.error(`No artifacts found`);
            }
-            let body = `*You need to be logged into GitHub to download these files.*\n\nDownload the artifacts for this pull request:\n`;
+            let body = `Download the artifacts for this pull request:\n`;
            let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
            for (const art of artifacts) {
-              const url = `https://github.com/Ryubing/Ryujinx/actions/runs/${run_id}/artifacts/${art.id}`;
-              if(art.name.includes('Debug')) {
+              const url = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
+              if (art.name.includes('Debug')) {
                hidden_debug_artifacts += `\n* [${art.name}](${url})`;
              } else {
                body += `\n* [${art.name}](${url})`;
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,16 +3,6 @@ name: Release job
 on:
  workflow_dispatch:
    inputs: {}
-  push:
-    branches: [ release ]
-    paths-ignore:
-      - '.github/**'
-      - 'docs/**'
-      - 'assets/**'
-      - '*.yml'
-      - '*.json'
-      - '*.config'
-      - '*.md'

 concurrency: release

@@ -121,6 +111,15 @@ jobs:
          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash
+
+      - name: Packing Linux builds
+        if: matrix.platform.os == 'ubuntu-latest'
+        run: |
+          pushd publish
+          chmod +x Ryujinx.sh Ryujinx
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          popd
+        shell: bash
      
      - name: Build AppImage (Linux)
        if: matrix.platform.os == 'ubuntu-latest'
@@ -157,15 +156,6 @@ jobs:
          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
          popd
-        shell: bash        
-
-      - name: Packing Linux builds
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          pushd publish
-          chmod +x Ryujinx.sh Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
-          popd
        shell: bash

      - name: Pushing new release
@@ -193,7 +183,7 @@ jobs:

  macos_release:
    name: Release MacOS universal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v4

@@ -201,11 +191,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,13 +3,13 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -18,7 +18,7 @@
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.0" />
+    <PackageVersion Include="Concentus" Version="2.2.2" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +26,7 @@
    <PackageVersion Include="LibHac" Version="0.19.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -42,16 +42,17 @@
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0.1" />
+    <PackageVersion Include="Gommon" Version="2.7.1" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
+    <PackageVersion Include="Sep" Version="0.6.0" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
    <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
--- a/README.md
+++ b/README.md
@@ -54,12 +54,13 @@ failing to meet this requirement may result in a poor gameplay experience or une

 ## Latest build

-Stable builds are made every so often onto a separate "release" branch that then gets put into the releases you know and love.
+Stable builds are made every so often, based on the `master` branch, that then gets put into the releases you know and love.
 These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
+They are released every month or so, to ensure consistent updates, while not being an annoying amount of individual updates to download over the course of that month.

 You can find the latest stable release [here](https://github.com/GreemDev/Ryujinx/releases/latest).

-Canary builds are compiled automatically for each commit on the master branch.
+Canary builds are compiled automatically for each commit on the `master` branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
 These canary builds are only recommended for experienced users.

@@ -109,7 +110,7 @@ If you are planning to contribute or just want to learn more about this project
 - **Configuration**

  The emulator has settings for enabling or disabling some logging, remapping controllers, and more.
-  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the user folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
+  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the Ryujinx data folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.

 ## License

--- a/distribution/linux/appimage/build-appimage.sh
+++ b/distribution/linux/appimage/build-appimage.sh
@@ -6,7 +6,7 @@ cd "$ROOTDIR"

 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
-UFLAG=${UFLAG:-"gh-releases-zsync|GreemDev|ryujinx|latest|*-x64.AppImage.zsync"}
+UFLAG=${UFLAG:-"gh-releases-zsync|Ryubing|ryujinx|latest|*-x64.AppImage.zsync"}

 rm -rf AppDir
 mkdir -p AppDir/usr/bin
--- a/distribution/macos/bundle_fix_up.py
+++ b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
    OTOOL = shutil.which("llvm-otool")
    if OTOOL is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
            if otool_path is not None:
                OTOOL = otool_path
--- a/distribution/macos/construct_universal_dylib.py
+++ b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@ else:
    LIPO = shutil.which("llvm-lipo")

    if LIPO is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
            if lipo_path is not None:
                LIPO = lipo_path
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/distribution/macos/shortcut-template.plist
+++ b/distribution/macos/shortcut-template.plist
@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
--- a/src/ARMeilleure/Instructions/InstEmitSimdArithmetic.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdArithmetic.cs
@@ -406,7 +406,7 @@ namespace ARMeilleure.Instructions
                {
                    Operand res = EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub), op1, op2);

-                    return EmitUnaryMathCall(context, nameof(Math.Abs), res);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), res);
                });
            }
        }
@@ -451,7 +451,7 @@ namespace ARMeilleure.Instructions
                {
                    Operand res = EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub), op1, op2);

-                    return EmitUnaryMathCall(context, nameof(Math.Abs), res);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), res);
                });
            }
        }
@@ -483,7 +483,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Abs), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1);
                });
            }
        }
@@ -522,7 +522,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Abs), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1);
                });
            }
        }
@@ -2246,7 +2246,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Floor), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1);
                });
            }
        }
@@ -2265,7 +2265,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Floor), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1);
                });
            }
        }
@@ -2322,7 +2322,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Ceiling), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1);
                });
            }
        }
@@ -2341,7 +2341,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Ceiling), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1);
                });
            }
        }
@@ -2390,7 +2390,7 @@ namespace ARMeilleure.Instructions
            {
                EmitScalarUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Truncate), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1);
                });
            }
        }
@@ -2409,7 +2409,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpF(context, (op1) =>
                {
-                    return EmitUnaryMathCall(context, nameof(Math.Truncate), op1);
+                    return EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1);
                });
            }
        }
--- a/src/ARMeilleure/Instructions/InstEmitSimdArithmetic32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdArithmetic32.cs
@@ -43,7 +43,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Abs), op1));
+                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1));
            }
        }

@@ -66,7 +66,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    EmitVectorUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Abs), op1));
+                    EmitVectorUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Abs), op1));
                }
            }
            else
--- a/src/ARMeilleure/Instructions/InstEmitSimdCmp.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCmp.cs
@@ -726,8 +726,8 @@ namespace ARMeilleure.Instructions

                if (absolute)
                {
-                    ne = EmitUnaryMathCall(context, nameof(Math.Abs), ne);
-                    me = EmitUnaryMathCall(context, nameof(Math.Abs), me);
+                    ne = EmitUnaryMathCall(context, nameof(MathHelper.Abs), ne);
+                    me = EmitUnaryMathCall(context, nameof(MathHelper.Abs), me);
                }

                Operand e = EmitSoftFloatCall(context, name, ne, me);
--- a/src/ARMeilleure/Instructions/InstEmitSimdCvt.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCvt.cs
@@ -333,7 +333,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1));
+                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1));
            }
        }

@@ -349,7 +349,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1), signed: true, scalar: false);
+                EmitFcvt(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1), signed: true, scalar: false);
            }
        }

@@ -365,7 +365,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Floor), op1));
+                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), op1));
            }
        }

@@ -538,7 +538,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Ceiling), op1));
+                EmitFcvt_s_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1));
            }
        }

@@ -554,7 +554,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Ceiling), op1));
+                EmitFcvt_u_Gp(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op1));
            }
        }

--- a/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
@@ -357,10 +357,10 @@ namespace ARMeilleure.Instructions
                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
                        break;
                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), toConvert);
                        break;
                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Floor), toConvert);
                        break;
                }

@@ -494,10 +494,10 @@ namespace ARMeilleure.Instructions
                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
                        break;
                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), toConvert);
                        break;
                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
+                        toConvert = EmitUnaryMathCall(context, nameof(MathHelper.Floor), toConvert);
                        break;
                }

@@ -534,7 +534,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Floor), m));
+                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(MathHelper.Floor), m));
            }
        }

@@ -574,7 +574,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Ceiling), m));
+                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), m));
            }
        }

@@ -613,7 +613,7 @@ namespace ARMeilleure.Instructions
            }
            else
            {
-                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Truncate), op1));
+                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op1));
            }
        }

--- a/src/ARMeilleure/Instructions/InstEmitSimdHelper.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdHelper.cs
@@ -460,8 +460,8 @@ namespace ARMeilleure.Instructions
            IOpCodeSimd op = (IOpCodeSimd)context.CurrOp;

            MethodInfo info = (op.Size & 1) == 0
-                ? typeof(MathF).GetMethod(name, new Type[] { typeof(float) })
-                : typeof(Math).GetMethod(name, new Type[] { typeof(double) });
+                ? typeof(MathHelperF).GetMethod(name, new Type[] { typeof(float) })
+                : typeof(MathHelper).GetMethod(name, new Type[] { typeof(double) });

            return context.Call(info, n);
        }
@@ -470,11 +470,11 @@ namespace ARMeilleure.Instructions
        {
            IOpCodeSimd op = (IOpCodeSimd)context.CurrOp;

-            string name = nameof(Math.Round);
+            string name = nameof(MathHelper.Round);

            MethodInfo info = (op.Size & 1) == 0
-                ? typeof(MathF).GetMethod(name, new Type[] { typeof(float), typeof(MidpointRounding) })
-                : typeof(Math).GetMethod(name, new Type[] { typeof(double), typeof(MidpointRounding) });
+                ? typeof(MathHelperF).GetMethod(name, new Type[] { typeof(float), typeof(int) })
+                : typeof(MathHelper).GetMethod(name, new Type[] { typeof(double), typeof(int) });

            return context.Call(info, n, Const((int)roundMode));
        }
@@ -510,16 +510,16 @@ namespace ARMeilleure.Instructions

            context.MarkLabel(lbl1);
            context.BranchIf(lbl2, rMode, rP, Comparison.NotEqual);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Ceiling), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Ceiling), op));
            context.Branch(lblEnd);

            context.MarkLabel(lbl2);
            context.BranchIf(lbl3, rMode, rM, Comparison.NotEqual);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Floor), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Floor), op));
            context.Branch(lblEnd);

            context.MarkLabel(lbl3);
-            context.Copy(res, EmitUnaryMathCall(context, nameof(Math.Truncate), op));
+            context.Copy(res, EmitUnaryMathCall(context, nameof(MathHelper.Truncate), op));
            context.Branch(lblEnd);

            context.MarkLabel(lblEnd);
--- a/src/ARMeilleure/Instructions/MathHelper.cs
+++ b/src/ARMeilleure/Instructions/MathHelper.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace ARMeilleure.Instructions
+{
+    static class MathHelper
+    {
+        [UnmanagedCallersOnly]
+        public static double Abs(double value)
+        {
+            return Math.Abs(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static double Ceiling(double value)
+        {
+            return Math.Ceiling(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static double Floor(double value)
+        {
+            return Math.Floor(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static double Round(double value, int mode)
+        {
+            return Math.Round(value, (MidpointRounding)mode);
+        }
+
+        [UnmanagedCallersOnly]
+        public static double Truncate(double value)
+        {
+            return Math.Truncate(value);
+        }
+    }
+
+    static class MathHelperF
+    {
+        [UnmanagedCallersOnly]
+        public static float Abs(float value)
+        {
+            return MathF.Abs(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static float Ceiling(float value)
+        {
+            return MathF.Ceiling(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static float Floor(float value)
+        {
+            return MathF.Floor(value);
+        }
+
+        [UnmanagedCallersOnly]
+        public static float Round(float value, int mode)
+        {
+            return MathF.Round(value, (MidpointRounding)mode);
+        }
+
+        [UnmanagedCallersOnly]
+        public static float Truncate(float value)
+        {
+            return MathF.Truncate(value);
+        }
+    }
+}
--- a/src/ARMeilleure/Instructions/NativeInterface.cs
+++ b/src/ARMeilleure/Instructions/NativeInterface.cs
@@ -2,6 +2,7 @@ using ARMeilleure.Memory;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
 using System;
+using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
@@ -34,6 +35,7 @@ namespace ARMeilleure.Instructions
            Context = null;
        }

+        [UnmanagedCallersOnly]
        public static void Break(ulong address, int imm)
        {
            Statistics.PauseTimer();
@@ -43,6 +45,7 @@ namespace ARMeilleure.Instructions
            Statistics.ResumeTimer();
        }

+        [UnmanagedCallersOnly]
        public static void SupervisorCall(ulong address, int imm)
        {
            Statistics.PauseTimer();
@@ -52,6 +55,7 @@ namespace ARMeilleure.Instructions
            Statistics.ResumeTimer();
        }

+        [UnmanagedCallersOnly]
        public static void Undefined(ulong address, int opCode)
        {
            Statistics.PauseTimer();
@@ -62,26 +66,31 @@ namespace ARMeilleure.Instructions
        }

        #region "System registers"
+        [UnmanagedCallersOnly]
        public static ulong GetCtrEl0()
        {
            return GetContext().CtrEl0;
        }

+        [UnmanagedCallersOnly]
        public static ulong GetDczidEl0()
        {
            return GetContext().DczidEl0;
        }

+        [UnmanagedCallersOnly]
        public static ulong GetCntfrqEl0()
        {
            return GetContext().CntfrqEl0;
        }

+        [UnmanagedCallersOnly]
        public static ulong GetCntpctEl0()
        {
            return GetContext().CntpctEl0;
        }

+        [UnmanagedCallersOnly]
        public static ulong GetCntvctEl0()
        {
            return GetContext().CntvctEl0;
@@ -89,26 +98,31 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Read"
+        [UnmanagedCallersOnly]
        public static byte ReadByte(ulong address)
        {
            return GetMemoryManager().ReadGuest<byte>(address);
        }

+        [UnmanagedCallersOnly]
        public static ushort ReadUInt16(ulong address)
        {
            return GetMemoryManager().ReadGuest<ushort>(address);
        }

+        [UnmanagedCallersOnly]
        public static uint ReadUInt32(ulong address)
        {
            return GetMemoryManager().ReadGuest<uint>(address);
        }

+        [UnmanagedCallersOnly]
        public static ulong ReadUInt64(ulong address)
        {
            return GetMemoryManager().ReadGuest<ulong>(address);
        }

+        [UnmanagedCallersOnly]
        public static V128 ReadVector128(ulong address)
        {
            return GetMemoryManager().ReadGuest<V128>(address);
@@ -116,47 +130,56 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Write"
+        [UnmanagedCallersOnly]
        public static void WriteByte(ulong address, byte value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

+        [UnmanagedCallersOnly]
        public static void WriteUInt16(ulong address, ushort value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

+        [UnmanagedCallersOnly]
        public static void WriteUInt32(ulong address, uint value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

+        [UnmanagedCallersOnly]
        public static void WriteUInt64(ulong address, ulong value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }

+        [UnmanagedCallersOnly]
        public static void WriteVector128(ulong address, V128 value)
        {
            GetMemoryManager().WriteGuest(address, value);
        }
        #endregion

+        [UnmanagedCallersOnly]
        public static void EnqueueForRejit(ulong address)
        {
            Context.Translator.EnqueueForRejit(address, GetContext().ExecutionMode);
        }

-        public static void SignalMemoryTracking(ulong address, ulong size, bool write)
+        [UnmanagedCallersOnly]
+        public static void SignalMemoryTracking(ulong address, ulong size, byte write)
        {
-            GetMemoryManager().SignalMemoryTracking(address, size, write);
+            GetMemoryManager().SignalMemoryTracking(address, size, write == 1);
        }

+        [UnmanagedCallersOnly]
        public static void ThrowInvalidMemoryAccess(ulong address)
        {
            throw new InvalidAccessException(address);
        }

+        [UnmanagedCallersOnly]
        public static ulong GetFunctionAddress(ulong address)
        {
            TranslatedFunction function = Context.Translator.GetOrTranslate(address, GetContext().ExecutionMode);
@@ -164,12 +187,14 @@ namespace ARMeilleure.Instructions
            return (ulong)function.FuncPointer.ToInt64();
        }

+        [UnmanagedCallersOnly]
        public static void InvalidateCacheLine(ulong address)
        {
            Context.Translator.InvalidateJitCacheRegion(address, InstEmit.DczSizeInBytes);
        }

-        public static bool CheckSynchronization()
+        [UnmanagedCallersOnly]
+        public static byte CheckSynchronization()
        {
            Statistics.PauseTimer();

@@ -179,7 +204,7 @@ namespace ARMeilleure.Instructions

            Statistics.ResumeTimer();

-            return context.Running;
+            return (byte)(context.Running ? 1 : 0);
        }

        public static ExecutionContext GetContext()
--- a/src/ARMeilleure/Instructions/SoftFallback.cs
+++ b/src/ARMeilleure/Instructions/SoftFallback.cs
@@ -1,11 +1,13 @@
 using ARMeilleure.State;
 using System;
+using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
    static class SoftFallback
    {
        #region "ShrImm64"
+        [UnmanagedCallersOnly]
        public static long SignedShrImm64(long value, long roundConst, int shift)
        {
            if (roundConst == 0L)
@@ -48,6 +50,7 @@ namespace ARMeilleure.Instructions
            }
        }

+        [UnmanagedCallersOnly]
        public static ulong UnsignedShrImm64(ulong value, long roundConst, int shift)
        {
            if (roundConst == 0L)
@@ -92,6 +95,7 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Saturation"
+        [UnmanagedCallersOnly]
        public static int SatF32ToS32(float value)
        {
            if (float.IsNaN(value))
@@ -103,6 +107,7 @@ namespace ARMeilleure.Instructions
                   value <= int.MinValue ? int.MinValue : (int)value;
        }

+        [UnmanagedCallersOnly]
        public static long SatF32ToS64(float value)
        {
            if (float.IsNaN(value))
@@ -114,6 +119,7 @@ namespace ARMeilleure.Instructions
                   value <= long.MinValue ? long.MinValue : (long)value;
        }

+        [UnmanagedCallersOnly]
        public static uint SatF32ToU32(float value)
        {
            if (float.IsNaN(value))
@@ -125,6 +131,7 @@ namespace ARMeilleure.Instructions
                   value <= uint.MinValue ? uint.MinValue : (uint)value;
        }

+        [UnmanagedCallersOnly]
        public static ulong SatF32ToU64(float value)
        {
            if (float.IsNaN(value))
@@ -136,6 +143,7 @@ namespace ARMeilleure.Instructions
                   value <= ulong.MinValue ? ulong.MinValue : (ulong)value;
        }

+        [UnmanagedCallersOnly]
        public static int SatF64ToS32(double value)
        {
            if (double.IsNaN(value))
@@ -147,6 +155,7 @@ namespace ARMeilleure.Instructions
                   value <= int.MinValue ? int.MinValue : (int)value;
        }

+        [UnmanagedCallersOnly]
        public static long SatF64ToS64(double value)
        {
            if (double.IsNaN(value))
@@ -158,6 +167,7 @@ namespace ARMeilleure.Instructions
                   value <= long.MinValue ? long.MinValue : (long)value;
        }

+        [UnmanagedCallersOnly]
        public static uint SatF64ToU32(double value)
        {
            if (double.IsNaN(value))
@@ -169,6 +179,7 @@ namespace ARMeilleure.Instructions
                   value <= uint.MinValue ? uint.MinValue : (uint)value;
        }

+        [UnmanagedCallersOnly]
        public static ulong SatF64ToU64(double value)
        {
            if (double.IsNaN(value))
@@ -182,6 +193,7 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Count"
+        [UnmanagedCallersOnly]
        public static ulong CountLeadingSigns(ulong value, int size) // size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.).
        {
            value ^= value >> 1;
@@ -201,6 +213,7 @@ namespace ARMeilleure.Instructions

        private static ReadOnlySpan<byte> ClzNibbleTbl => new byte[] { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 };

+        [UnmanagedCallersOnly]
        public static ulong CountLeadingZeros(ulong value, int size) // size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.).
        {
            if (value == 0ul)
@@ -224,41 +237,49 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Table"
+        [UnmanagedCallersOnly]
        public static V128 Tbl1(V128 vector, int bytes, V128 tb0)
        {
            return TblOrTbx(default, vector, bytes, tb0);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbl2(V128 vector, int bytes, V128 tb0, V128 tb1)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbl3(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1, tb2);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbl4(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3)
        {
            return TblOrTbx(default, vector, bytes, tb0, tb1, tb2, tb3);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbx1(V128 dest, V128 vector, int bytes, V128 tb0)
        {
            return TblOrTbx(dest, vector, bytes, tb0);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbx2(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbx3(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2);
        }

+        [UnmanagedCallersOnly]
        public static V128 Tbx4(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3)
        {
            return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2, tb3);
@@ -300,14 +321,22 @@ namespace ARMeilleure.Instructions
        private const uint Crc32RevPoly = 0xedb88320;
        private const uint Crc32cRevPoly = 0x82f63b78;

+        [UnmanagedCallersOnly]
        public static uint Crc32b(uint crc, byte value) => Crc32(crc, Crc32RevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32h(uint crc, ushort value) => Crc32h(crc, Crc32RevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32w(uint crc, uint value) => Crc32w(crc, Crc32RevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32x(uint crc, ulong value) => Crc32x(crc, Crc32RevPoly, value);

+        [UnmanagedCallersOnly]
        public static uint Crc32cb(uint crc, byte value) => Crc32(crc, Crc32cRevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32ch(uint crc, ushort value) => Crc32h(crc, Crc32cRevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32cw(uint crc, uint value) => Crc32w(crc, Crc32cRevPoly, value);
+        [UnmanagedCallersOnly]
        public static uint Crc32cx(uint crc, ulong value) => Crc32x(crc, Crc32cRevPoly, value);

        private static uint Crc32h(uint crc, uint poly, ushort val)
@@ -358,21 +387,25 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Aes"
+        [UnmanagedCallersOnly]
        public static V128 Decrypt(V128 value, V128 roundKey)
        {
            return CryptoHelper.AesInvSubBytes(CryptoHelper.AesInvShiftRows(value ^ roundKey));
        }

+        [UnmanagedCallersOnly]
        public static V128 Encrypt(V128 value, V128 roundKey)
        {
            return CryptoHelper.AesSubBytes(CryptoHelper.AesShiftRows(value ^ roundKey));
        }

+        [UnmanagedCallersOnly]
        public static V128 InverseMixColumns(V128 value)
        {
            return CryptoHelper.AesInvMixColumns(value);
        }

+        [UnmanagedCallersOnly]
        public static V128 MixColumns(V128 value)
        {
            return CryptoHelper.AesMixColumns(value);
@@ -380,6 +413,7 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Sha1"
+        [UnmanagedCallersOnly]
        public static V128 HashChoose(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -400,11 +434,13 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

+        [UnmanagedCallersOnly]
        public static uint FixedRotate(uint hash_e)
        {
            return hash_e.Rol(30);
        }

+        [UnmanagedCallersOnly]
        public static V128 HashMajority(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -425,6 +461,7 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

+        [UnmanagedCallersOnly]
        public static V128 HashParity(V128 hash_abcd, uint hash_e, V128 wk)
        {
            for (int e = 0; e <= 3; e++)
@@ -445,6 +482,7 @@ namespace ARMeilleure.Instructions
            return hash_abcd;
        }

+        [UnmanagedCallersOnly]
        public static V128 Sha1SchedulePart1(V128 w0_3, V128 w4_7, V128 w8_11)
        {
            ulong t2 = w4_7.Extract<ulong>(0);
@@ -455,6 +493,7 @@ namespace ARMeilleure.Instructions
            return result ^ (w0_3 ^ w8_11);
        }

+        [UnmanagedCallersOnly]
        public static V128 Sha1SchedulePart2(V128 tw0_3, V128 w12_15)
        {
            V128 t = tw0_3 ^ (w12_15 >> 32);
@@ -499,16 +538,19 @@ namespace ARMeilleure.Instructions
        #endregion

        #region "Sha256"
+        [UnmanagedCallersOnly]
        public static V128 HashLower(V128 hash_abcd, V128 hash_efgh, V128 wk)
        {
            return Sha256Hash(hash_abcd, hash_efgh, wk, part1: true);
        }

+        [UnmanagedCallersOnly]
        public static V128 HashUpper(V128 hash_abcd, V128 hash_efgh, V128 wk)
        {
            return Sha256Hash(hash_abcd, hash_efgh, wk, part1: false);
        }

+        [UnmanagedCallersOnly]
        public static V128 Sha256SchedulePart1(V128 w0_3, V128 w4_7)
        {
            V128 result = new();
@@ -527,6 +569,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static V128 Sha256SchedulePart2(V128 w0_3, V128 w8_11, V128 w12_15)
        {
            V128 result = new();
@@ -628,6 +671,7 @@ namespace ARMeilleure.Instructions
        }
        #endregion

+        [UnmanagedCallersOnly]
        public static V128 PolynomialMult64_128(ulong op1, ulong op2)
        {
            V128 result = V128.Zero;
--- a/src/ARMeilleure/Instructions/SoftFloat.cs
+++ b/src/ARMeilleure/Instructions/SoftFloat.cs
@@ -1,6 +1,7 @@
 using ARMeilleure.State;
 using System;
 using System.Diagnostics;
+using System.Runtime.InteropServices;

 namespace ARMeilleure.Instructions
 {
@@ -312,6 +313,7 @@ namespace ARMeilleure.Instructions

    static class SoftFloat16_32
    {
+        [UnmanagedCallersOnly]
        public static float FPConvert(ushort valueBits)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -487,6 +489,7 @@ namespace ARMeilleure.Instructions

    static class SoftFloat16_64
    {
+        [UnmanagedCallersOnly]
        public static double FPConvert(ushort valueBits)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -662,6 +665,7 @@ namespace ARMeilleure.Instructions

    static class SoftFloat32_16
    {
+        [UnmanagedCallersOnly]
        public static ushort FPConvert(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -781,12 +785,19 @@ namespace ARMeilleure.Instructions

    static class SoftFloat32
    {
+        [UnmanagedCallersOnly]
        public static float FPAdd(float value1, float value2)
        {
-            return FPAddFpscr(value1, value2, false);
+            return FPAddFpscrImpl(value1, value2, false);
        }

-        public static float FPAddFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPAddFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPAddFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPAddFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -837,7 +848,8 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        public static int FPCompare(float value1, float value2, bool signalNaNs)
+        [UnmanagedCallersOnly]
+        public static int FPCompare(float value1, float value2, byte signalNaNs)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = context.Fpcr;
@@ -851,7 +863,7 @@ namespace ARMeilleure.Instructions
            {
                result = 0b0011;

-                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs)
+                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs == 1)
                {
                    SoftFloat.FPProcessException(FPException.InvalidOp, context, fpcr);
                }
@@ -875,12 +887,13 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPCompareEQ(float value1, float value2)
        {
-            return FPCompareEQFpscr(value1, value2, false);
+            return FPCompareEQFpscrImpl(value1, value2, false);
        }

-        public static float FPCompareEQFpscr(float value1, float value2, bool standardFpscr)
+        private static float FPCompareEQFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -907,12 +920,25 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        public static float FPCompareGE(float value1, float value2)
+        [UnmanagedCallersOnly]
+        public static float FPCompareEQFpscr(float value1, float value2, byte standardFpscr)
        {
-            return FPCompareGEFpscr(value1, value2, false);
+            return FPCompareEQFpscrImpl(value1, value2, standardFpscr == 1);
        }

-        public static float FPCompareGEFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPCompareGE(float value1, float value2)
+        {
+            return FPCompareGEFpscrImpl(value1, value2, false);
+        }
+
+        [UnmanagedCallersOnly]
+        public static float FPCompareGEFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPCompareGEFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPCompareGEFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -936,12 +962,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPCompareGT(float value1, float value2)
        {
-            return FPCompareGTFpscr(value1, value2, false);
+            return FPCompareGTFpscrImpl(value1, value2, false);
        }

-        public static float FPCompareGTFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPCompareGTFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPCompareGTFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPCompareGTFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -965,26 +998,31 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPCompareLE(float value1, float value2)
        {
-            return FPCompareGE(value2, value1);
+            return FPCompareGEFpscrImpl(value2, value1, false);
        }

+        [UnmanagedCallersOnly]
        public static float FPCompareLT(float value1, float value2)
        {
-            return FPCompareGT(value2, value1);
+            return FPCompareGTFpscrImpl(value2, value1, false);
        }

-        public static float FPCompareLEFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPCompareLEFpscr(float value1, float value2, byte standardFpscr)
        {
-            return FPCompareGEFpscr(value2, value1, standardFpscr);
+            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
        }

-        public static float FPCompareLTFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPCompareLTFpscr(float value1, float value2, byte standardFpscr)
        {
-            return FPCompareGTFpscr(value2, value1, standardFpscr);
+            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
        }

+        [UnmanagedCallersOnly]
        public static float FPDiv(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1037,12 +1075,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPMax(float value1, float value2)
        {
-            return FPMaxFpscr(value1, value2, false);
+            return FPMaxFpscrImpl(value1, value2, false);
        }

-        public static float FPMaxFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMaxFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPMaxFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+        
+        private static float FPMaxFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1103,12 +1148,13 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPMaxNum(float value1, float value2)
        {
-            return FPMaxNumFpscr(value1, value2, false);
+            return FPMaxNumFpscrImpl(value1, value2, false);
        }

-        public static float FPMaxNumFpscr(float value1, float value2, bool standardFpscr)
+        private static float FPMaxNumFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1125,15 +1171,28 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(true);
            }

-            return FPMaxFpscr(value1, value2, standardFpscr);
+            return FPMaxFpscrImpl(value1, value2, standardFpscr);
        }

+        [UnmanagedCallersOnly]
+        public static float FPMaxNumFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPMaxNumFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        [UnmanagedCallersOnly]
        public static float FPMin(float value1, float value2)
        {
-            return FPMinFpscr(value1, value2, false);
+            return FPMinFpscrImpl(value1, value2, false);
        }

-        public static float FPMinFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMinFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPMinFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPMinFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1194,12 +1253,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPMinNum(float value1, float value2)
        {
-            return FPMinNumFpscr(value1, value2, false);
+            return FPMinNumFpscrImpl(value1, value2, false);
        }

-        public static float FPMinNumFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMinNumFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPMinNumFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPMinNumFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1216,15 +1282,22 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(false);
            }

-            return FPMinFpscr(value1, value2, standardFpscr);
+            return FPMinFpscrImpl(value1, value2, standardFpscr);
        }

+        [UnmanagedCallersOnly]
        public static float FPMul(float value1, float value2)
        {
-            return FPMulFpscr(value1, value2, false);
+            return FPMulFpscrImpl(value1, value2, false);
        }

-        public static float FPMulFpscr(float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMulFpscr(float value1, float value2, byte standardFpscr)
+        {
+            return FPMulFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPMulFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1271,12 +1344,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPMulAdd(float valueA, float value1, float value2)
        {
-            return FPMulAddFpscr(valueA, value1, value2, false);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

-        public static float FPMulAddFpscr(float valueA, float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMulAddFpscr(float valueA, float value1, float value2, byte standardFpscr)
+        {
+            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
+        }
+
+        private static float FPMulAddFpscrImpl(float valueA, float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1342,20 +1422,23 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPMulSub(float valueA, float value1, float value2)
        {
            value1 = value1.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

-        public static float FPMulSubFpscr(float valueA, float value1, float value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPMulSubFpscr(float valueA, float value1, float value2, byte standardFpscr)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscr(valueA, value1, value2, standardFpscr);
+            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
        }

+        [UnmanagedCallersOnly]
        public static float FPMulX(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1401,27 +1484,36 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPNegMulAdd(float valueA, float value1, float value2)
        {
            valueA = valueA.FPNeg();
            value1 = value1.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

+        [UnmanagedCallersOnly]
        public static float FPNegMulSub(float valueA, float value1, float value2)
        {
            valueA = valueA.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

+        [UnmanagedCallersOnly]
        public static float FPRecipEstimate(float value)
        {
-            return FPRecipEstimateFpscr(value, false);
+            return FPRecipEstimateFpscrImpl(value, false);
        }

-        public static float FPRecipEstimateFpscr(float value, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPRecipEstimateFpscr(float value, byte standardFpscr)
+        {
+            return FPRecipEstimateFpscrImpl(value, standardFpscr == 1);
+        }
+
+        private static float FPRecipEstimateFpscrImpl(float value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1508,6 +1600,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRecipStep(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1533,15 +1626,16 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscr(value1, value2, true);
+                    product = FPMulFpscrImpl(value1, value2, true);
                }

-                result = FPSubFpscr(FPTwo(false), product, true);
+                result = FPSubFpscrImpl(FPTwo(false), product, true);
            }

            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRecipStepFused(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1585,6 +1679,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRecpX(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1610,12 +1705,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRSqrtEstimate(float value)
        {
-            return FPRSqrtEstimateFpscr(value, false);
+            return FPRSqrtEstimateFpscrImpl(value, false);
        }

-        public static float FPRSqrtEstimateFpscr(float value, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static float FPRSqrtEstimateFpscr(float value, byte standardFpscr)
+        {
+            return FPRSqrtEstimateFpscrImpl(value, standardFpscr == 1);
+        }
+
+        private static float FPRSqrtEstimateFpscrImpl(float value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -1729,6 +1831,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRSqrtStep(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1754,7 +1857,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscr(value1, value2, true);
+                    product = FPMulFpscrImpl(value1, value2, true);
                }

                result = FPHalvedSub(FPThree(false), product, context, fpcr);
@@ -1763,6 +1866,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPRSqrtStepFused(float value1, float value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1806,6 +1910,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPSqrt(float value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -1848,12 +1953,13 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static float FPSub(float value1, float value2)
        {
-            return FPSubFpscr(value1, value2, false);
+            return FPSubFpscrImpl(value1, value2, false);
        }

-        public static float FPSubFpscr(float value1, float value2, bool standardFpscr)
+        private static float FPSubFpscrImpl(float value1, float value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2094,6 +2200,7 @@ namespace ARMeilleure.Instructions

    static class SoftFloat64_16
    {
+        [UnmanagedCallersOnly]
        public static ushort FPConvert(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2213,12 +2320,19 @@ namespace ARMeilleure.Instructions

    static class SoftFloat64
    {
+        [UnmanagedCallersOnly]
        public static double FPAdd(double value1, double value2)
        {
-            return FPAddFpscr(value1, value2, false);
+            return FPAddFpscrImpl(value1, value2, false);
        }

-        public static double FPAddFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPAddFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPAddFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPAddFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2269,7 +2383,8 @@ namespace ARMeilleure.Instructions
            return result;
        }

-        public static int FPCompare(double value1, double value2, bool signalNaNs)
+        [UnmanagedCallersOnly]
+        public static int FPCompare(double value1, double value2, byte signalNaNs)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = context.Fpcr;
@@ -2283,7 +2398,7 @@ namespace ARMeilleure.Instructions
            {
                result = 0b0011;

-                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs)
+                if (type1 == FPType.SNaN || type2 == FPType.SNaN || signalNaNs == 1)
                {
                    SoftFloat.FPProcessException(FPException.InvalidOp, context, fpcr);
                }
@@ -2307,12 +2422,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPCompareEQ(double value1, double value2)
        {
-            return FPCompareEQFpscr(value1, value2, false);
+            return FPCompareEQFpscrImpl(value1, value2, false);
        }

-        public static double FPCompareEQFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPCompareEQFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPCompareEQFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPCompareEQFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2339,12 +2461,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPCompareGE(double value1, double value2)
        {
-            return FPCompareGEFpscr(value1, value2, false);
+            return FPCompareGEFpscrImpl(value1, value2, false);
        }

-        public static double FPCompareGEFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPCompareGEFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPCompareGEFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPCompareGEFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2368,12 +2497,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPCompareGT(double value1, double value2)
        {
-            return FPCompareGTFpscr(value1, value2, false);
+            return FPCompareGTFpscrImpl(value1, value2, false);
        }

-        public static double FPCompareGTFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPCompareGTFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPCompareGTFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPCompareGTFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2397,26 +2533,31 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPCompareLE(double value1, double value2)
        {
-            return FPCompareGE(value2, value1);
+            return FPCompareGEFpscrImpl(value2, value1, false);
        }

+        [UnmanagedCallersOnly]
        public static double FPCompareLT(double value1, double value2)
        {
-            return FPCompareGT(value2, value1);
+            return FPCompareGTFpscrImpl(value2, value1, false);
        }

-        public static double FPCompareLEFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPCompareLEFpscr(double value1, double value2, byte standardFpscr)
        {
-            return FPCompareGEFpscr(value2, value1, standardFpscr);
+            return FPCompareGEFpscrImpl(value2, value1, standardFpscr == 1);
        }

-        public static double FPCompareLTFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPCompareLTFpscr(double value1, double value2, byte standardFpscr)
        {
-            return FPCompareGTFpscr(value2, value1, standardFpscr);
+            return FPCompareGTFpscrImpl(value2, value1, standardFpscr == 1);
        }

+        [UnmanagedCallersOnly]
        public static double FPDiv(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2469,12 +2610,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPMax(double value1, double value2)
        {
-            return FPMaxFpscr(value1, value2, false);
+            return FPMaxFpscrImpl(value1, value2, false);
        }

-        public static double FPMaxFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMaxFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPMaxFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMaxFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2535,12 +2683,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPMaxNum(double value1, double value2)
        {
-            return FPMaxNumFpscr(value1, value2, false);
+            return FPMaxNumFpscrImpl(value1, value2, false);
        }

-        public static double FPMaxNumFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMaxNumFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPMaxNumFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMaxNumFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2557,15 +2712,22 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(true);
            }

-            return FPMaxFpscr(value1, value2, standardFpscr);
+            return FPMaxFpscrImpl(value1, value2, standardFpscr);
        }

+        [UnmanagedCallersOnly]
        public static double FPMin(double value1, double value2)
        {
-            return FPMinFpscr(value1, value2, false);
+            return FPMinFpscrImpl(value1, value2, false);
        }

-        public static double FPMinFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMinFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPMinFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMinFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2626,12 +2788,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPMinNum(double value1, double value2)
        {
-            return FPMinNumFpscr(value1, value2, false);
+            return FPMinNumFpscrImpl(value1, value2, false);
        }

-        public static double FPMinNumFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMinNumFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPMinNumFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMinNumFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2648,15 +2817,22 @@ namespace ARMeilleure.Instructions
                value2 = FPInfinity(false);
            }

-            return FPMinFpscr(value1, value2, standardFpscr);
+            return FPMinFpscrImpl(value1, value2, standardFpscr);
        }

+        [UnmanagedCallersOnly]
        public static double FPMul(double value1, double value2)
        {
-            return FPMulFpscr(value1, value2, false);
+            return FPMulFpscrImpl(value1, value2, false);
        }

-        public static double FPMulFpscr(double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMulFpscr(double value1, double value2, byte standardFpscr)
+        {
+            return FPMulFpscrImpl(value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMulFpscrImpl(double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2703,12 +2879,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPMulAdd(double valueA, double value1, double value2)
        {
-            return FPMulAddFpscr(valueA, value1, value2, false);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

-        public static double FPMulAddFpscr(double valueA, double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMulAddFpscr(double valueA, double value1, double value2, byte standardFpscr)
+        {
+            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
+        }
+
+        private static double FPMulAddFpscrImpl(double valueA, double value1, double value2, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2774,20 +2957,23 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPMulSub(double valueA, double value1, double value2)
        {
            value1 = value1.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

-        public static double FPMulSubFpscr(double valueA, double value1, double value2, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPMulSubFpscr(double valueA, double value1, double value2, byte standardFpscr)
        {
            value1 = value1.FPNeg();

-            return FPMulAddFpscr(valueA, value1, value2, standardFpscr);
+            return FPMulAddFpscrImpl(valueA, value1, value2, standardFpscr == 1);
        }

+        [UnmanagedCallersOnly]
        public static double FPMulX(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2833,27 +3019,36 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPNegMulAdd(double valueA, double value1, double value2)
        {
            valueA = valueA.FPNeg();
            value1 = value1.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

+        [UnmanagedCallersOnly]
        public static double FPNegMulSub(double valueA, double value1, double value2)
        {
            valueA = valueA.FPNeg();

-            return FPMulAdd(valueA, value1, value2);
+            return FPMulAddFpscrImpl(valueA, value1, value2, false);
        }

+        [UnmanagedCallersOnly]
        public static double FPRecipEstimate(double value)
        {
-            return FPRecipEstimateFpscr(value, false);
+            return FPRecipEstimateFpscrImpl(value, false);
        }

-        public static double FPRecipEstimateFpscr(double value, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPRecipEstimateFpscr(double value, byte standardFpscr)
+        {
+            return FPRecipEstimateFpscrImpl(value, standardFpscr == 1);
+        }
+
+        private static double FPRecipEstimateFpscrImpl(double value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -2940,6 +3135,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRecipStep(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -2965,7 +3161,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscr(value1, value2, true);
+                    product = FPMulFpscrImpl(value1, value2, true);
                }

                result = FPSubFpscr(FPTwo(false), product, true);
@@ -2974,6 +3170,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRecipStepFused(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3017,6 +3214,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRecpX(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3042,12 +3240,19 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRSqrtEstimate(double value)
        {
-            return FPRSqrtEstimateFpscr(value, false);
+            return FPRSqrtEstimateFpscrImpl(value, false);
        }

-        public static double FPRSqrtEstimateFpscr(double value, bool standardFpscr)
+        [UnmanagedCallersOnly]
+        public static double FPRSqrtEstimateFpscr(double value, byte standardFpscr)
+        {
+            return FPRSqrtEstimateFpscrImpl(value, standardFpscr == 1);
+        }
+
+        private static double FPRSqrtEstimateFpscrImpl(double value, bool standardFpscr)
        {
            ExecutionContext context = NativeInterface.GetContext();
            FPCR fpcr = standardFpscr ? context.StandardFpcrValue : context.Fpcr;
@@ -3161,6 +3366,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRSqrtStep(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3186,7 +3392,7 @@ namespace ARMeilleure.Instructions
                }
                else
                {
-                    product = FPMulFpscr(value1, value2, true);
+                    product = FPMulFpscrImpl(value1, value2, true);
                }

                result = FPHalvedSub(FPThree(false), product, context, fpcr);
@@ -3195,6 +3401,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPRSqrtStepFused(double value1, double value2)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3238,6 +3445,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPSqrt(double value)
        {
            ExecutionContext context = NativeInterface.GetContext();
@@ -3280,6 +3488,7 @@ namespace ARMeilleure.Instructions
            return result;
        }

+        [UnmanagedCallersOnly]
        public static double FPSub(double value1, double value2)
        {
            return FPSubFpscr(value1, value2, false);
--- a/src/ARMeilleure/Translation/DelegateInfo.cs
+++ b/src/ARMeilleure/Translation/DelegateInfo.cs
@@ -4,15 +4,9 @@ namespace ARMeilleure.Translation
 {
    class DelegateInfo
    {
-#pragma warning disable IDE0052 // Remove unread private member
-        private readonly Delegate _dlg; // Ensure that this delegate will not be garbage collected.
-#pragma warning restore IDE0052
-
-        public nint FuncPtr { get; }
-
-        public DelegateInfo(Delegate dlg, nint funcPtr)
+        public nint FuncPtr { get; private set; }
+        public DelegateInfo(nint funcPtr)
        {
-            _dlg = dlg;
            FuncPtr = funcPtr;
        }
    }
--- a/src/ARMeilleure/Translation/Delegates.cs
+++ b/src/ARMeilleure/Translation/Delegates.cs
@@ -1,9 +1,7 @@
 using ARMeilleure.Instructions;
-using ARMeilleure.State;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Runtime.InteropServices;

 namespace ARMeilleure.Translation
 {
@@ -34,21 +32,7 @@ namespace ARMeilleure.Translation

            return _delegates.Values[index].FuncPtr; // O(1).
        }
-
-        public static nint GetDelegateFuncPtr(MethodInfo info)
-        {
-            ArgumentNullException.ThrowIfNull(info);
-
-            string key = GetKey(info);
-
-            if (!_delegates.TryGetValue(key, out DelegateInfo dlgInfo)) // O(log(n)).
-            {
-                throw new KeyNotFoundException($"({nameof(key)} = {key})");
-            }
-
-            return dlgInfo.FuncPtr;
-        }
-
+        
        public static int GetDelegateIndex(MethodInfo info)
        {
            ArgumentNullException.ThrowIfNull(info);
@@ -64,12 +48,12 @@ namespace ARMeilleure.Translation

            return index;
        }
-
-        private static void SetDelegateInfo(Delegate dlg, nint funcPtr)
+        
+        private static void SetDelegateInfo(MethodInfo method)
        {
-            string key = GetKey(dlg.Method);
+            string key = GetKey(method);

-            _delegates.Add(key, new DelegateInfo(dlg, funcPtr)); // ArgumentException (key).
+            _delegates.Add(key, new DelegateInfo(method.MethodHandle.GetFunctionPointer())); // ArgumentException (key).
        }

        private static string GetKey(MethodInfo info)
@@ -83,528 +67,179 @@ namespace ARMeilleure.Translation
        {
            _delegates = new SortedList<string, DelegateInfo>();

-            var dlgMathAbs = new MathAbs(Math.Abs);
-            var dlgMathCeiling = new MathCeiling(Math.Ceiling);
-            var dlgMathFloor = new MathFloor(Math.Floor);
-            var dlgMathRound = new MathRound(Math.Round);
-            var dlgMathTruncate = new MathTruncate(Math.Truncate);
+            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Abs)));
+            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Ceiling)));
+            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Floor)));
+            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Round)));
+            SetDelegateInfo(typeof(MathHelper).GetMethod(nameof(MathHelper.Truncate)));

-            var dlgMathFAbs = new MathFAbs(MathF.Abs);
-            var dlgMathFCeiling = new MathFCeiling(MathF.Ceiling);
-            var dlgMathFFloor = new MathFFloor(MathF.Floor);
-            var dlgMathFRound = new MathFRound(MathF.Round);
-            var dlgMathFTruncate = new MathFTruncate(MathF.Truncate);
+            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Abs)));
+            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Ceiling)));
+            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Floor)));
+            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Round)));
+            SetDelegateInfo(typeof(MathHelperF).GetMethod(nameof(MathHelperF.Truncate)));

-            var dlgNativeInterfaceBreak = new NativeInterfaceBreak(NativeInterface.Break);
-            var dlgNativeInterfaceCheckSynchronization = new NativeInterfaceCheckSynchronization(NativeInterface.CheckSynchronization);
-            var dlgNativeInterfaceEnqueueForRejit = new NativeInterfaceEnqueueForRejit(NativeInterface.EnqueueForRejit);
-            var dlgNativeInterfaceGetCntfrqEl0 = new NativeInterfaceGetCntfrqEl0(NativeInterface.GetCntfrqEl0);
-            var dlgNativeInterfaceGetCntpctEl0 = new NativeInterfaceGetCntpctEl0(NativeInterface.GetCntpctEl0);
-            var dlgNativeInterfaceGetCntvctEl0 = new NativeInterfaceGetCntvctEl0(NativeInterface.GetCntvctEl0);
-            var dlgNativeInterfaceGetCtrEl0 = new NativeInterfaceGetCtrEl0(NativeInterface.GetCtrEl0);
-            var dlgNativeInterfaceGetDczidEl0 = new NativeInterfaceGetDczidEl0(NativeInterface.GetDczidEl0);
-            var dlgNativeInterfaceGetFunctionAddress = new NativeInterfaceGetFunctionAddress(NativeInterface.GetFunctionAddress);
-            var dlgNativeInterfaceInvalidateCacheLine = new NativeInterfaceInvalidateCacheLine(NativeInterface.InvalidateCacheLine);
-            var dlgNativeInterfaceReadByte = new NativeInterfaceReadByte(NativeInterface.ReadByte);
-            var dlgNativeInterfaceReadUInt16 = new NativeInterfaceReadUInt16(NativeInterface.ReadUInt16);
-            var dlgNativeInterfaceReadUInt32 = new NativeInterfaceReadUInt32(NativeInterface.ReadUInt32);
-            var dlgNativeInterfaceReadUInt64 = new NativeInterfaceReadUInt64(NativeInterface.ReadUInt64);
-            var dlgNativeInterfaceReadVector128 = new NativeInterfaceReadVector128(NativeInterface.ReadVector128);
-            var dlgNativeInterfaceSignalMemoryTracking = new NativeInterfaceSignalMemoryTracking(NativeInterface.SignalMemoryTracking);
-            var dlgNativeInterfaceSupervisorCall = new NativeInterfaceSupervisorCall(NativeInterface.SupervisorCall);
-            var dlgNativeInterfaceThrowInvalidMemoryAccess = new NativeInterfaceThrowInvalidMemoryAccess(NativeInterface.ThrowInvalidMemoryAccess);
-            var dlgNativeInterfaceUndefined = new NativeInterfaceUndefined(NativeInterface.Undefined);
-            var dlgNativeInterfaceWriteByte = new NativeInterfaceWriteByte(NativeInterface.WriteByte);
-            var dlgNativeInterfaceWriteUInt16 = new NativeInterfaceWriteUInt16(NativeInterface.WriteUInt16);
-            var dlgNativeInterfaceWriteUInt32 = new NativeInterfaceWriteUInt32(NativeInterface.WriteUInt32);
-            var dlgNativeInterfaceWriteUInt64 = new NativeInterfaceWriteUInt64(NativeInterface.WriteUInt64);
-            var dlgNativeInterfaceWriteVector128 = new NativeInterfaceWriteVector128(NativeInterface.WriteVector128);
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Break)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.CheckSynchronization)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.EnqueueForRejit)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntfrqEl0)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntvctEl0)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCtrEl0)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetDczidEl0)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.InvalidateCacheLine)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadByte)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt16)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt32)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadVector128)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SignalMemoryTracking)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SupervisorCall)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Undefined)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteByte)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt16)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt32)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt64)));
+            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteVector128)));

-            var dlgSoftFallbackCountLeadingSigns = new SoftFallbackCountLeadingSigns(SoftFallback.CountLeadingSigns);
-            var dlgSoftFallbackCountLeadingZeros = new SoftFallbackCountLeadingZeros(SoftFallback.CountLeadingZeros);
-            var dlgSoftFallbackCrc32b = new SoftFallbackCrc32b(SoftFallback.Crc32b);
-            var dlgSoftFallbackCrc32cb = new SoftFallbackCrc32cb(SoftFallback.Crc32cb);
-            var dlgSoftFallbackCrc32ch = new SoftFallbackCrc32ch(SoftFallback.Crc32ch);
-            var dlgSoftFallbackCrc32cw = new SoftFallbackCrc32cw(SoftFallback.Crc32cw);
-            var dlgSoftFallbackCrc32cx = new SoftFallbackCrc32cx(SoftFallback.Crc32cx);
-            var dlgSoftFallbackCrc32h = new SoftFallbackCrc32h(SoftFallback.Crc32h);
-            var dlgSoftFallbackCrc32w = new SoftFallbackCrc32w(SoftFallback.Crc32w);
-            var dlgSoftFallbackCrc32x = new SoftFallbackCrc32x(SoftFallback.Crc32x);
-            var dlgSoftFallbackDecrypt = new SoftFallbackDecrypt(SoftFallback.Decrypt);
-            var dlgSoftFallbackEncrypt = new SoftFallbackEncrypt(SoftFallback.Encrypt);
-            var dlgSoftFallbackFixedRotate = new SoftFallbackFixedRotate(SoftFallback.FixedRotate);
-            var dlgSoftFallbackHashChoose = new SoftFallbackHashChoose(SoftFallback.HashChoose);
-            var dlgSoftFallbackHashLower = new SoftFallbackHashLower(SoftFallback.HashLower);
-            var dlgSoftFallbackHashMajority = new SoftFallbackHashMajority(SoftFallback.HashMajority);
-            var dlgSoftFallbackHashParity = new SoftFallbackHashParity(SoftFallback.HashParity);
-            var dlgSoftFallbackHashUpper = new SoftFallbackHashUpper(SoftFallback.HashUpper);
-            var dlgSoftFallbackInverseMixColumns = new SoftFallbackInverseMixColumns(SoftFallback.InverseMixColumns);
-            var dlgSoftFallbackMixColumns = new SoftFallbackMixColumns(SoftFallback.MixColumns);
-            var dlgSoftFallbackPolynomialMult64_128 = new SoftFallbackPolynomialMult64_128(SoftFallback.PolynomialMult64_128);
-            var dlgSoftFallbackSatF32ToS32 = new SoftFallbackSatF32ToS32(SoftFallback.SatF32ToS32);
-            var dlgSoftFallbackSatF32ToS64 = new SoftFallbackSatF32ToS64(SoftFallback.SatF32ToS64);
-            var dlgSoftFallbackSatF32ToU32 = new SoftFallbackSatF32ToU32(SoftFallback.SatF32ToU32);
-            var dlgSoftFallbackSatF32ToU64 = new SoftFallbackSatF32ToU64(SoftFallback.SatF32ToU64);
-            var dlgSoftFallbackSatF64ToS32 = new SoftFallbackSatF64ToS32(SoftFallback.SatF64ToS32);
-            var dlgSoftFallbackSatF64ToS64 = new SoftFallbackSatF64ToS64(SoftFallback.SatF64ToS64);
-            var dlgSoftFallbackSatF64ToU32 = new SoftFallbackSatF64ToU32(SoftFallback.SatF64ToU32);
-            var dlgSoftFallbackSatF64ToU64 = new SoftFallbackSatF64ToU64(SoftFallback.SatF64ToU64);
-            var dlgSoftFallbackSha1SchedulePart1 = new SoftFallbackSha1SchedulePart1(SoftFallback.Sha1SchedulePart1);
-            var dlgSoftFallbackSha1SchedulePart2 = new SoftFallbackSha1SchedulePart2(SoftFallback.Sha1SchedulePart2);
-            var dlgSoftFallbackSha256SchedulePart1 = new SoftFallbackSha256SchedulePart1(SoftFallback.Sha256SchedulePart1);
-            var dlgSoftFallbackSha256SchedulePart2 = new SoftFallbackSha256SchedulePart2(SoftFallback.Sha256SchedulePart2);
-            var dlgSoftFallbackSignedShrImm64 = new SoftFallbackSignedShrImm64(SoftFallback.SignedShrImm64);
-            var dlgSoftFallbackTbl1 = new SoftFallbackTbl1(SoftFallback.Tbl1);
-            var dlgSoftFallbackTbl2 = new SoftFallbackTbl2(SoftFallback.Tbl2);
-            var dlgSoftFallbackTbl3 = new SoftFallbackTbl3(SoftFallback.Tbl3);
-            var dlgSoftFallbackTbl4 = new SoftFallbackTbl4(SoftFallback.Tbl4);
-            var dlgSoftFallbackTbx1 = new SoftFallbackTbx1(SoftFallback.Tbx1);
-            var dlgSoftFallbackTbx2 = new SoftFallbackTbx2(SoftFallback.Tbx2);
-            var dlgSoftFallbackTbx3 = new SoftFallbackTbx3(SoftFallback.Tbx3);
-            var dlgSoftFallbackTbx4 = new SoftFallbackTbx4(SoftFallback.Tbx4);
-            var dlgSoftFallbackUnsignedShrImm64 = new SoftFallbackUnsignedShrImm64(SoftFallback.UnsignedShrImm64);
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingSigns)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingZeros)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32b)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cb)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32ch)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cw)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cx)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32h)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32w)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32x)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Decrypt)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Encrypt)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.FixedRotate)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashChoose)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashLower)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashMajority)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashParity)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashUpper)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.InverseMixColumns)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.MixColumns)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.PolynomialMult64_128)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS64)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU64)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS32)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS64)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU32)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU64)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart1)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart2)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart1)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart2)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SignedShrImm64)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl1)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl2)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl3)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl4)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx1)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx2)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx3)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx4)));
+            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.UnsignedShrImm64)));

-            var dlgSoftFloat16_32FPConvert = new SoftFloat16_32FPConvert(SoftFloat16_32.FPConvert);
-            var dlgSoftFloat16_64FPConvert = new SoftFloat16_64FPConvert(SoftFloat16_64.FPConvert);
+            SetDelegateInfo(typeof(SoftFloat16_32).GetMethod(nameof(SoftFloat16_32.FPConvert)));
+            SetDelegateInfo(typeof(SoftFloat16_64).GetMethod(nameof(SoftFloat16_64.FPConvert)));

-            var dlgSoftFloat32FPAdd = new SoftFloat32FPAdd(SoftFloat32.FPAdd);
-            var dlgSoftFloat32FPAddFpscr = new SoftFloat32FPAddFpscr(SoftFloat32.FPAddFpscr); // A32 only.
-            var dlgSoftFloat32FPCompare = new SoftFloat32FPCompare(SoftFloat32.FPCompare);
-            var dlgSoftFloat32FPCompareEQ = new SoftFloat32FPCompareEQ(SoftFloat32.FPCompareEQ);
-            var dlgSoftFloat32FPCompareEQFpscr = new SoftFloat32FPCompareEQFpscr(SoftFloat32.FPCompareEQFpscr); // A32 only.
-            var dlgSoftFloat32FPCompareGE = new SoftFloat32FPCompareGE(SoftFloat32.FPCompareGE);
-            var dlgSoftFloat32FPCompareGEFpscr = new SoftFloat32FPCompareGEFpscr(SoftFloat32.FPCompareGEFpscr); // A32 only.
-            var dlgSoftFloat32FPCompareGT = new SoftFloat32FPCompareGT(SoftFloat32.FPCompareGT);
-            var dlgSoftFloat32FPCompareGTFpscr = new SoftFloat32FPCompareGTFpscr(SoftFloat32.FPCompareGTFpscr); // A32 only.
-            var dlgSoftFloat32FPCompareLE = new SoftFloat32FPCompareLE(SoftFloat32.FPCompareLE);
-            var dlgSoftFloat32FPCompareLEFpscr = new SoftFloat32FPCompareLEFpscr(SoftFloat32.FPCompareLEFpscr); // A32 only.
-            var dlgSoftFloat32FPCompareLT = new SoftFloat32FPCompareLT(SoftFloat32.FPCompareLT);
-            var dlgSoftFloat32FPCompareLTFpscr = new SoftFloat32FPCompareLTFpscr(SoftFloat32.FPCompareLTFpscr); // A32 only.
-            var dlgSoftFloat32FPDiv = new SoftFloat32FPDiv(SoftFloat32.FPDiv);
-            var dlgSoftFloat32FPMax = new SoftFloat32FPMax(SoftFloat32.FPMax);
-            var dlgSoftFloat32FPMaxFpscr = new SoftFloat32FPMaxFpscr(SoftFloat32.FPMaxFpscr); // A32 only.
-            var dlgSoftFloat32FPMaxNum = new SoftFloat32FPMaxNum(SoftFloat32.FPMaxNum);
-            var dlgSoftFloat32FPMaxNumFpscr = new SoftFloat32FPMaxNumFpscr(SoftFloat32.FPMaxNumFpscr); // A32 only.
-            var dlgSoftFloat32FPMin = new SoftFloat32FPMin(SoftFloat32.FPMin);
-            var dlgSoftFloat32FPMinFpscr = new SoftFloat32FPMinFpscr(SoftFloat32.FPMinFpscr); // A32 only.
-            var dlgSoftFloat32FPMinNum = new SoftFloat32FPMinNum(SoftFloat32.FPMinNum);
-            var dlgSoftFloat32FPMinNumFpscr = new SoftFloat32FPMinNumFpscr(SoftFloat32.FPMinNumFpscr); // A32 only.
-            var dlgSoftFloat32FPMul = new SoftFloat32FPMul(SoftFloat32.FPMul);
-            var dlgSoftFloat32FPMulFpscr = new SoftFloat32FPMulFpscr(SoftFloat32.FPMulFpscr); // A32 only.
-            var dlgSoftFloat32FPMulAdd = new SoftFloat32FPMulAdd(SoftFloat32.FPMulAdd);
-            var dlgSoftFloat32FPMulAddFpscr = new SoftFloat32FPMulAddFpscr(SoftFloat32.FPMulAddFpscr); // A32 only.
-            var dlgSoftFloat32FPMulSub = new SoftFloat32FPMulSub(SoftFloat32.FPMulSub);
-            var dlgSoftFloat32FPMulSubFpscr = new SoftFloat32FPMulSubFpscr(SoftFloat32.FPMulSubFpscr); // A32 only.
-            var dlgSoftFloat32FPMulX = new SoftFloat32FPMulX(SoftFloat32.FPMulX);
-            var dlgSoftFloat32FPNegMulAdd = new SoftFloat32FPNegMulAdd(SoftFloat32.FPNegMulAdd);
-            var dlgSoftFloat32FPNegMulSub = new SoftFloat32FPNegMulSub(SoftFloat32.FPNegMulSub);
-            var dlgSoftFloat32FPRecipEstimate = new SoftFloat32FPRecipEstimate(SoftFloat32.FPRecipEstimate);
-            var dlgSoftFloat32FPRecipEstimateFpscr = new SoftFloat32FPRecipEstimateFpscr(SoftFloat32.FPRecipEstimateFpscr); // A32 only.
-            var dlgSoftFloat32FPRecipStep = new SoftFloat32FPRecipStep(SoftFloat32.FPRecipStep); // A32 only.
-            var dlgSoftFloat32FPRecipStepFused = new SoftFloat32FPRecipStepFused(SoftFloat32.FPRecipStepFused);
-            var dlgSoftFloat32FPRecpX = new SoftFloat32FPRecpX(SoftFloat32.FPRecpX);
-            var dlgSoftFloat32FPRSqrtEstimate = new SoftFloat32FPRSqrtEstimate(SoftFloat32.FPRSqrtEstimate);
-            var dlgSoftFloat32FPRSqrtEstimateFpscr = new SoftFloat32FPRSqrtEstimateFpscr(SoftFloat32.FPRSqrtEstimateFpscr); // A32 only.
-            var dlgSoftFloat32FPRSqrtStep = new SoftFloat32FPRSqrtStep(SoftFloat32.FPRSqrtStep); // A32 only.
-            var dlgSoftFloat32FPRSqrtStepFused = new SoftFloat32FPRSqrtStepFused(SoftFloat32.FPRSqrtStepFused);
-            var dlgSoftFloat32FPSqrt = new SoftFloat32FPSqrt(SoftFloat32.FPSqrt);
-            var dlgSoftFloat32FPSub = new SoftFloat32FPSub(SoftFloat32.FPSub);
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAdd)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAddFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompare)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQ)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGE)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGEFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGT)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGTFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLE)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLEFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLT)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLTFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPDiv)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMax)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNum)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNumFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMin)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNum)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNumFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMul)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAdd)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAddFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSub)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSubFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulX)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulAdd)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulSub)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimate)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimateFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStep))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStepFused)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecpX)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimate)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimateFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStep))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStepFused)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSqrt)));
+            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSub)));

-            var dlgSoftFloat32_16FPConvert = new SoftFloat32_16FPConvert(SoftFloat32_16.FPConvert);
+            SetDelegateInfo(typeof(SoftFloat32_16).GetMethod(nameof(SoftFloat32_16.FPConvert)));

-            var dlgSoftFloat64FPAdd = new SoftFloat64FPAdd(SoftFloat64.FPAdd);
-            var dlgSoftFloat64FPAddFpscr = new SoftFloat64FPAddFpscr(SoftFloat64.FPAddFpscr); // A32 only.
-            var dlgSoftFloat64FPCompare = new SoftFloat64FPCompare(SoftFloat64.FPCompare);
-            var dlgSoftFloat64FPCompareEQ = new SoftFloat64FPCompareEQ(SoftFloat64.FPCompareEQ);
-            var dlgSoftFloat64FPCompareEQFpscr = new SoftFloat64FPCompareEQFpscr(SoftFloat64.FPCompareEQFpscr); // A32 only.
-            var dlgSoftFloat64FPCompareGE = new SoftFloat64FPCompareGE(SoftFloat64.FPCompareGE);
-            var dlgSoftFloat64FPCompareGEFpscr = new SoftFloat64FPCompareGEFpscr(SoftFloat64.FPCompareGEFpscr); // A32 only.
-            var dlgSoftFloat64FPCompareGT = new SoftFloat64FPCompareGT(SoftFloat64.FPCompareGT);
-            var dlgSoftFloat64FPCompareGTFpscr = new SoftFloat64FPCompareGTFpscr(SoftFloat64.FPCompareGTFpscr); // A32 only.
-            var dlgSoftFloat64FPCompareLE = new SoftFloat64FPCompareLE(SoftFloat64.FPCompareLE);
-            var dlgSoftFloat64FPCompareLEFpscr = new SoftFloat64FPCompareLEFpscr(SoftFloat64.FPCompareLEFpscr); // A32 only.
-            var dlgSoftFloat64FPCompareLT = new SoftFloat64FPCompareLT(SoftFloat64.FPCompareLT);
-            var dlgSoftFloat64FPCompareLTFpscr = new SoftFloat64FPCompareLTFpscr(SoftFloat64.FPCompareLTFpscr); // A32 only.
-            var dlgSoftFloat64FPDiv = new SoftFloat64FPDiv(SoftFloat64.FPDiv);
-            var dlgSoftFloat64FPMax = new SoftFloat64FPMax(SoftFloat64.FPMax);
-            var dlgSoftFloat64FPMaxFpscr = new SoftFloat64FPMaxFpscr(SoftFloat64.FPMaxFpscr); // A32 only.
-            var dlgSoftFloat64FPMaxNum = new SoftFloat64FPMaxNum(SoftFloat64.FPMaxNum);
-            var dlgSoftFloat64FPMaxNumFpscr = new SoftFloat64FPMaxNumFpscr(SoftFloat64.FPMaxNumFpscr); // A32 only.
-            var dlgSoftFloat64FPMin = new SoftFloat64FPMin(SoftFloat64.FPMin);
-            var dlgSoftFloat64FPMinFpscr = new SoftFloat64FPMinFpscr(SoftFloat64.FPMinFpscr); // A32 only.
-            var dlgSoftFloat64FPMinNum = new SoftFloat64FPMinNum(SoftFloat64.FPMinNum);
-            var dlgSoftFloat64FPMinNumFpscr = new SoftFloat64FPMinNumFpscr(SoftFloat64.FPMinNumFpscr); // A32 only.
-            var dlgSoftFloat64FPMul = new SoftFloat64FPMul(SoftFloat64.FPMul);
-            var dlgSoftFloat64FPMulFpscr = new SoftFloat64FPMulFpscr(SoftFloat64.FPMulFpscr); // A32 only.
-            var dlgSoftFloat64FPMulAdd = new SoftFloat64FPMulAdd(SoftFloat64.FPMulAdd);
-            var dlgSoftFloat64FPMulAddFpscr = new SoftFloat64FPMulAddFpscr(SoftFloat64.FPMulAddFpscr); // A32 only.
-            var dlgSoftFloat64FPMulSub = new SoftFloat64FPMulSub(SoftFloat64.FPMulSub);
-            var dlgSoftFloat64FPMulSubFpscr = new SoftFloat64FPMulSubFpscr(SoftFloat64.FPMulSubFpscr); // A32 only.
-            var dlgSoftFloat64FPMulX = new SoftFloat64FPMulX(SoftFloat64.FPMulX);
-            var dlgSoftFloat64FPNegMulAdd = new SoftFloat64FPNegMulAdd(SoftFloat64.FPNegMulAdd);
-            var dlgSoftFloat64FPNegMulSub = new SoftFloat64FPNegMulSub(SoftFloat64.FPNegMulSub);
-            var dlgSoftFloat64FPRecipEstimate = new SoftFloat64FPRecipEstimate(SoftFloat64.FPRecipEstimate);
-            var dlgSoftFloat64FPRecipEstimateFpscr = new SoftFloat64FPRecipEstimateFpscr(SoftFloat64.FPRecipEstimateFpscr); // A32 only.
-            var dlgSoftFloat64FPRecipStep = new SoftFloat64FPRecipStep(SoftFloat64.FPRecipStep); // A32 only.
-            var dlgSoftFloat64FPRecipStepFused = new SoftFloat64FPRecipStepFused(SoftFloat64.FPRecipStepFused);
-            var dlgSoftFloat64FPRecpX = new SoftFloat64FPRecpX(SoftFloat64.FPRecpX);
-            var dlgSoftFloat64FPRSqrtEstimate = new SoftFloat64FPRSqrtEstimate(SoftFloat64.FPRSqrtEstimate);
-            var dlgSoftFloat64FPRSqrtEstimateFpscr = new SoftFloat64FPRSqrtEstimateFpscr(SoftFloat64.FPRSqrtEstimateFpscr); // A32 only.
-            var dlgSoftFloat64FPRSqrtStep = new SoftFloat64FPRSqrtStep(SoftFloat64.FPRSqrtStep); // A32 only.
-            var dlgSoftFloat64FPRSqrtStepFused = new SoftFloat64FPRSqrtStepFused(SoftFloat64.FPRSqrtStepFused);
-            var dlgSoftFloat64FPSqrt = new SoftFloat64FPSqrt(SoftFloat64.FPSqrt);
-            var dlgSoftFloat64FPSub = new SoftFloat64FPSub(SoftFloat64.FPSub);
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAdd)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAddFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompare)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQ)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGE)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGEFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGT)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGTFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLE)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLEFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLT)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLTFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPDiv)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMax)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNum)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNumFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMin)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNum)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNumFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMul)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAdd)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAddFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSub)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSubFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulX)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulAdd)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulSub)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimate)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimateFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStep))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStepFused)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecpX)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimate)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimateFpscr))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStep))); // A32 only.
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStepFused)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSqrt)));
+            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSub)));

-            var dlgSoftFloat64_16FPConvert = new SoftFloat64_16FPConvert(SoftFloat64_16.FPConvert);
-
-            SetDelegateInfo(dlgMathAbs, Marshal.GetFunctionPointerForDelegate<MathAbs>(dlgMathAbs));
-            SetDelegateInfo(dlgMathCeiling, Marshal.GetFunctionPointerForDelegate<MathCeiling>(dlgMathCeiling));
-            SetDelegateInfo(dlgMathFloor, Marshal.GetFunctionPointerForDelegate<MathFloor>(dlgMathFloor));
-            SetDelegateInfo(dlgMathRound, Marshal.GetFunctionPointerForDelegate<MathRound>(dlgMathRound));
-            SetDelegateInfo(dlgMathTruncate, Marshal.GetFunctionPointerForDelegate<MathTruncate>(dlgMathTruncate));
-
-            SetDelegateInfo(dlgMathFAbs, Marshal.GetFunctionPointerForDelegate<MathFAbs>(dlgMathFAbs));
-            SetDelegateInfo(dlgMathFCeiling, Marshal.GetFunctionPointerForDelegate<MathFCeiling>(dlgMathFCeiling));
-            SetDelegateInfo(dlgMathFFloor, Marshal.GetFunctionPointerForDelegate<MathFFloor>(dlgMathFFloor));
-            SetDelegateInfo(dlgMathFRound, Marshal.GetFunctionPointerForDelegate<MathFRound>(dlgMathFRound));
-            SetDelegateInfo(dlgMathFTruncate, Marshal.GetFunctionPointerForDelegate<MathFTruncate>(dlgMathFTruncate));
-
-            SetDelegateInfo(dlgNativeInterfaceBreak, Marshal.GetFunctionPointerForDelegate<NativeInterfaceBreak>(dlgNativeInterfaceBreak));
-            SetDelegateInfo(dlgNativeInterfaceCheckSynchronization, Marshal.GetFunctionPointerForDelegate<NativeInterfaceCheckSynchronization>(dlgNativeInterfaceCheckSynchronization));
-            SetDelegateInfo(dlgNativeInterfaceEnqueueForRejit, Marshal.GetFunctionPointerForDelegate<NativeInterfaceEnqueueForRejit>(dlgNativeInterfaceEnqueueForRejit));
-            SetDelegateInfo(dlgNativeInterfaceGetCntfrqEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntfrqEl0>(dlgNativeInterfaceGetCntfrqEl0));
-            SetDelegateInfo(dlgNativeInterfaceGetCntpctEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntpctEl0>(dlgNativeInterfaceGetCntpctEl0));
-            SetDelegateInfo(dlgNativeInterfaceGetCntvctEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCntvctEl0>(dlgNativeInterfaceGetCntvctEl0));
-            SetDelegateInfo(dlgNativeInterfaceGetCtrEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetCtrEl0>(dlgNativeInterfaceGetCtrEl0));
-            SetDelegateInfo(dlgNativeInterfaceGetDczidEl0, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetDczidEl0>(dlgNativeInterfaceGetDczidEl0));
-            SetDelegateInfo(dlgNativeInterfaceGetFunctionAddress, Marshal.GetFunctionPointerForDelegate<NativeInterfaceGetFunctionAddress>(dlgNativeInterfaceGetFunctionAddress));
-            SetDelegateInfo(dlgNativeInterfaceInvalidateCacheLine, Marshal.GetFunctionPointerForDelegate<NativeInterfaceInvalidateCacheLine>(dlgNativeInterfaceInvalidateCacheLine));
-            SetDelegateInfo(dlgNativeInterfaceReadByte, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadByte>(dlgNativeInterfaceReadByte));
-            SetDelegateInfo(dlgNativeInterfaceReadUInt16, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt16>(dlgNativeInterfaceReadUInt16));
-            SetDelegateInfo(dlgNativeInterfaceReadUInt32, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt32>(dlgNativeInterfaceReadUInt32));
-            SetDelegateInfo(dlgNativeInterfaceReadUInt64, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadUInt64>(dlgNativeInterfaceReadUInt64));
-            SetDelegateInfo(dlgNativeInterfaceReadVector128, Marshal.GetFunctionPointerForDelegate<NativeInterfaceReadVector128>(dlgNativeInterfaceReadVector128));
-            SetDelegateInfo(dlgNativeInterfaceSignalMemoryTracking, Marshal.GetFunctionPointerForDelegate<NativeInterfaceSignalMemoryTracking>(dlgNativeInterfaceSignalMemoryTracking));
-            SetDelegateInfo(dlgNativeInterfaceSupervisorCall, Marshal.GetFunctionPointerForDelegate<NativeInterfaceSupervisorCall>(dlgNativeInterfaceSupervisorCall));
-            SetDelegateInfo(dlgNativeInterfaceThrowInvalidMemoryAccess, Marshal.GetFunctionPointerForDelegate<NativeInterfaceThrowInvalidMemoryAccess>(dlgNativeInterfaceThrowInvalidMemoryAccess));
-            SetDelegateInfo(dlgNativeInterfaceUndefined, Marshal.GetFunctionPointerForDelegate<NativeInterfaceUndefined>(dlgNativeInterfaceUndefined));
-            SetDelegateInfo(dlgNativeInterfaceWriteByte, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteByte>(dlgNativeInterfaceWriteByte));
-            SetDelegateInfo(dlgNativeInterfaceWriteUInt16, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt16>(dlgNativeInterfaceWriteUInt16));
-            SetDelegateInfo(dlgNativeInterfaceWriteUInt32, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt32>(dlgNativeInterfaceWriteUInt32));
-            SetDelegateInfo(dlgNativeInterfaceWriteUInt64, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteUInt64>(dlgNativeInterfaceWriteUInt64));
-            SetDelegateInfo(dlgNativeInterfaceWriteVector128, Marshal.GetFunctionPointerForDelegate<NativeInterfaceWriteVector128>(dlgNativeInterfaceWriteVector128));
-
-            SetDelegateInfo(dlgSoftFallbackCountLeadingSigns, Marshal.GetFunctionPointerForDelegate<SoftFallbackCountLeadingSigns>(dlgSoftFallbackCountLeadingSigns));
-            SetDelegateInfo(dlgSoftFallbackCountLeadingZeros, Marshal.GetFunctionPointerForDelegate<SoftFallbackCountLeadingZeros>(dlgSoftFallbackCountLeadingZeros));
-            SetDelegateInfo(dlgSoftFallbackCrc32b, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32b>(dlgSoftFallbackCrc32b));
-            SetDelegateInfo(dlgSoftFallbackCrc32cb, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cb>(dlgSoftFallbackCrc32cb));
-            SetDelegateInfo(dlgSoftFallbackCrc32ch, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32ch>(dlgSoftFallbackCrc32ch));
-            SetDelegateInfo(dlgSoftFallbackCrc32cw, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cw>(dlgSoftFallbackCrc32cw));
-            SetDelegateInfo(dlgSoftFallbackCrc32cx, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32cx>(dlgSoftFallbackCrc32cx));
-            SetDelegateInfo(dlgSoftFallbackCrc32h, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32h>(dlgSoftFallbackCrc32h));
-            SetDelegateInfo(dlgSoftFallbackCrc32w, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32w>(dlgSoftFallbackCrc32w));
-            SetDelegateInfo(dlgSoftFallbackCrc32x, Marshal.GetFunctionPointerForDelegate<SoftFallbackCrc32x>(dlgSoftFallbackCrc32x));
-            SetDelegateInfo(dlgSoftFallbackDecrypt, Marshal.GetFunctionPointerForDelegate<SoftFallbackDecrypt>(dlgSoftFallbackDecrypt));
-            SetDelegateInfo(dlgSoftFallbackEncrypt, Marshal.GetFunctionPointerForDelegate<SoftFallbackEncrypt>(dlgSoftFallbackEncrypt));
-            SetDelegateInfo(dlgSoftFallbackFixedRotate, Marshal.GetFunctionPointerForDelegate<SoftFallbackFixedRotate>(dlgSoftFallbackFixedRotate));
-            SetDelegateInfo(dlgSoftFallbackHashChoose, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashChoose>(dlgSoftFallbackHashChoose));
-            SetDelegateInfo(dlgSoftFallbackHashLower, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashLower>(dlgSoftFallbackHashLower));
-            SetDelegateInfo(dlgSoftFallbackHashMajority, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashMajority>(dlgSoftFallbackHashMajority));
-            SetDelegateInfo(dlgSoftFallbackHashParity, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashParity>(dlgSoftFallbackHashParity));
-            SetDelegateInfo(dlgSoftFallbackHashUpper, Marshal.GetFunctionPointerForDelegate<SoftFallbackHashUpper>(dlgSoftFallbackHashUpper));
-            SetDelegateInfo(dlgSoftFallbackInverseMixColumns, Marshal.GetFunctionPointerForDelegate<SoftFallbackInverseMixColumns>(dlgSoftFallbackInverseMixColumns));
-            SetDelegateInfo(dlgSoftFallbackMixColumns, Marshal.GetFunctionPointerForDelegate<SoftFallbackMixColumns>(dlgSoftFallbackMixColumns));
-            SetDelegateInfo(dlgSoftFallbackPolynomialMult64_128, Marshal.GetFunctionPointerForDelegate<SoftFallbackPolynomialMult64_128>(dlgSoftFallbackPolynomialMult64_128));
-            SetDelegateInfo(dlgSoftFallbackSatF32ToS32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToS32>(dlgSoftFallbackSatF32ToS32));
-            SetDelegateInfo(dlgSoftFallbackSatF32ToS64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToS64>(dlgSoftFallbackSatF32ToS64));
-            SetDelegateInfo(dlgSoftFallbackSatF32ToU32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToU32>(dlgSoftFallbackSatF32ToU32));
-            SetDelegateInfo(dlgSoftFallbackSatF32ToU64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF32ToU64>(dlgSoftFallbackSatF32ToU64));
-            SetDelegateInfo(dlgSoftFallbackSatF64ToS32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToS32>(dlgSoftFallbackSatF64ToS32));
-            SetDelegateInfo(dlgSoftFallbackSatF64ToS64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToS64>(dlgSoftFallbackSatF64ToS64));
-            SetDelegateInfo(dlgSoftFallbackSatF64ToU32, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToU32>(dlgSoftFallbackSatF64ToU32));
-            SetDelegateInfo(dlgSoftFallbackSatF64ToU64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSatF64ToU64>(dlgSoftFallbackSatF64ToU64));
-            SetDelegateInfo(dlgSoftFallbackSha1SchedulePart1, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha1SchedulePart1>(dlgSoftFallbackSha1SchedulePart1));
-            SetDelegateInfo(dlgSoftFallbackSha1SchedulePart2, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha1SchedulePart2>(dlgSoftFallbackSha1SchedulePart2));
-            SetDelegateInfo(dlgSoftFallbackSha256SchedulePart1, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha256SchedulePart1>(dlgSoftFallbackSha256SchedulePart1));
-            SetDelegateInfo(dlgSoftFallbackSha256SchedulePart2, Marshal.GetFunctionPointerForDelegate<SoftFallbackSha256SchedulePart2>(dlgSoftFallbackSha256SchedulePart2));
-            SetDelegateInfo(dlgSoftFallbackSignedShrImm64, Marshal.GetFunctionPointerForDelegate<SoftFallbackSignedShrImm64>(dlgSoftFallbackSignedShrImm64));
-            SetDelegateInfo(dlgSoftFallbackTbl1, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl1>(dlgSoftFallbackTbl1));
-            SetDelegateInfo(dlgSoftFallbackTbl2, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl2>(dlgSoftFallbackTbl2));
-            SetDelegateInfo(dlgSoftFallbackTbl3, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl3>(dlgSoftFallbackTbl3));
-            SetDelegateInfo(dlgSoftFallbackTbl4, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbl4>(dlgSoftFallbackTbl4));
-            SetDelegateInfo(dlgSoftFallbackTbx1, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx1>(dlgSoftFallbackTbx1));
-            SetDelegateInfo(dlgSoftFallbackTbx2, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx2>(dlgSoftFallbackTbx2));
-            SetDelegateInfo(dlgSoftFallbackTbx3, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx3>(dlgSoftFallbackTbx3));
-            SetDelegateInfo(dlgSoftFallbackTbx4, Marshal.GetFunctionPointerForDelegate<SoftFallbackTbx4>(dlgSoftFallbackTbx4));
-            SetDelegateInfo(dlgSoftFallbackUnsignedShrImm64, Marshal.GetFunctionPointerForDelegate<SoftFallbackUnsignedShrImm64>(dlgSoftFallbackUnsignedShrImm64));
-
-            SetDelegateInfo(dlgSoftFloat16_32FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat16_32FPConvert>(dlgSoftFloat16_32FPConvert));
-            SetDelegateInfo(dlgSoftFloat16_64FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat16_64FPConvert>(dlgSoftFloat16_64FPConvert));
-
-            SetDelegateInfo(dlgSoftFloat32FPAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPAdd>(dlgSoftFloat32FPAdd));
-            SetDelegateInfo(dlgSoftFloat32FPAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPAddFpscr>(dlgSoftFloat32FPAddFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPCompare, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompare>(dlgSoftFloat32FPCompare));
-            SetDelegateInfo(dlgSoftFloat32FPCompareEQ, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareEQ>(dlgSoftFloat32FPCompareEQ));
-            SetDelegateInfo(dlgSoftFloat32FPCompareEQFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareEQFpscr>(dlgSoftFloat32FPCompareEQFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPCompareGE, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGE>(dlgSoftFloat32FPCompareGE));
-            SetDelegateInfo(dlgSoftFloat32FPCompareGEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGEFpscr>(dlgSoftFloat32FPCompareGEFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPCompareGT, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGT>(dlgSoftFloat32FPCompareGT));
-            SetDelegateInfo(dlgSoftFloat32FPCompareGTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareGTFpscr>(dlgSoftFloat32FPCompareGTFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPCompareLE, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLE>(dlgSoftFloat32FPCompareLE));
-            SetDelegateInfo(dlgSoftFloat32FPCompareLEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLEFpscr>(dlgSoftFloat32FPCompareLEFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPCompareLT, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLT>(dlgSoftFloat32FPCompareLT));
-            SetDelegateInfo(dlgSoftFloat32FPCompareLTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPCompareLTFpscr>(dlgSoftFloat32FPCompareLTFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPDiv, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPDiv>(dlgSoftFloat32FPDiv));
-            SetDelegateInfo(dlgSoftFloat32FPMax, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMax>(dlgSoftFloat32FPMax));
-            SetDelegateInfo(dlgSoftFloat32FPMaxFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxFpscr>(dlgSoftFloat32FPMaxFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMaxNum, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxNum>(dlgSoftFloat32FPMaxNum));
-            SetDelegateInfo(dlgSoftFloat32FPMaxNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMaxNumFpscr>(dlgSoftFloat32FPMaxNumFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMin, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMin>(dlgSoftFloat32FPMin));
-            SetDelegateInfo(dlgSoftFloat32FPMinFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinFpscr>(dlgSoftFloat32FPMinFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMinNum, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinNum>(dlgSoftFloat32FPMinNum));
-            SetDelegateInfo(dlgSoftFloat32FPMinNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMinNumFpscr>(dlgSoftFloat32FPMinNumFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMul, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMul>(dlgSoftFloat32FPMul));
-            SetDelegateInfo(dlgSoftFloat32FPMulFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulFpscr>(dlgSoftFloat32FPMulFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulAdd>(dlgSoftFloat32FPMulAdd));
-            SetDelegateInfo(dlgSoftFloat32FPMulAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulAddFpscr>(dlgSoftFloat32FPMulAddFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulSub>(dlgSoftFloat32FPMulSub));
-            SetDelegateInfo(dlgSoftFloat32FPMulSubFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulSubFpscr>(dlgSoftFloat32FPMulSubFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPMulX, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPMulX>(dlgSoftFloat32FPMulX));
-            SetDelegateInfo(dlgSoftFloat32FPNegMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPNegMulAdd>(dlgSoftFloat32FPNegMulAdd));
-            SetDelegateInfo(dlgSoftFloat32FPNegMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPNegMulSub>(dlgSoftFloat32FPNegMulSub));
-            SetDelegateInfo(dlgSoftFloat32FPRecipEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipEstimate>(dlgSoftFloat32FPRecipEstimate));
-            SetDelegateInfo(dlgSoftFloat32FPRecipEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipEstimateFpscr>(dlgSoftFloat32FPRecipEstimateFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPRecipStep, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipStep>(dlgSoftFloat32FPRecipStep)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPRecipStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecipStepFused>(dlgSoftFloat32FPRecipStepFused));
-            SetDelegateInfo(dlgSoftFloat32FPRecpX, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRecpX>(dlgSoftFloat32FPRecpX));
-            SetDelegateInfo(dlgSoftFloat32FPRSqrtEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtEstimate>(dlgSoftFloat32FPRSqrtEstimate));
-            SetDelegateInfo(dlgSoftFloat32FPRSqrtEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtEstimateFpscr>(dlgSoftFloat32FPRSqrtEstimateFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPRSqrtStep, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtStep>(dlgSoftFloat32FPRSqrtStep)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat32FPRSqrtStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPRSqrtStepFused>(dlgSoftFloat32FPRSqrtStepFused));
-            SetDelegateInfo(dlgSoftFloat32FPSqrt, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPSqrt>(dlgSoftFloat32FPSqrt));
-            SetDelegateInfo(dlgSoftFloat32FPSub, Marshal.GetFunctionPointerForDelegate<SoftFloat32FPSub>(dlgSoftFloat32FPSub));
-
-            SetDelegateInfo(dlgSoftFloat32_16FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat32_16FPConvert>(dlgSoftFloat32_16FPConvert));
-
-            SetDelegateInfo(dlgSoftFloat64FPAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPAdd>(dlgSoftFloat64FPAdd));
-            SetDelegateInfo(dlgSoftFloat64FPAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPAddFpscr>(dlgSoftFloat64FPAddFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPCompare, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompare>(dlgSoftFloat64FPCompare));
-            SetDelegateInfo(dlgSoftFloat64FPCompareEQ, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareEQ>(dlgSoftFloat64FPCompareEQ));
-            SetDelegateInfo(dlgSoftFloat64FPCompareEQFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareEQFpscr>(dlgSoftFloat64FPCompareEQFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPCompareGE, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGE>(dlgSoftFloat64FPCompareGE));
-            SetDelegateInfo(dlgSoftFloat64FPCompareGEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGEFpscr>(dlgSoftFloat64FPCompareGEFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPCompareGT, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGT>(dlgSoftFloat64FPCompareGT));
-            SetDelegateInfo(dlgSoftFloat64FPCompareGTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareGTFpscr>(dlgSoftFloat64FPCompareGTFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPCompareLE, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLE>(dlgSoftFloat64FPCompareLE));
-            SetDelegateInfo(dlgSoftFloat64FPCompareLEFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLEFpscr>(dlgSoftFloat64FPCompareLEFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPCompareLT, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLT>(dlgSoftFloat64FPCompareLT));
-            SetDelegateInfo(dlgSoftFloat64FPCompareLTFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPCompareLTFpscr>(dlgSoftFloat64FPCompareLTFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPDiv, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPDiv>(dlgSoftFloat64FPDiv));
-            SetDelegateInfo(dlgSoftFloat64FPMax, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMax>(dlgSoftFloat64FPMax));
-            SetDelegateInfo(dlgSoftFloat64FPMaxFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxFpscr>(dlgSoftFloat64FPMaxFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMaxNum, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxNum>(dlgSoftFloat64FPMaxNum));
-            SetDelegateInfo(dlgSoftFloat64FPMaxNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMaxNumFpscr>(dlgSoftFloat64FPMaxNumFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMin, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMin>(dlgSoftFloat64FPMin));
-            SetDelegateInfo(dlgSoftFloat64FPMinFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinFpscr>(dlgSoftFloat64FPMinFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMinNum, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinNum>(dlgSoftFloat64FPMinNum));
-            SetDelegateInfo(dlgSoftFloat64FPMinNumFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMinNumFpscr>(dlgSoftFloat64FPMinNumFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMul, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMul>(dlgSoftFloat64FPMul));
-            SetDelegateInfo(dlgSoftFloat64FPMulFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulFpscr>(dlgSoftFloat64FPMulFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulAdd>(dlgSoftFloat64FPMulAdd));
-            SetDelegateInfo(dlgSoftFloat64FPMulAddFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulAddFpscr>(dlgSoftFloat64FPMulAddFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulSub>(dlgSoftFloat64FPMulSub));
-            SetDelegateInfo(dlgSoftFloat64FPMulSubFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulSubFpscr>(dlgSoftFloat64FPMulSubFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPMulX, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPMulX>(dlgSoftFloat64FPMulX));
-            SetDelegateInfo(dlgSoftFloat64FPNegMulAdd, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPNegMulAdd>(dlgSoftFloat64FPNegMulAdd));
-            SetDelegateInfo(dlgSoftFloat64FPNegMulSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPNegMulSub>(dlgSoftFloat64FPNegMulSub));
-            SetDelegateInfo(dlgSoftFloat64FPRecipEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipEstimate>(dlgSoftFloat64FPRecipEstimate));
-            SetDelegateInfo(dlgSoftFloat64FPRecipEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipEstimateFpscr>(dlgSoftFloat64FPRecipEstimateFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPRecipStep, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipStep>(dlgSoftFloat64FPRecipStep)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPRecipStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecipStepFused>(dlgSoftFloat64FPRecipStepFused));
-            SetDelegateInfo(dlgSoftFloat64FPRecpX, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRecpX>(dlgSoftFloat64FPRecpX));
-            SetDelegateInfo(dlgSoftFloat64FPRSqrtEstimate, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtEstimate>(dlgSoftFloat64FPRSqrtEstimate));
-            SetDelegateInfo(dlgSoftFloat64FPRSqrtEstimateFpscr, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtEstimateFpscr>(dlgSoftFloat64FPRSqrtEstimateFpscr)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPRSqrtStep, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtStep>(dlgSoftFloat64FPRSqrtStep)); // A32 only.
-            SetDelegateInfo(dlgSoftFloat64FPRSqrtStepFused, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPRSqrtStepFused>(dlgSoftFloat64FPRSqrtStepFused));
-            SetDelegateInfo(dlgSoftFloat64FPSqrt, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPSqrt>(dlgSoftFloat64FPSqrt));
-            SetDelegateInfo(dlgSoftFloat64FPSub, Marshal.GetFunctionPointerForDelegate<SoftFloat64FPSub>(dlgSoftFloat64FPSub));
-
-            SetDelegateInfo(dlgSoftFloat64_16FPConvert, Marshal.GetFunctionPointerForDelegate<SoftFloat64_16FPConvert>(dlgSoftFloat64_16FPConvert));
+            SetDelegateInfo(typeof(SoftFloat64_16).GetMethod(nameof(SoftFloat64_16.FPConvert)));
        }
-
-        private delegate double MathAbs(double value);
-        private delegate double MathCeiling(double a);
-        private delegate double MathFloor(double d);
-        private delegate double MathRound(double value, MidpointRounding mode);
-        private delegate double MathTruncate(double d);
-
-        private delegate float MathFAbs(float x);
-        private delegate float MathFCeiling(float x);
-        private delegate float MathFFloor(float x);
-        private delegate float MathFRound(float x, MidpointRounding mode);
-        private delegate float MathFTruncate(float x);
-
-        private delegate void NativeInterfaceBreak(ulong address, int imm);
-        private delegate bool NativeInterfaceCheckSynchronization();
-        private delegate void NativeInterfaceEnqueueForRejit(ulong address);
-        private delegate ulong NativeInterfaceGetCntfrqEl0();
-        private delegate ulong NativeInterfaceGetCntpctEl0();
-        private delegate ulong NativeInterfaceGetCntvctEl0();
-        private delegate ulong NativeInterfaceGetCtrEl0();
-        private delegate ulong NativeInterfaceGetDczidEl0();
-        private delegate ulong NativeInterfaceGetFunctionAddress(ulong address);
-        private delegate void NativeInterfaceInvalidateCacheLine(ulong address);
-        private delegate byte NativeInterfaceReadByte(ulong address);
-        private delegate ushort NativeInterfaceReadUInt16(ulong address);
-        private delegate uint NativeInterfaceReadUInt32(ulong address);
-        private delegate ulong NativeInterfaceReadUInt64(ulong address);
-        private delegate V128 NativeInterfaceReadVector128(ulong address);
-        private delegate void NativeInterfaceSignalMemoryTracking(ulong address, ulong size, bool write);
-        private delegate void NativeInterfaceSupervisorCall(ulong address, int imm);
-        private delegate void NativeInterfaceThrowInvalidMemoryAccess(ulong address);
-        private delegate void NativeInterfaceUndefined(ulong address, int opCode);
-        private delegate void NativeInterfaceWriteByte(ulong address, byte value);
-        private delegate void NativeInterfaceWriteUInt16(ulong address, ushort value);
-        private delegate void NativeInterfaceWriteUInt32(ulong address, uint value);
-        private delegate void NativeInterfaceWriteUInt64(ulong address, ulong value);
-        private delegate void NativeInterfaceWriteVector128(ulong address, V128 value);
-
-        private delegate ulong SoftFallbackCountLeadingSigns(ulong value, int size);
-        private delegate ulong SoftFallbackCountLeadingZeros(ulong value, int size);
-        private delegate uint SoftFallbackCrc32b(uint crc, byte value);
-        private delegate uint SoftFallbackCrc32cb(uint crc, byte value);
-        private delegate uint SoftFallbackCrc32ch(uint crc, ushort value);
-        private delegate uint SoftFallbackCrc32cw(uint crc, uint value);
-        private delegate uint SoftFallbackCrc32cx(uint crc, ulong value);
-        private delegate uint SoftFallbackCrc32h(uint crc, ushort value);
-        private delegate uint SoftFallbackCrc32w(uint crc, uint value);
-        private delegate uint SoftFallbackCrc32x(uint crc, ulong value);
-        private delegate V128 SoftFallbackDecrypt(V128 value, V128 roundKey);
-        private delegate V128 SoftFallbackEncrypt(V128 value, V128 roundKey);
-        private delegate uint SoftFallbackFixedRotate(uint hash_e);
-        private delegate V128 SoftFallbackHashChoose(V128 hash_abcd, uint hash_e, V128 wk);
-        private delegate V128 SoftFallbackHashLower(V128 hash_abcd, V128 hash_efgh, V128 wk);
-        private delegate V128 SoftFallbackHashMajority(V128 hash_abcd, uint hash_e, V128 wk);
-        private delegate V128 SoftFallbackHashParity(V128 hash_abcd, uint hash_e, V128 wk);
-        private delegate V128 SoftFallbackHashUpper(V128 hash_abcd, V128 hash_efgh, V128 wk);
-        private delegate V128 SoftFallbackInverseMixColumns(V128 value);
-        private delegate V128 SoftFallbackMixColumns(V128 value);
-        private delegate V128 SoftFallbackPolynomialMult64_128(ulong op1, ulong op2);
-        private delegate int SoftFallbackSatF32ToS32(float value);
-        private delegate long SoftFallbackSatF32ToS64(float value);
-        private delegate uint SoftFallbackSatF32ToU32(float value);
-        private delegate ulong SoftFallbackSatF32ToU64(float value);
-        private delegate int SoftFallbackSatF64ToS32(double value);
-        private delegate long SoftFallbackSatF64ToS64(double value);
-        private delegate uint SoftFallbackSatF64ToU32(double value);
-        private delegate ulong SoftFallbackSatF64ToU64(double value);
-        private delegate V128 SoftFallbackSha1SchedulePart1(V128 w0_3, V128 w4_7, V128 w8_11);
-        private delegate V128 SoftFallbackSha1SchedulePart2(V128 tw0_3, V128 w12_15);
-        private delegate V128 SoftFallbackSha256SchedulePart1(V128 w0_3, V128 w4_7);
-        private delegate V128 SoftFallbackSha256SchedulePart2(V128 w0_3, V128 w8_11, V128 w12_15);
-        private delegate long SoftFallbackSignedShrImm64(long value, long roundConst, int shift);
-        private delegate V128 SoftFallbackTbl1(V128 vector, int bytes, V128 tb0);
-        private delegate V128 SoftFallbackTbl2(V128 vector, int bytes, V128 tb0, V128 tb1);
-        private delegate V128 SoftFallbackTbl3(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2);
-        private delegate V128 SoftFallbackTbl4(V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3);
-        private delegate V128 SoftFallbackTbx1(V128 dest, V128 vector, int bytes, V128 tb0);
-        private delegate V128 SoftFallbackTbx2(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1);
-        private delegate V128 SoftFallbackTbx3(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2);
-        private delegate V128 SoftFallbackTbx4(V128 dest, V128 vector, int bytes, V128 tb0, V128 tb1, V128 tb2, V128 tb3);
-        private delegate ulong SoftFallbackUnsignedShrImm64(ulong value, long roundConst, int shift);
-
-        private delegate float SoftFloat16_32FPConvert(ushort valueBits);
-
-        private delegate double SoftFloat16_64FPConvert(ushort valueBits);
-
-        private delegate float SoftFloat32FPAdd(float value1, float value2);
-        private delegate float SoftFloat32FPAddFpscr(float value1, float value2, bool standardFpscr);
-        private delegate int SoftFloat32FPCompare(float value1, float value2, bool signalNaNs);
-        private delegate float SoftFloat32FPCompareEQ(float value1, float value2);
-        private delegate float SoftFloat32FPCompareEQFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPCompareGE(float value1, float value2);
-        private delegate float SoftFloat32FPCompareGEFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPCompareGT(float value1, float value2);
-        private delegate float SoftFloat32FPCompareGTFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPCompareLE(float value1, float value2);
-        private delegate float SoftFloat32FPCompareLEFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPCompareLT(float value1, float value2);
-        private delegate float SoftFloat32FPCompareLTFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPDiv(float value1, float value2);
-        private delegate float SoftFloat32FPMax(float value1, float value2);
-        private delegate float SoftFloat32FPMaxFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMaxNum(float value1, float value2);
-        private delegate float SoftFloat32FPMaxNumFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMin(float value1, float value2);
-        private delegate float SoftFloat32FPMinFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMinNum(float value1, float value2);
-        private delegate float SoftFloat32FPMinNumFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMul(float value1, float value2);
-        private delegate float SoftFloat32FPMulFpscr(float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMulAdd(float valueA, float value1, float value2);
-        private delegate float SoftFloat32FPMulAddFpscr(float valueA, float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMulSub(float valueA, float value1, float value2);
-        private delegate float SoftFloat32FPMulSubFpscr(float valueA, float value1, float value2, bool standardFpscr);
-        private delegate float SoftFloat32FPMulX(float value1, float value2);
-        private delegate float SoftFloat32FPNegMulAdd(float valueA, float value1, float value2);
-        private delegate float SoftFloat32FPNegMulSub(float valueA, float value1, float value2);
-        private delegate float SoftFloat32FPRecipEstimate(float value);
-        private delegate float SoftFloat32FPRecipEstimateFpscr(float value, bool standardFpscr);
-        private delegate float SoftFloat32FPRecipStep(float value1, float value2);
-        private delegate float SoftFloat32FPRecipStepFused(float value1, float value2);
-        private delegate float SoftFloat32FPRecpX(float value);
-        private delegate float SoftFloat32FPRSqrtEstimate(float value);
-        private delegate float SoftFloat32FPRSqrtEstimateFpscr(float value, bool standardFpscr);
-        private delegate float SoftFloat32FPRSqrtStep(float value1, float value2);
-        private delegate float SoftFloat32FPRSqrtStepFused(float value1, float value2);
-        private delegate float SoftFloat32FPSqrt(float value);
-        private delegate float SoftFloat32FPSub(float value1, float value2);
-
-        private delegate ushort SoftFloat32_16FPConvert(float value);
-
-        private delegate double SoftFloat64FPAdd(double value1, double value2);
-        private delegate double SoftFloat64FPAddFpscr(double value1, double value2, bool standardFpscr);
-        private delegate int SoftFloat64FPCompare(double value1, double value2, bool signalNaNs);
-        private delegate double SoftFloat64FPCompareEQ(double value1, double value2);
-        private delegate double SoftFloat64FPCompareEQFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPCompareGE(double value1, double value2);
-        private delegate double SoftFloat64FPCompareGEFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPCompareGT(double value1, double value2);
-        private delegate double SoftFloat64FPCompareGTFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPCompareLE(double value1, double value2);
-        private delegate double SoftFloat64FPCompareLEFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPCompareLT(double value1, double value2);
-        private delegate double SoftFloat64FPCompareLTFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPDiv(double value1, double value2);
-        private delegate double SoftFloat64FPMax(double value1, double value2);
-        private delegate double SoftFloat64FPMaxFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMaxNum(double value1, double value2);
-        private delegate double SoftFloat64FPMaxNumFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMin(double value1, double value2);
-        private delegate double SoftFloat64FPMinFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMinNum(double value1, double value2);
-        private delegate double SoftFloat64FPMinNumFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMul(double value1, double value2);
-        private delegate double SoftFloat64FPMulFpscr(double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMulAdd(double valueA, double value1, double value2);
-        private delegate double SoftFloat64FPMulAddFpscr(double valueA, double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMulSub(double valueA, double value1, double value2);
-        private delegate double SoftFloat64FPMulSubFpscr(double valueA, double value1, double value2, bool standardFpscr);
-        private delegate double SoftFloat64FPMulX(double value1, double value2);
-        private delegate double SoftFloat64FPNegMulAdd(double valueA, double value1, double value2);
-        private delegate double SoftFloat64FPNegMulSub(double valueA, double value1, double value2);
-        private delegate double SoftFloat64FPRecipEstimate(double value);
-        private delegate double SoftFloat64FPRecipEstimateFpscr(double value, bool standardFpscr);
-        private delegate double SoftFloat64FPRecipStep(double value1, double value2);
-        private delegate double SoftFloat64FPRecipStepFused(double value1, double value2);
-        private delegate double SoftFloat64FPRecpX(double value);
-        private delegate double SoftFloat64FPRSqrtEstimate(double value);
-        private delegate double SoftFloat64FPRSqrtEstimateFpscr(double value, bool standardFpscr);
-        private delegate double SoftFloat64FPRSqrtStep(double value1, double value2);
-        private delegate double SoftFloat64FPRSqrtStepFused(double value1, double value2);
-        private delegate double SoftFloat64FPSqrt(double value);
-        private delegate double SoftFloat64FPSub(double value1, double value2);
-
-        private delegate ushort SoftFloat64_16FPConvert(double value);
    }
 }
--- a/src/ARMeilleure/Translation/EmitterContext.cs
+++ b/src/ARMeilleure/Translation/EmitterContext.cs
@@ -97,7 +97,7 @@ namespace ARMeilleure.Translation

        public virtual Operand Call(MethodInfo info, params Operand[] callArgs)
        {
-            nint funcPtr = Delegates.GetDelegateFuncPtr(info);
+            nint funcPtr = info.MethodHandle.GetFunctionPointer();

            OperandType returnType = GetOperandType(info.ReturnType);

--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -29,8 +29,8 @@ namespace ARMeilleure.Translation.PTC
    {
        private const string OuterHeaderMagicString = "PTCohd\0\0";
        private const string InnerHeaderMagicString = "PTCihd\0\0";
-
-        private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.
+        
+        private const uint InternalVersion = 6998; //! To be incremented manually for each change to the ARMeilleure project.

        private const string ActualDir = "0";
        private const string BackupDir = "1";
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHack.cs
@@ -25,7 +25,7 @@ namespace Ryujinx.Common.Configuration
        {
            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
            if (unpackedFields is not [var hack, var value])
-                throw new ArgumentException(nameof(packedHack));
+                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
            
            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
        }
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
@@ -78,5 +78,10 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
        /// Controller Rumble Settings
        /// </summary>
        public RumbleConfigController Rumble { get; set; }
+        
+        /// <summary>
+        /// Controller LED Settings
+        /// </summary>
+        public LedConfigController Led { get; set; }
    }
 }
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/LedConfigController.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/LedConfigController.cs
@@ -0,0 +1,25 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+    public class LedConfigController
+    {
+        /// <summary>
+        /// Enable LED color changing by the emulator
+        /// </summary>
+        public bool EnableLed { get; set; }
+        
+        /// <summary>
+        /// Ignores the color and disables the LED entirely.
+        /// </summary>
+        public bool TurnOffLed { get; set; }
+        
+        /// <summary>
+        /// Ignores the color and uses the rainbow color functionality for the LED.
+        /// </summary>
+        public bool UseRainbow { get; set; }
+        
+        /// <summary>
+        ///     Packed RGB int of the color
+        /// </summary>
+        public uint LedColor { get; set; }
+    }
+}
--- a/src/Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
+++ b/src/Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
@@ -1,33 +1,13 @@
-using Ryujinx.Common.Utilities;
 using System;

 namespace Ryujinx.Common.GraphicsDriver
 {
    public static class DriverUtilities
    {
-        private static void AddMesaFlags(string envVar, string newFlags)
-        {
-            string existingFlags = Environment.GetEnvironmentVariable(envVar);
-
-            string flags = existingFlags == null ? newFlags : $"{existingFlags},{newFlags}";
-
-            OsUtils.SetEnvironmentVariableNoCaching(envVar, flags);
-        }
-
-        public static void InitDriverConfig(bool oglThreading)
-        {
-            if (OperatingSystem.IsLinux())
-            {
-                AddMesaFlags("RADV_DEBUG", "nodcc");
-            }
-
-            ToggleOGLThreading(oglThreading);
-        }
-
        public static void ToggleOGLThreading(bool enabled)
        {
-            OsUtils.SetEnvironmentVariableNoCaching("mesa_glthread", enabled.ToString().ToLower());
-            OsUtils.SetEnvironmentVariableNoCaching("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");
+            Environment.SetEnvironmentVariable("mesa_glthread", enabled.ToString().ToLower());
+            Environment.SetEnvironmentVariable("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");

            try
            {
--- a/src/Ryujinx.Common/Helpers/RunningPlatform.cs
+++ b/src/Ryujinx.Common/Helpers/RunningPlatform.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.InteropServices;
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable InconsistentNaming
+
+namespace Ryujinx.Common.Helper
+{
+    public static class RunningPlatform
+    {
+        public static bool IsMacOS => OperatingSystem.IsMacOS();
+        public static bool IsWindows => OperatingSystem.IsWindows();
+        public static bool IsLinux => OperatingSystem.IsLinux();
+
+        public static bool IsIntelMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.X64;
+        public static bool IsArmMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.Arm64;
+        
+        public static bool IsX64Windows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.X64);
+        public static bool IsArmWindows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
+        
+        public static bool IsX64Linux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.X64);
+        public static bool IsArmLinux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
+    }
+}
--- a/src/Ryujinx.Common/RyujinxException.cs
+++ b/src/Ryujinx.Common/RyujinxException.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Ryujinx.Common
+{
+    public class RyujinxException : Exception
+    {
+        public RyujinxException(string message) : base(message)
+        { }
+    }
+}
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -1,5 +1,6 @@
-using Gommon;
+using Gommon;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Helper;
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -8,19 +9,20 @@ namespace Ryujinx.Common
 {
    public static class TitleIDs
    {
-        public static ReactiveObject<Optional<string>> CurrentApplication { get; set; } = new();
+        public static ReactiveObject<Optional<string>> CurrentApplication { get; } = new();
        
        public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
        {
            switch (currentBackend)
            {
+                case GraphicsBackend.Metal when !OperatingSystem.IsMacOS():
                case GraphicsBackend.OpenGl when OperatingSystem.IsMacOS():
                    return GraphicsBackend.Vulkan;
                case GraphicsBackend.Vulkan or GraphicsBackend.OpenGl or GraphicsBackend.Metal:
                    return currentBackend;
            }

-            if (!(OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture is Architecture.Arm64))
+            if (!RunningPlatform.IsArmMac)
                return GraphicsBackend.Vulkan;

            return GreatMetalTitles.ContainsIgnoreCase(titleId) ? GraphicsBackend.Metal : GraphicsBackend.Vulkan;
@@ -28,18 +30,28 @@ namespace Ryujinx.Common
        
        public static readonly string[] GreatMetalTitles =
        [
-            "01006f8002326000", // Animal Crossings: New Horizons
-            "01009bf0072d4000", // Captain Toad: Treasure Tracker
+            "010076f0049a2000", // Bayonetta
            "0100a5c00d162000", // Cuphead
            "010023800d64a000", // Deltarune
+            "01003a30012c0000", // LEGO City Undercover
            "010028600EBDA000", // Mario 3D World
            "0100152000022000", // Mario Kart 8 Deluxe
-            "01005CA01580E000", // Persona 5
-            "0100187003A36000", // Pokémon: Let's Go, Evoli!
+            "010075a016a3a000", // Persona 4 Arena Ultimax
+            "0100187003A36000", // Pokémon: Let's Go, Eevee!
            "010003f003a34000", // Pokémon: Let's Go, Pikachu!
            "01008C0016544000", // Sea of Stars
            "01006A800016E000", // Smash Ultimate
-            "0100000000010000", // Super Mario Odyessy
+            "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
+
+            // These ones have small issues, but those happen on Vulkan as well:
+            "01006f8002326000", // Animal Crossings: New Horizons
+            "01009bf0072d4000", // Captain Toad: Treasure Tracker
+            "01009510001ca000", // Fast RMX
+            "01005CA01580E000", // Persona 5 Royale
+            "0100000000010000", // Super Mario Odyssey
+
+            //Isaac claims it has a issue in level 2, but I am not able to replicate it on my M3. More testing would be appreciated:
+            "010015100b514000", // Super Mario Bros. Wonder
        ];
        
        public static string GetDiscordGameAsset(string titleId) 
@@ -47,93 +59,117 @@ namespace Ryujinx.Common

        public static readonly string[] DiscordGameAssetKeys =
        [
-            "010055d009f78000", // Fire Emblem: Three Houses
-            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+                //All games are in Alphabetical order by Game name.
+            
+                          //Dragon Quest Franchise
+            "010008900705c000", // Dragon Quest Builders
+            "010042000a986000", // Dragon Quest Builders 2
+            
+                          //Fire Emblem Franchise
            "0100a6301214e000", // Fire Emblem Engage
+            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+            "010055d009f78000", // Fire Emblem: Three Houses
            "0100f15003e64000", // Fire Emblem Warriors
            "010071f0143ea000", // Fire Emblem Warriors: Three Hopes
-
-            "01007e3006dda000", // Kirby Star Allies
+ 
+                          //Kirby Franchise
            "01004d300c5ae000", // Kirby and the Forgotten Land
-            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
-            "01003fb00c5a8000", // Super Kirby Clash
-            "0100227010460000", // Kirby Fighters 2
            "0100a8e016236000", // Kirby's Dream Buffet
-
+            "0100227010460000", // Kirby Fighters 2
+            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
+            "01007e3006dda000", // Kirby Star Allies
+            "01003fb00c5a8000", // Super Kirby Clash
+            
+            
+                          //The Zelda Franchise
+            "01000b900d8b0000", // Cadence of Hyrule
+            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
+            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
            "01007ef00011e000", // The Legend of Zelda: Breath of the Wild
            "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
            "01002da013484000", // The Legend of Zelda: Skyward Sword HD
            "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
            "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
-            "01000b900d8b0000", // Cadence of Hyrule
-            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
-            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
+            

+                          //Luigi Franchise
            "010048701995e000", // Luigi's Mansion 2 HD
            "0100dca0064a6000", // Luigi's Mansion 3

+                          //Metroid Franchise
            "010093801237c000", // Metroid Dread
            "010012101468c000", // Metroid Prime Remastered

-            "0100000000010000", // SUPER MARIO ODYSSEY
-            "0100ea80032ea000", // Super Mario Bros. U Deluxe
-            "01009b90006dc000", // Super Mario Maker 2
-            "010049900f546000", // Super Mario 3D All-Stars
-            "010049900F546001", // ^ 64
-            "010049900F546002", // ^ Sunshine
-            "010049900F546003", // ^ Galaxy
-            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
-            "010015100b514000", // Super Mario Bros. Wonder
-            "0100152000022000", // Mario Kart 8 Deluxe
-            "010036b0034e4000", // Super Mario Party
-            "01006fe013472000", // Mario Party Superstars
-            "0100965017338000", // Super Mario Party Jamboree
+                          //Monster Hunter Franchise
+            "0100770008dd8000", // Monster Hunter Generations Ultimate
+            "0100b04011742000", // Monster Hunter Rise 
+                          
+                          //Mario Franchise
            "01006d0017f7a000", // Mario & Luigi: Brothership
+            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
            "010067300059a000", // Mario + Rabbids: Kingdom Battle
            "0100317013770000", // Mario + Rabbids: Sparks of Hope
+            "0100c9c00e25c000", // Mario Golf: Super Rush
+            "0100152000022000", // Mario Kart 8 Deluxe
+            "01006fe013472000", // Mario Party Superstars
+            "010019401051c000", // Mario Strikers: Battle League
+            "0100bde00862a000", // Mario Tennis Aces
+            "0100b99019412000", // Mario vs. Donkey Kong
+            "010049900f546000", // Super Mario 3D All-Stars
+            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
+            "010049900F546001", // Super Mario 64
+            "0100ea80032ea000", // Super Mario Bros. U Deluxe
+            "010015100b514000", // Super Mario Bros. Wonder
+            "010049900F546003", // Super Mario Galaxy
+            "01009b90006dc000", // Super Mario Maker 2
+            "0100000000010000", // SUPER MARIO ODYSSEY
+            "010036b0034e4000", // Super Mario Party
+            "0100965017338000", // Super Mario Party Jamboree
+            "0100bc0018138000", // Super Mario RPG
+            "010049900F546002", // Super Mario Sunshine
            "0100a3900c3e2000", // Paper Mario: The Origami King
            "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "0100bc0018138000", // Super Mario RPG
-            "0100bde00862a000", // Mario Tennis Aces
-            "0100c9c00e25c000", // Mario Golf: Super Rush
-            "010019401051c000", // Mario Strikers: Battle League
-            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
-            "0100b99019412000", // Mario vs. Donkey Kong

+                          //Pikmin Franchise
            "0100aa80194b0000", // Pikmin 1
            "0100d680194b2000", // Pikmin 2
            "0100f4c009322000", // Pikmin 3 Deluxe
            "0100b7c00933a000", // Pikmin 4

-            "010003f003a34000", // Pokémon: Let's Go Pikachu!
-            "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "0100abf008968000", // Pokémon Sword
-            "01008db008c2c000", // Pokémon Shield
+                          //The Pokémon Franchise
+            "0100f4300bf2c000", // New Pokémon Snap
            "0100000011d90000", // Pokémon Brilliant Diamond
-            "010018e011d92000", // Pokémon Shining Pearl
            "01001f5010dfa000", // Pokémon Legends: Arceus
+            "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
            "0100a3d008c5c000", // Pokémon Scarlet
+            "01008db008c2c000", // Pokémon Shield
+            "010018e011d92000", // Pokémon Shining Pearl
+            "0100abf008968000", // Pokémon Sword
            "01008f6008c5e000", // Pokémon Violet
            "0100b3f000be2000", // Pokkén Tournament DX
-            "0100f4300bf2c000", // New Pokémon Snap
+            "0100187003a36000", // Pokémon: Let's Go Eevee!
+            "010003f003a34000", // Pokémon: Let's Go Pikachu!

-            "01003bc0000a0000", // Splatoon 2 (US)
+                          //Splatoon Franchise
            "0100f8f0000a2000", // Splatoon 2 (EU)
            "01003c700009c000", // Splatoon 2 (JP)
+            "01003bc0000a0000", // Splatoon 2 (US)
            "0100c2500fc20000", // Splatoon 3
            "0100ba0018500000", // Splatoon 3: Splatfest World Premiere

-            "010040600c5ce000", // Tetris 99
-            "0100277011f1a000", // Super Mario Bros. 35
-            "0100ad9012510000", // PAC-MAN 99
+                          //NSO Membership games
            "0100ccf019c8c000", // F-ZERO 99
-            "0100d870045b6000", // NES - Nintendo Switch Online
-            "01008d300c50c000", // SNES - Nintendo Switch Online
-            "0100c9a00ece6000", // N64 - Nintendo Switch Online
-            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
            "0100c62011050000", // GB - Nintendo Switch Online
            "010012f017576000", // GBA - Nintendo Switch Online
+            "0100c9a00ece6000", // N64 - Nintendo Switch Online
+            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
+            "0100d870045b6000", // NES - Nintendo Switch Online
+            "0100ad9012510000", // PAC-MAN 99
+            "010040600c5ce000", // Tetris 99
+            "01008d300c50c000", // SNES - Nintendo Switch Online
+            "0100277011f1a000", // Super Mario Bros. 35

+                          //Misc Nintendo 1st party games
            "01000320000cc000", // 1-2 Switch
            "0100300012f2a000", // Advance Wars 1+2: Re-Boot Camp
            "01006f8002326000", // Animal Crossing: New Horizons
@@ -148,32 +184,44 @@ namespace Ryujinx.Common
            "01006a800016e000", // Super Smash Bros. Ultimate
            "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore

+                          //Bayonetta Franchise
            "010076f0049a2000", // Bayonetta
            "01007960049a0000", // Bayonetta 2
            "01004a4010fea000", // Bayonetta 3
            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon

+                          //Persona Franchise
            "0100dcd01525a000", // Persona 3 Portable
-            "010062b01525c000", // Persona 4 Golden
            "010075a016a3a000", // Persona 4 Arena Ultimax
+            "010062b01525c000", // Persona 4 Golden
            "01005ca01580e000", // Persona 5 Royal
            "0100801011c3e000", // Persona 5 Strikers
            "010087701b092000", // Persona 5 Tactica

-            "01009aa000faa000", // Sonic Mania
+                          //Sonic Franchise
            "01004ad014bf0000", // Sonic Frontiers
+            "01009aa000faa000", // Sonic Mania
            "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
            "01005ea01c0fc001", // ^

+                          //Xenoblade Franchise
+            "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
+            "0100e95004038000", // Xenoblade Chronicles 2
+            "010074f013262000", // Xenoblade Chronicles 3
+
+                          //Misc Games
            "010056e00853a000", // A Hat in Time
+            "0100fd1014726000", // Baldurs Gate: Dark Alliance
            "0100dbf01000a000", // Burnout Paradise Remastered
            "0100744001588000", // Cars 3: Driven to Win
            "0100b41013c82000", // Cruis'n Blast
+            "010085900337e000", // Death Squared
            "01001b300b9be000", // Diablo III: Eternal Collection
            "01008c8012920000", // Dying Light Platinum Edition
+            "01001cc01b2d4000", // Goat Simulator 3
+            "01003620068ea000", // Hand of Fate 2
+            "010085500130a000", // Lego City: Undercover
            "010073c01af34000", // LEGO Horizon Adventures
-            "0100770008dd8000", // Monster Hunter Generations Ultimate
-            "0100b04011742000", // Monster Hunter Rise
            "0100853015e86000", // No Man's Sky
            "01007bb017812000", // Portal
            "0100abd01785c000", // Portal 2
@@ -189,6 +237,8 @@ namespace Ryujinx.Common
            "01000a10041ea000", // The Elder Scrolls V: Skyrim
            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
            "010080b00ad66000", // Undertale
+            "010069401adb8000", // Unicorn Overlord
+            "0100534009ff2000", // Yonder - The cloud catcher chronicles
        ];
    }
 }
--- a/src/Ryujinx.Common/Utilities/OsUtils.cs
+++ b/src/Ryujinx.Common/Utilities/OsUtils.cs
@@ -1,24 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Common.Utilities
-{
-    public partial class OsUtils
-    {
-        [LibraryImport("libc", SetLastError = true)]
-        private static partial int setenv([MarshalAs(UnmanagedType.LPStr)] string name, [MarshalAs(UnmanagedType.LPStr)] string value, int overwrite);
-
-        public static void SetEnvironmentVariableNoCaching(string key, string value)
-        {
-            // Set the value in the cached environment variables, too.
-            Environment.SetEnvironmentVariable(key, value);
-
-            if (!OperatingSystem.IsWindows())
-            {
-                int res = setenv(key, value, 1);
-                Debug.Assert(res != -1);
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Common/Utilities/Rainbow.cs
+++ b/src/Ryujinx.Common/Utilities/Rainbow.cs
@@ -0,0 +1,110 @@
+using Gommon;
+using System;
+using System.Drawing;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Common.Utilities
+{
+    public static class Rainbow
+    {
+        public static bool CyclingEnabled { get; set; }
+
+        public static void Enable()
+        {
+            if (!CyclingEnabled)
+            {
+                CyclingEnabled = true;
+                Executor.ExecuteBackgroundAsync(async () =>
+                {
+                    while (CyclingEnabled)
+                    {
+                        await Task.Delay(15);
+                        Tick();
+                    }
+                });
+            }
+        }
+
+        public static void Disable()
+        {
+            CyclingEnabled = false;
+        }
+        
+        
+        public static float Speed { get; set; } = 1;
+        
+        public static Color Color { get; private set; } = Color.Blue;
+
+        public static void Tick()
+        {
+            Color = HsbToRgb((Color.GetHue() + Speed) / 360);
+            
+            UpdatedHandler.Call(Color.ToArgb());
+        }
+
+        public static void Reset()
+        {
+            Color = Color.Blue;
+            UpdatedHandler.Clear();
+        }
+
+        public static event Action<int> Updated
+        {
+            add => UpdatedHandler.Add(value);
+            remove => UpdatedHandler.Remove(value);
+        }
+
+        internal static Event<int> UpdatedHandler = new();
+
+        private static Color HsbToRgb(float hue, float saturation = 1, float brightness = 1)
+        {
+            int r = 0, g = 0, b = 0;
+            if (saturation == 0)
+            {
+                r = g = b = (int)(brightness * 255.0f + 0.5f);
+            }
+            else
+            {
+                float h = (hue - (float)Math.Floor(hue)) * 6.0f;
+                float f = h - (float)Math.Floor(h);
+                float p = brightness * (1.0f - saturation);
+                float q = brightness * (1.0f - saturation * f);
+                float t = brightness * (1.0f - (saturation * (1.0f - f)));
+                switch ((int)h)
+                {
+                    case 0:
+                        r = (int)(brightness * 255.0f + 0.5f);
+                        g = (int)(t * 255.0f + 0.5f);
+                        b = (int)(p * 255.0f + 0.5f);
+                        break;
+                    case 1:
+                        r = (int)(q * 255.0f + 0.5f);
+                        g = (int)(brightness * 255.0f + 0.5f);
+                        b = (int)(p * 255.0f + 0.5f);
+                        break;
+                    case 2:
+                        r = (int)(p * 255.0f + 0.5f);
+                        g = (int)(brightness * 255.0f + 0.5f);
+                        b = (int)(t * 255.0f + 0.5f);
+                        break;
+                    case 3:
+                        r = (int)(p * 255.0f + 0.5f);
+                        g = (int)(q * 255.0f + 0.5f);
+                        b = (int)(brightness * 255.0f + 0.5f);
+                        break;
+                    case 4:
+                        r = (int)(t * 255.0f + 0.5f);
+                        g = (int)(p * 255.0f + 0.5f);
+                        b = (int)(brightness * 255.0f + 0.5f);
+                        break;
+                    case 5:
+                        r = (int)(brightness * 255.0f + 0.5f);
+                        g = (int)(p * 255.0f + 0.5f);
+                        b = (int)(q * 255.0f + 0.5f);
+                        break;
+                }
+            }
+            return Color.FromArgb(Convert.ToByte(255), Convert.ToByte(r), Convert.ToByte(g), Convert.ToByte(b));
+        }
+    }
+}
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
@@ -367,7 +367,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        {
            try
            {
-                if (_context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
+                if (_context.Capabilities.Api == TargetApi.Metal && _context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
                    Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
                
                AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
@@ -118,7 +118,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
        private static string GetDiskCachePath()
        {
            return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
-                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId.ToLower(), "cache", "shader")
                : null;
        }

--- a/src/Ryujinx.Graphics.Vulkan/BarrierBatch.cs
+++ b/src/Ryujinx.Graphics.Vulkan/BarrierBatch.cs
@@ -32,12 +32,10 @@ namespace Ryujinx.Graphics.Vulkan
            CommandBuffer
        }

-        private bool _feedbackLoopActive;
        private PipelineStageFlags _incoherentBufferWriteStages;
        private PipelineStageFlags _incoherentTextureWriteStages;
        private PipelineStageFlags _extraStages;
        private IncoherentBarrierType _queuedIncoherentBarrier;
-        private bool _queuedFeedbackLoopBarrier;

        public BarrierBatch(VulkanRenderer gd)
        {
@@ -55,6 +53,17 @@ namespace Ryujinx.Graphics.Vulkan
                stages |= PipelineStageFlags.TransformFeedbackBitExt;
            }

+            if (!gd.IsTBDR)
+            {
+                // Desktop GPUs can transform image barriers into memory barriers.
+
+                access |= AccessFlags.DepthStencilAttachmentWriteBit | AccessFlags.ColorAttachmentWriteBit;
+                access |= AccessFlags.DepthStencilAttachmentReadBit | AccessFlags.ColorAttachmentReadBit;
+
+                stages |= PipelineStageFlags.EarlyFragmentTestsBit | PipelineStageFlags.LateFragmentTestsBit;
+                stages |= PipelineStageFlags.ColorAttachmentOutputBit;
+            }
+
            return (access, stages);
        }

@@ -169,34 +178,16 @@ namespace Ryujinx.Graphics.Vulkan
                    }

                    _queuedIncoherentBarrier = IncoherentBarrierType.None;
-                    _queuedFeedbackLoopBarrier = false;
                }
-                else if (_feedbackLoopActive && _queuedFeedbackLoopBarrier)
-                {
-                    // Feedback loop barrier.
-
-                    MemoryBarrier barrier = new MemoryBarrier()
-                    {
-                        SType = StructureType.MemoryBarrier,
-                        SrcAccessMask = AccessFlags.ShaderWriteBit,
-                        DstAccessMask = AccessFlags.ShaderReadBit
-                    };
-
-                    QueueBarrier(barrier, PipelineStageFlags.FragmentShaderBit, PipelineStageFlags.AllGraphicsBit);
-
-                    _queuedFeedbackLoopBarrier = false;
-                }
-
-                _feedbackLoopActive = false;
            }
        }

        public unsafe void Flush(CommandBufferScoped cbs, bool inRenderPass, RenderPassHolder rpHolder, Action endRenderPass)
        {
-            Flush(cbs, null, false, inRenderPass, rpHolder, endRenderPass);
+            Flush(cbs, null, inRenderPass, rpHolder, endRenderPass);
        }

-        public unsafe void Flush(CommandBufferScoped cbs, ShaderCollection program, bool feedbackLoopActive, bool inRenderPass, RenderPassHolder rpHolder, Action endRenderPass)
+        public unsafe void Flush(CommandBufferScoped cbs, ShaderCollection program, bool inRenderPass, RenderPassHolder rpHolder, Action endRenderPass)
        {
            if (program != null)
            {
@@ -204,8 +195,6 @@ namespace Ryujinx.Graphics.Vulkan
                _incoherentTextureWriteStages |= program.IncoherentTextureWriteStages;
            }

-            _feedbackLoopActive |= feedbackLoopActive;
-
            FlushMemoryBarrier(program, inRenderPass);

            if (!inRenderPass && rpHolder != null)
@@ -417,8 +406,6 @@ namespace Ryujinx.Graphics.Vulkan
            {
                _queuedIncoherentBarrier = type;
            }
-
-            _queuedFeedbackLoopBarrier = true;
        }

        public void QueueTextureBarrier()
--- a/src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs
+++ b/src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs
@@ -168,13 +168,15 @@ namespace Ryujinx.Graphics.Vulkan
            return BinarySearch(list, offset, size) >= 0;
        }

-        public readonly IEnumerable<Range> FindOverlaps(int offset, int size)
+        public readonly List<Range> FindOverlaps(int offset, int size)
        {
            var list = _ranges;
            if (list == null)
            {
-                yield break;
+                return null;
            }
+            
+            List<Range> result = null;

            int index = BinarySearch(list, offset, size);

@@ -187,10 +189,12 @@ namespace Ryujinx.Graphics.Vulkan

                do
                {
-                    yield return list[index++];
+                    (result ??= []).Add(list[index++]);
                }
                while (index < list.Count && list[index].OverlapsWith(offset, size));
            }
+
+            return result;
        }

        private static int BinarySearch(List<Range> list, int offset, int size)
--- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
@@ -4,7 +4,6 @@ using Ryujinx.Graphics.Shader;
 using Silk.NET.Vulkan;
 using System;
 using System.Buffers;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using CompareOp = Ryujinx.Graphics.GAL.CompareOp;
@@ -43,15 +42,15 @@ namespace Ryujinx.Graphics.Vulkan
        private record struct TextureRef
        {
            public ShaderStage Stage;
-            public TextureView View;
-            public Auto<DisposableImageView> ImageView;
+            public TextureStorage Storage;
+            public Auto<DisposableImageView> View;
            public Auto<DisposableSampler> Sampler;

-            public TextureRef(ShaderStage stage, TextureView view, Auto<DisposableImageView> imageView, Auto<DisposableSampler> sampler)
+            public TextureRef(ShaderStage stage, TextureStorage storage, Auto<DisposableImageView> view, Auto<DisposableSampler> sampler)
            {
                Stage = stage;
+                Storage = storage;
                View = view;
-                ImageView = imageView;
                Sampler = sampler;
            }
        }
@@ -59,14 +58,14 @@ namespace Ryujinx.Graphics.Vulkan
        private record struct ImageRef
        {
            public ShaderStage Stage;
-            public TextureView View;
-            public Auto<DisposableImageView> ImageView;
+            public TextureStorage Storage;
+            public Auto<DisposableImageView> View;

-            public ImageRef(ShaderStage stage, TextureView view, Auto<DisposableImageView> imageView)
+            public ImageRef(ShaderStage stage, TextureStorage storage, Auto<DisposableImageView> view)
            {
                Stage = stage;
+                Storage = storage;
                View = view;
-                ImageView = imageView;
            }
        }

@@ -124,8 +123,6 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly TextureView _dummyTexture;
        private readonly SamplerHolder _dummySampler;

-        public List<TextureView> FeedbackLoopHazards { get; private set; }
-
        public DescriptorSetUpdater(VulkanRenderer gd, Device device)
        {
            _gd = gd;
@@ -210,15 +207,10 @@ namespace Ryujinx.Graphics.Vulkan
            _templateUpdater = new();
        }

-        public void Initialize(bool isMainPipeline)
+        public void Initialize()
        {
            MemoryOwner<byte> dummyTextureData = MemoryOwner<byte>.RentCleared(4);
            _dummyTexture.SetData(dummyTextureData);
-
-            if (isMainPipeline)
-            {
-                FeedbackLoopHazards = new();
-            }
        }

        private static bool BindingOverlaps(ref DescriptorBufferInfo info, int bindingOffset, int offset, int size)
@@ -281,18 +273,6 @@ namespace Ryujinx.Graphics.Vulkan

        public void InsertBindingBarriers(CommandBufferScoped cbs)
        {
-            if ((FeedbackLoopHazards?.Count ?? 0) > 0)
-            {
-                // Clear existing hazards - they will be rebuilt.
-
-                foreach (TextureView hazard in FeedbackLoopHazards)
-                {
-                    hazard.DecrementHazardUses();
-                }
-
-                FeedbackLoopHazards.Clear();
-            }
-
            foreach (ResourceBindingSegment segment in _program.BindingSegments[PipelineBase.TextureSetIndex])
            {
                if (segment.Type == ResourceType.TextureAndSampler)
@@ -302,7 +282,7 @@ namespace Ryujinx.Graphics.Vulkan
                        for (int i = 0; i < segment.Count; i++)
                        {
                            ref var texture = ref _textureRefs[segment.Binding + i];
-                            texture.View?.PrepareForUsage(cbs, texture.Stage.ConvertToPipelineStageFlags(), FeedbackLoopHazards);
+                            texture.Storage?.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, texture.Stage.ConvertToPipelineStageFlags());
                        }
                    }
                    else
@@ -323,7 +303,7 @@ namespace Ryujinx.Graphics.Vulkan
                        for (int i = 0; i < segment.Count; i++)
                        {
                            ref var image = ref _imageRefs[segment.Binding + i];
-                            image.View?.PrepareForUsage(cbs, image.Stage.ConvertToPipelineStageFlags(), FeedbackLoopHazards);
+                            image.Storage?.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, image.Stage.ConvertToPipelineStageFlags());
                        }
                    }
                    else
@@ -397,12 +377,8 @@ namespace Ryujinx.Graphics.Vulkan
            }
            else if (image is TextureView view)
            {
-                ref ImageRef iRef = ref _imageRefs[binding];
-
-                iRef.View?.ClearUsage(FeedbackLoopHazards);
-                view?.PrepareForUsage(cbs, stage.ConvertToPipelineStageFlags(), FeedbackLoopHazards);
-
-                iRef = new(stage, view, view.GetIdentityImageView());
+                view.Storage.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, stage.ConvertToPipelineStageFlags());
+                _imageRefs[binding] = new(stage, view.Storage, view.GetIdentityImageView());
            }
            else
            {
@@ -500,12 +476,9 @@ namespace Ryujinx.Graphics.Vulkan
            }
            else if (texture is TextureView view)
            {
-                ref TextureRef iRef = ref _textureRefs[binding];
+                view.Storage.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, stage.ConvertToPipelineStageFlags());

-                iRef.View?.ClearUsage(FeedbackLoopHazards);
-                view?.PrepareForUsage(cbs, stage.ConvertToPipelineStageFlags(), FeedbackLoopHazards);
-
-                iRef = new(stage, view, view.GetImageView(), ((SamplerHolder)sampler)?.GetSampler());
+                _textureRefs[binding] = new(stage, view.Storage, view.GetImageView(), ((SamplerHolder)sampler)?.GetSampler());
            }
            else
            {
@@ -527,7 +500,7 @@ namespace Ryujinx.Graphics.Vulkan
            {
                view.Storage.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, stage.ConvertToPipelineStageFlags());

-                _textureRefs[binding] = new(stage, view, view.GetIdentityImageView(), ((SamplerHolder)sampler)?.GetSampler());
+                _textureRefs[binding] = new(stage, view.Storage, view.GetIdentityImageView(), ((SamplerHolder)sampler)?.GetSampler());

                SignalDirty(DirtyFlags.Texture);
            }
@@ -853,7 +826,7 @@ namespace Ryujinx.Graphics.Vulkan
                                ref var texture = ref textures[i];
                                ref var refs = ref _textureRefs[binding + i];

-                                texture.ImageView = refs.ImageView?.Get(cbs).Value ?? default;
+                                texture.ImageView = refs.View?.Get(cbs).Value ?? default;
                                texture.Sampler = refs.Sampler?.Get(cbs).Value ?? default;

                                if (texture.ImageView.Handle == 0)
@@ -903,7 +876,7 @@ namespace Ryujinx.Graphics.Vulkan

                            for (int i = 0; i < count; i++)
                            {
-                                images[i].ImageView = _imageRefs[binding + i].ImageView?.Get(cbs).Value ?? default;
+                                images[i].ImageView = _imageRefs[binding + i].View?.Get(cbs).Value ?? default;
                            }

                            tu.Push<DescriptorImageInfo>(images[..count]);
@@ -974,7 +947,7 @@ namespace Ryujinx.Graphics.Vulkan
                            ref var texture = ref textures[i];
                            ref var refs = ref _textureRefs[binding + i];

-                            texture.ImageView = refs.ImageView?.Get(cbs).Value ?? default;
+                            texture.ImageView = refs.View?.Get(cbs).Value ?? default;
                            texture.Sampler = refs.Sampler?.Get(cbs).Value ?? default;

                            if (texture.ImageView.Handle == 0)
--- a/src/Ryujinx.Graphics.Vulkan/FeedbackLoopAspects.cs
+++ b/src/Ryujinx.Graphics.Vulkan/FeedbackLoopAspects.cs
@@ -1,12 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.Vulkan
-{
-    [Flags]
-    internal enum FeedbackLoopAspects
-    {
-        None = 0,
-        Color = 1 << 0,
-        Depth = 1 << 1,
-    }
-}
--- a/src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs
+++ b/src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs
@@ -302,27 +302,6 @@ namespace Ryujinx.Graphics.Vulkan
            _depthStencil?.Storage?.AddStoreOpUsage(true);
        }

-        public void ClearBindings()
-        {
-            _depthStencil?.Storage.ClearBindings();
-
-            for (int i = 0; i < _colorsCanonical.Length; i++)
-            {
-                _colorsCanonical[i]?.Storage.ClearBindings();
-            }
-        }
-
-        public void AddBindings()
-        {
-            _depthStencil?.Storage.AddBinding(_depthStencil);
-
-            for (int i = 0; i < _colorsCanonical.Length; i++)
-            {
-                TextureView color = _colorsCanonical[i];
-                color?.Storage.AddBinding(color);
-            }
-        }
-
        public (RenderPassHolder rpHolder, Auto<DisposableFramebuffer> framebuffer) GetPassAndFramebuffer(
            VulkanRenderer gd,
            Device device,
--- a/src/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs
+++ b/src/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs
@@ -46,8 +46,6 @@ namespace Ryujinx.Graphics.Vulkan
        public readonly bool SupportsViewportArray2;
        public readonly bool SupportsHostImportedMemory;
        public readonly bool SupportsDepthClipControl;
-        public readonly bool SupportsAttachmentFeedbackLoop;
-        public readonly bool SupportsDynamicAttachmentFeedbackLoop;
        public readonly uint SubgroupSize;
        public readonly SampleCountFlags SupportedSampleCounts;
        public readonly PortabilitySubsetFlags PortabilitySubset;
@@ -86,8 +84,6 @@ namespace Ryujinx.Graphics.Vulkan
            bool supportsViewportArray2,
            bool supportsHostImportedMemory,
            bool supportsDepthClipControl,
-            bool supportsAttachmentFeedbackLoop,
-            bool supportsDynamicAttachmentFeedbackLoop,
            uint subgroupSize,
            SampleCountFlags supportedSampleCounts,
            PortabilitySubsetFlags portabilitySubset,
@@ -125,8 +121,6 @@ namespace Ryujinx.Graphics.Vulkan
            SupportsViewportArray2 = supportsViewportArray2;
            SupportsHostImportedMemory = supportsHostImportedMemory;
            SupportsDepthClipControl = supportsDepthClipControl;
-            SupportsAttachmentFeedbackLoop = supportsAttachmentFeedbackLoop;
-            SupportsDynamicAttachmentFeedbackLoop = supportsDynamicAttachmentFeedbackLoop;
            SubgroupSize = subgroupSize;
            SupportedSampleCounts = supportedSampleCounts;
            PortabilitySubset = portabilitySubset;
--- a/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
@@ -2,7 +2,6 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Silk.NET.Vulkan;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
@@ -34,7 +33,6 @@ namespace Ryujinx.Graphics.Vulkan
        public readonly Action EndRenderPassDelegate;

        protected PipelineDynamicState DynamicState;
-        protected bool IsMainPipeline;
        private PipelineState _newState;
        private bool _graphicsStateDirty;
        private bool _computeStateDirty;
@@ -87,9 +85,6 @@ namespace Ryujinx.Graphics.Vulkan
        private bool _tfEnabled;
        private bool _tfActive;

-        private FeedbackLoopAspects _feedbackLoop;
-        private bool _passWritesDepthStencil;
-
        private readonly PipelineColorBlendAttachmentState[] _storedBlend;
        public ulong DrawCount { get; private set; }
        public bool RenderPassActive { get; private set; }
@@ -131,7 +126,7 @@ namespace Ryujinx.Graphics.Vulkan

        public void Initialize()
        {
-            _descriptorSetUpdater.Initialize(IsMainPipeline);
+            _descriptorSetUpdater.Initialize();

            QuadsToTrisPattern = new IndexBufferPattern(Gd, 4, 6, 0, new[] { 0, 1, 2, 0, 2, 3 }, 4, false);
            TriFanToTrisPattern = new IndexBufferPattern(Gd, 3, 3, 2, new[] { int.MinValue, -1, 0 }, 1, true);
@@ -819,8 +814,6 @@ namespace Ryujinx.Graphics.Vulkan
            _newState.DepthTestEnable = depthTest.TestEnable;
            _newState.DepthWriteEnable = depthTest.WriteEnable;
            _newState.DepthCompareOp = depthTest.Func.Convert();
-
-            UpdatePassDepthStencil();
            SignalStateChange();
        }

@@ -1086,8 +1079,6 @@ namespace Ryujinx.Graphics.Vulkan
            _newState.StencilFrontPassOp = stencilTest.FrontDpPass.Convert();
            _newState.StencilFrontDepthFailOp = stencilTest.FrontDpFail.Convert();
            _newState.StencilFrontCompareOp = stencilTest.FrontFunc.Convert();
-
-            UpdatePassDepthStencil();
            SignalStateChange();
        }

@@ -1435,23 +1426,7 @@ namespace Ryujinx.Graphics.Vulkan
                }
            }

-            if (IsMainPipeline)
-            {
-                FramebufferParams?.ClearBindings();
-            }
-
            FramebufferParams = new FramebufferParams(Device, colors, depthStencil);
-
-            if (IsMainPipeline)
-            {
-                FramebufferParams.AddBindings();
-
-                _newState.FeedbackLoopAspects = FeedbackLoopAspects.None;
-                _bindingBarriersDirty = true;
-            }
-
-            _passWritesDepthStencil = false;
-            UpdatePassDepthStencil();
            UpdatePipelineAttachmentFormats();
        }

@@ -1518,82 +1493,11 @@ namespace Ryujinx.Graphics.Vulkan
                }
            }

-            Gd.Barriers.Flush(Cbs, _program, _feedbackLoop != 0, RenderPassActive, _rpHolder, EndRenderPassDelegate);
+            Gd.Barriers.Flush(Cbs, _program, RenderPassActive, _rpHolder, EndRenderPassDelegate);

            _descriptorSetUpdater.UpdateAndBindDescriptorSets(Cbs, PipelineBindPoint.Compute);
        }

-        private bool ChangeFeedbackLoop(FeedbackLoopAspects aspects)
-        {
-            if (_feedbackLoop != aspects)
-            {
-                if (Gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
-                {
-                    DynamicState.SetFeedbackLoop(aspects);
-                }
-                else
-                {
-                    _newState.FeedbackLoopAspects = aspects;
-                }
-
-                _feedbackLoop = aspects;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool UpdateFeedbackLoop()
-        {
-            List<TextureView> hazards = _descriptorSetUpdater.FeedbackLoopHazards;
-
-            if ((hazards?.Count ?? 0) > 0)
-            {
-                FeedbackLoopAspects aspects = 0;
-
-                foreach (TextureView view in hazards)
-                {
-                    // May need to enforce feedback loop layout here in the future.
-                    // Though technically, it should always work with the general layout.
-
-                    if (view.Info.Format.IsDepthOrStencil())
-                    {
-                        if (_passWritesDepthStencil)
-                        {
-                            // If depth/stencil isn't written in the pass, it doesn't count as a feedback loop.
-
-                            aspects |= FeedbackLoopAspects.Depth;
-                        }
-                    }
-                    else
-                    {
-                        aspects |= FeedbackLoopAspects.Color;
-                    }
-                }
-
-                return ChangeFeedbackLoop(aspects);
-            }
-            else if (_feedbackLoop != 0)
-            {
-                return ChangeFeedbackLoop(FeedbackLoopAspects.None);
-            }
-
-            return false;
-        }
-
-        private void UpdatePassDepthStencil()
-        {
-            if (!RenderPassActive)
-            {
-                _passWritesDepthStencil = false;
-            }
-
-            // Stencil test being enabled doesn't necessarily mean a write, but it's not critical to check.
-            _passWritesDepthStencil |= (_newState.DepthTestEnable && _newState.DepthWriteEnable) || _newState.StencilTestEnable;
-        }
-
        private bool RecreateGraphicsPipelineIfNeeded()
        {
            if (AutoFlush.ShouldFlushDraw(DrawCount))
@@ -1601,7 +1505,7 @@ namespace Ryujinx.Graphics.Vulkan
                Gd.FlushAllCommands();
            }

-            DynamicState.ReplayIfDirty(Gd, CommandBuffer);
+            DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);

            if (_needsIndexBufferRebind && _indexBufferPattern == null)
            {
@@ -1635,15 +1539,7 @@ namespace Ryujinx.Graphics.Vulkan
                _vertexBufferUpdater.Commit(Cbs);
            }

-            if (_bindingBarriersDirty)
-            {
-                // Stale barriers may have been activated by switching program. Emit any that are relevant.
-                _descriptorSetUpdater.InsertBindingBarriers(Cbs);
-
-                _bindingBarriersDirty = false;
-            }
-
-            if (UpdateFeedbackLoop() || _graphicsStateDirty || Pbp != PipelineBindPoint.Graphics)
+            if (_graphicsStateDirty || Pbp != PipelineBindPoint.Graphics)
            {
                if (!CreatePipeline(PipelineBindPoint.Graphics))
                {
@@ -1652,9 +1548,17 @@ namespace Ryujinx.Graphics.Vulkan

                _graphicsStateDirty = false;
                Pbp = PipelineBindPoint.Graphics;
+
+                if (_bindingBarriersDirty)
+                {
+                    // Stale barriers may have been activated by switching program. Emit any that are relevant.
+                    _descriptorSetUpdater.InsertBindingBarriers(Cbs);
+
+                    _bindingBarriersDirty = false;
+                }
            }

-            Gd.Barriers.Flush(Cbs, _program, _feedbackLoop != 0, RenderPassActive, _rpHolder, EndRenderPassDelegate);
+            Gd.Barriers.Flush(Cbs, _program, RenderPassActive, _rpHolder, EndRenderPassDelegate);

            _descriptorSetUpdater.UpdateAndBindDescriptorSets(Cbs, PipelineBindPoint.Graphics);

--- a/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
@@ -1,6 +1,5 @@
 using Ryujinx.Common.Memory;
 using Silk.NET.Vulkan;
-using Silk.NET.Vulkan.Extensions.EXT;

 namespace Ryujinx.Graphics.Vulkan
 {
@@ -22,8 +21,6 @@ namespace Ryujinx.Graphics.Vulkan

        private Array4<float> _blendConstants;

-        private FeedbackLoopAspects _feedbackLoopAspects;
-
        public uint ViewportsCount;
        public Array16<Viewport> Viewports;

@@ -35,8 +32,7 @@ namespace Ryujinx.Graphics.Vulkan
            Scissor = 1 << 2,
            Stencil = 1 << 3,
            Viewport = 1 << 4,
-            FeedbackLoop = 1 << 5,
-            All = Blend | DepthBias | Scissor | Stencil | Viewport | FeedbackLoop,
+            All = Blend | DepthBias | Scissor | Stencil | Viewport,
        }

        private DirtyFlags _dirty;
@@ -103,22 +99,13 @@ namespace Ryujinx.Graphics.Vulkan
            }
        }

-        public void SetFeedbackLoop(FeedbackLoopAspects aspects)
-        {
-            _feedbackLoopAspects = aspects;
-
-            _dirty |= DirtyFlags.FeedbackLoop;
-        }
-
        public void ForceAllDirty()
        {
            _dirty = DirtyFlags.All;
        }

-        public void ReplayIfDirty(VulkanRenderer gd, CommandBuffer commandBuffer)
+        public void ReplayIfDirty(Vk api, CommandBuffer commandBuffer)
        {
-            Vk api = gd.Api;
-
            if (_dirty.HasFlag(DirtyFlags.Blend))
            {
                RecordBlend(api, commandBuffer);
@@ -144,11 +131,6 @@ namespace Ryujinx.Graphics.Vulkan
                RecordViewport(api, commandBuffer);
            }

-            if (_dirty.HasFlag(DirtyFlags.FeedbackLoop) && gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
-            {
-                RecordFeedbackLoop(gd.DynamicFeedbackLoopApi, commandBuffer);
-            }
-
            _dirty = DirtyFlags.None;
        }

@@ -187,17 +169,5 @@ namespace Ryujinx.Graphics.Vulkan
                api.CmdSetViewport(commandBuffer, 0, ViewportsCount, Viewports.AsSpan());
            }
        }
-
-        private readonly void RecordFeedbackLoop(ExtAttachmentFeedbackLoopDynamicState api, CommandBuffer commandBuffer)
-        {
-            ImageAspectFlags aspects = (_feedbackLoopAspects & FeedbackLoopAspects.Color) != 0 ? ImageAspectFlags.ColorBit : 0;
-
-            if ((_feedbackLoopAspects & FeedbackLoopAspects.Depth) != 0)
-            {
-                aspects |= ImageAspectFlags.DepthBit | ImageAspectFlags.StencilBit;
-            }
-
-            api.CmdSetAttachmentFeedbackLoopEnable(commandBuffer, aspects);
-        }
    }
 }
--- a/src/Ryujinx.Graphics.Vulkan/PipelineFull.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineFull.cs
@@ -28,8 +28,6 @@ namespace Ryujinx.Graphics.Vulkan
            _activeBufferMirrors = new();

            CommandBuffer = (Cbs = gd.CommandBufferPool.Rent()).CommandBuffer;
-
-            IsMainPipeline = true;
        }

        private void CopyPendingQuery()
@@ -237,7 +235,7 @@ namespace Ryujinx.Graphics.Vulkan

            if (Pipeline != null && Pbp == PipelineBindPoint.Graphics)
            {
-                DynamicState.ReplayIfDirty(Gd, CommandBuffer);
+                DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
            }
        }

--- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
@@ -8,7 +8,6 @@ namespace Ryujinx.Graphics.Vulkan
    struct PipelineState : IDisposable
    {
        private const int RequiredSubgroupSize = 32;
-        private const int MaxDynamicStatesCount = 9;

        public PipelineUid Internal;

@@ -300,12 +299,6 @@ namespace Ryujinx.Graphics.Vulkan
            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFBF) | ((value ? 1UL : 0UL) << 6);
        }

-        public FeedbackLoopAspects FeedbackLoopAspects
-        {
-            readonly get => (FeedbackLoopAspects)((Internal.Id8 >> 7) & 0x3);
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFE7F) | (((ulong)value) << 7);
-        }
-
        public bool HasTessellationControlShader;
        public NativeArray<PipelineShaderStageCreateInfo> Stages;
        public PipelineLayout PipelineLayout;
@@ -571,11 +564,9 @@ namespace Ryujinx.Graphics.Vulkan
                }

                bool supportsExtDynamicState = gd.Capabilities.SupportsExtendedDynamicState;
-                bool supportsFeedbackLoopDynamicState = gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop;
+                int dynamicStatesCount = supportsExtDynamicState ? 8 : 7;

-                DynamicState* dynamicStates = stackalloc DynamicState[MaxDynamicStatesCount];
-
-                int dynamicStatesCount = 7;
+                DynamicState* dynamicStates = stackalloc DynamicState[dynamicStatesCount];

                dynamicStates[0] = DynamicState.Viewport;
                dynamicStates[1] = DynamicState.Scissor;
@@ -587,12 +578,7 @@ namespace Ryujinx.Graphics.Vulkan

                if (supportsExtDynamicState)
                {
-                    dynamicStates[dynamicStatesCount++] = DynamicState.VertexInputBindingStrideExt;
-                }
-
-                if (supportsFeedbackLoopDynamicState)
-                {
-                    dynamicStates[dynamicStatesCount++] = DynamicState.AttachmentFeedbackLoopEnableExt;
+                    dynamicStates[7] = DynamicState.VertexInputBindingStrideExt;
                }

                var pipelineDynamicStateCreateInfo = new PipelineDynamicStateCreateInfo
@@ -602,27 +588,9 @@ namespace Ryujinx.Graphics.Vulkan
                    PDynamicStates = dynamicStates,
                };

-                PipelineCreateFlags flags = 0;
-
-                if (gd.Capabilities.SupportsAttachmentFeedbackLoop)
-                {
-                    FeedbackLoopAspects aspects = FeedbackLoopAspects;
-
-                    if ((aspects & FeedbackLoopAspects.Color) != 0)
-                    {
-                        flags |= PipelineCreateFlags.CreateColorAttachmentFeedbackLoopBitExt;
-                    }
-
-                    if ((aspects & FeedbackLoopAspects.Depth) != 0)
-                    {
-                        flags |= PipelineCreateFlags.CreateDepthStencilAttachmentFeedbackLoopBitExt;
-                    }
-                }
-
                var pipelineCreateInfo = new GraphicsPipelineCreateInfo
                {
                    SType = StructureType.GraphicsPipelineCreateInfo,
-                    Flags = flags,
                    StageCount = StagesCount,
                    PStages = Stages.Pointer,
                    PVertexInputState = &vertexInputState,
--- a/src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
+++ b/src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
@@ -4,7 +4,6 @@ using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 using Format = Ryujinx.Graphics.GAL.Format;
 using VkBuffer = Silk.NET.Vulkan.Buffer;
 using VkFormat = Silk.NET.Vulkan.Format;
@@ -13,11 +12,6 @@ namespace Ryujinx.Graphics.Vulkan
 {
    class TextureStorage : IDisposable
    {
-        private struct TextureSliceInfo
-        {
-            public int BindCount;
-        }
-
        private const MemoryPropertyFlags DefaultImageMemoryFlags =
            MemoryPropertyFlags.DeviceLocalBit;

@@ -49,7 +43,6 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly Image _image;
        private readonly Auto<DisposableImage> _imageAuto;
        private readonly Auto<MemoryAllocation> _allocationAuto;
-        private readonly int _depthOrLayers;
        private Auto<MemoryAllocation> _foreignAllocationAuto;

        private Dictionary<Format, TextureStorage> _aliasedStorages;
@@ -62,9 +55,6 @@ namespace Ryujinx.Graphics.Vulkan
        private int _viewsCount;
        private readonly ulong _size;

-        private int _bindCount;
-        private readonly TextureSliceInfo[] _slices;
-
        public VkFormat VkFormat { get; }

        public unsafe TextureStorage(
@@ -85,7 +75,6 @@ namespace Ryujinx.Graphics.Vulkan
            var depth = (uint)(info.Target == Target.Texture3D ? info.Depth : 1);

            VkFormat = format;
-            _depthOrLayers = info.GetDepthOrLayers();

            var type = info.Target.Convert();

@@ -161,8 +150,6 @@ namespace Ryujinx.Graphics.Vulkan

                InitialTransition(ImageLayout.Preinitialized, ImageLayout.General);
            }
-
-            _slices = new TextureSliceInfo[levels * _depthOrLayers];
        }

        public TextureStorage CreateAliasedColorForDepthStorageUnsafe(Format format)
@@ -325,12 +312,6 @@ namespace Ryujinx.Graphics.Vulkan
                usage |= ImageUsageFlags.StorageBit;
            }

-            if (capabilities.SupportsAttachmentFeedbackLoop &&
-                (usage & (ImageUsageFlags.DepthStencilAttachmentBit | ImageUsageFlags.ColorAttachmentBit)) != 0)
-            {
-                usage |= ImageUsageFlags.AttachmentFeedbackLoopBitExt;
-            }
-
            return usage;
        }

@@ -531,55 +512,6 @@ namespace Ryujinx.Graphics.Vulkan
            }
        }

-        public void AddBinding(TextureView view)
-        {
-            // Assumes a view only has a first level.
-
-            int index = view.FirstLevel * _depthOrLayers + view.FirstLayer;
-            int layers = view.Layers;
-
-            for (int i = 0; i < layers; i++)
-            {
-                ref TextureSliceInfo info = ref _slices[index++];
-
-                info.BindCount++;
-            }
-
-            _bindCount++;
-        }
-
-        public void ClearBindings()
-        {
-            if (_bindCount != 0)
-            {
-                Array.Clear(_slices, 0, _slices.Length);
-
-                _bindCount = 0;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool IsBound(TextureView view)
-        {
-            if (_bindCount != 0)
-            {
-                int index = view.FirstLevel * _depthOrLayers + view.FirstLayer;
-                int layers = view.Layers;
-
-                for (int i = 0; i < layers; i++)
-                {
-                    ref TextureSliceInfo info = ref _slices[index++];
-
-                    if (info.BindCount != 0)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
        public void IncrementViewsCount()
        {
            _viewsCount++;
--- a/src/Ryujinx.Graphics.Vulkan/TextureView.cs
+++ b/src/Ryujinx.Graphics.Vulkan/TextureView.cs
@@ -23,8 +23,6 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly Auto<DisposableImageView> _imageView2dArray;
        private Dictionary<Format, TextureView> _selfManagedViews;

-        private int _hazardUses;
-
        private readonly TextureCreateInfo _info;

        private HashTableSlim<RenderPassCacheKey, RenderPassHolder> _renderPasses;
@@ -1039,34 +1037,6 @@ namespace Ryujinx.Graphics.Vulkan
            throw new NotImplementedException();
        }

-        public void PrepareForUsage(CommandBufferScoped cbs, PipelineStageFlags flags, List<TextureView> feedbackLoopHazards)
-        {
-            Storage.QueueWriteToReadBarrier(cbs, AccessFlags.ShaderReadBit, flags);
-
-            if (feedbackLoopHazards != null && Storage.IsBound(this))
-            {
-                feedbackLoopHazards.Add(this);
-                _hazardUses++;
-            }
-        }
-
-        public void ClearUsage(List<TextureView> feedbackLoopHazards)
-        {
-            if (_hazardUses != 0 && feedbackLoopHazards != null)
-            {
-                feedbackLoopHazards.Remove(this);
-                _hazardUses--;
-            }
-        }
-
-        public void DecrementHazardUses()
-        {
-            if (_hazardUses != 0)
-            {
-                _hazardUses--;
-            }
-        }
-
        public (RenderPassHolder rpHolder, Auto<DisposableFramebuffer> framebuffer) GetPassAndFramebuffer(
            VulkanRenderer gd,
            Device device,
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Vendor.cs
@@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                DriverId.MesaDozen => "Dozen",
                DriverId.MesaNvk => "NVK",
                DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaAgxv => "Honeykrisp",
+                DriverId.MesaHoneykrisp => "Honeykrisp",
                _ => id.ToString(),
            };
        }
--- a/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
@@ -44,8 +44,6 @@ namespace Ryujinx.Graphics.Vulkan
            "VK_EXT_4444_formats",
            "VK_KHR_8bit_storage",
            "VK_KHR_maintenance2",
-            "VK_EXT_attachment_feedback_loop_layout",
-            "VK_EXT_attachment_feedback_loop_dynamic_state",
        };

        private static readonly string[] _requiredExtensions = {
@@ -359,28 +357,6 @@ namespace Ryujinx.Graphics.Vulkan
                features2.PNext = &supportedFeaturesDepthClipControl;
            }

-            PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT supportedFeaturesAttachmentFeedbackLoopLayout = new()
-            {
-                SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesExt,
-                PNext = features2.PNext,
-            };
-
-            if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_layout"))
-            {
-                features2.PNext = &supportedFeaturesAttachmentFeedbackLoopLayout;
-            }
-
-            PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT supportedFeaturesDynamicAttachmentFeedbackLoopLayout = new()
-            {
-                SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesExt,
-                PNext = features2.PNext,
-            };
-
-            if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_dynamic_state"))
-            {
-                features2.PNext = &supportedFeaturesDynamicAttachmentFeedbackLoopLayout;
-            }
-
            PhysicalDeviceVulkan12Features supportedPhysicalDeviceVulkan12Features = new()
            {
                SType = StructureType.PhysicalDeviceVulkan12Features,
@@ -555,36 +531,6 @@ namespace Ryujinx.Graphics.Vulkan
                pExtendedFeatures = &featuresDepthClipControl;
            }

-            PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT featuresAttachmentFeedbackLoopLayout;
-
-            if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_layout") &&
-                supportedFeaturesAttachmentFeedbackLoopLayout.AttachmentFeedbackLoopLayout)
-            {
-                featuresAttachmentFeedbackLoopLayout = new()
-                {
-                    SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesExt,
-                    PNext = pExtendedFeatures,
-                    AttachmentFeedbackLoopLayout = true,
-                };
-
-                pExtendedFeatures = &featuresAttachmentFeedbackLoopLayout;
-            }
-
-            PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT featuresDynamicAttachmentFeedbackLoopLayout;
-
-            if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_dynamic_state") &&
-                supportedFeaturesDynamicAttachmentFeedbackLoopLayout.AttachmentFeedbackLoopDynamicState)
-            {
-                featuresDynamicAttachmentFeedbackLoopLayout = new()
-                {
-                    SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesExt,
-                    PNext = pExtendedFeatures,
-                    AttachmentFeedbackLoopDynamicState = true,
-                };
-
-                pExtendedFeatures = &featuresDynamicAttachmentFeedbackLoopLayout;
-            }
-
            var enabledExtensions = _requiredExtensions.Union(_desirableExtensions.Intersect(physicalDevice.DeviceExtensions)).ToArray();

            nint* ppEnabledExtensions = stackalloc nint[enabledExtensions.Length];
--- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
@@ -42,7 +42,6 @@ namespace Ryujinx.Graphics.Vulkan
        internal KhrPushDescriptor PushDescriptorApi { get; private set; }
        internal ExtTransformFeedback TransformFeedbackApi { get; private set; }
        internal KhrDrawIndirectCount DrawIndirectCountApi { get; private set; }
-        internal ExtAttachmentFeedbackLoopDynamicState DynamicFeedbackLoopApi { get; private set; }

        internal uint QueueFamilyIndex { get; private set; }
        internal Queue Queue { get; private set; }
@@ -156,11 +155,6 @@ namespace Ryujinx.Graphics.Vulkan
                DrawIndirectCountApi = drawIndirectCountApi;
            }

-            if (Api.TryGetDeviceExtension(_instance.Instance, _device, out ExtAttachmentFeedbackLoopDynamicState dynamicFeedbackLoopApi))
-            {
-                DynamicFeedbackLoopApi = dynamicFeedbackLoopApi;
-            }
-
            if (maxQueueCount >= 2)
            {
                Api.GetDeviceQueue(_device, queueFamilyIndex, 1, out var backgroundQueue);
@@ -255,16 +249,6 @@ namespace Ryujinx.Graphics.Vulkan
                SType = StructureType.PhysicalDeviceDepthClipControlFeaturesExt,
            };

-            PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT featuresAttachmentFeedbackLoop = new()
-            {
-                SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesExt,
-            };
-
-            PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT featuresDynamicAttachmentFeedbackLoop = new()
-            {
-                SType = StructureType.PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesExt,
-            };
-
            PhysicalDevicePortabilitySubsetFeaturesKHR featuresPortabilitySubset = new()
            {
                SType = StructureType.PhysicalDevicePortabilitySubsetFeaturesKhr,
@@ -301,22 +285,6 @@ namespace Ryujinx.Graphics.Vulkan
                features2.PNext = &featuresDepthClipControl;
            }

-            bool supportsAttachmentFeedbackLoop = _physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_layout");
-
-            if (supportsAttachmentFeedbackLoop)
-            {
-                featuresAttachmentFeedbackLoop.PNext = features2.PNext;
-                features2.PNext = &featuresAttachmentFeedbackLoop;
-            }
-
-            bool supportsDynamicAttachmentFeedbackLoop = _physicalDevice.IsDeviceExtensionPresent("VK_EXT_attachment_feedback_loop_dynamic_state");
-
-            if (supportsDynamicAttachmentFeedbackLoop)
-            {
-                featuresDynamicAttachmentFeedbackLoop.PNext = features2.PNext;
-                features2.PNext = &featuresDynamicAttachmentFeedbackLoop;
-            }
-
            bool usePortability = _physicalDevice.IsDeviceExtensionPresent("VK_KHR_portability_subset");

            if (usePortability)
@@ -439,8 +407,6 @@ namespace Ryujinx.Graphics.Vulkan
                _physicalDevice.IsDeviceExtensionPresent("VK_NV_viewport_array2"),
                _physicalDevice.IsDeviceExtensionPresent(ExtExternalMemoryHost.ExtensionName),
                supportsDepthClipControl && featuresDepthClipControl.DepthClipControl,
-                supportsAttachmentFeedbackLoop && featuresAttachmentFeedbackLoop.AttachmentFeedbackLoopLayout,
-                supportsDynamicAttachmentFeedbackLoop && featuresDynamicAttachmentFeedbackLoop.AttachmentFeedbackLoopDynamicState,
                propertiesSubgroup.SubgroupSize,
                supportedSampleCounts,
                portabilityFlags,
--- a/src/Ryujinx.HLE/FileSystem/ContentManager.cs
+++ b/src/Ryujinx.HLE/FileSystem/ContentManager.cs
@@ -710,9 +710,8 @@ namespace Ryujinx.HLE.FileSystem
                        {
                            updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
                        }
-                        else
+                        else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
                        {
-                            updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                            updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
                        }
                    }
@@ -898,9 +897,8 @@ namespace Ryujinx.HLE.FileSystem
                    {
                        updateNcasItem.Add((nca.Header.ContentType, entry.FullPath));
                    }
-                    else
+                    else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
                    {
-                        updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                        updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullPath));
                    }

--- a/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -26,10 +26,20 @@ namespace Ryujinx.HLE.HOS.Applets
        {
            _normalSession = normalSession;
            _interactiveSession = interactiveSession;
-
-            // TODO(jduncanator): Parse PlayerSelectConfig from input data
-            _normalSession.Push(BuildResponse());
-
+            
+            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
+            if (selected == null)
+            {
+                _normalSession.Push(BuildResponse());
+            }
+            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
+            {
+                _normalSession.Push(BuildGuestResponse());
+            }
+            else
+            {
+                _normalSession.Push(BuildResponse(selected));
+            }
            AppletStateChanged?.Invoke(this, null);

            _system.ReturnFocus();
@@ -37,16 +47,34 @@ namespace Ryujinx.HLE.HOS.Applets
            return ResultCode.Success;
        }

-        private byte[] BuildResponse()
+        private byte[] BuildResponse(UserProfile selectedUser)
        {
-            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
-
            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
            using BinaryWriter writer = new(stream);

            writer.Write((ulong)PlayerSelectResult.Success);

-            currentUser.UserId.Write(writer);
+            selectedUser.UserId.Write(writer);
+
+            return stream.ToArray();
+        }
+        
+        private byte[] BuildGuestResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            
+            writer.Write(new byte());
+
+            return stream.ToArray();
+        }
+        
+        private byte[] BuildResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            
+            writer.Write((ulong)PlayerSelectResult.Failure);

            return stream.ToArray();
        }
--- a/src/Ryujinx.HLE/HOS/Horizon.cs
+++ b/src/Ryujinx.HLE/HOS/Horizon.cs
@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS
                ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);

                uint[] defaultCapabilities = {
-                    0x030363F7,
+                    (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
                    0x1FFFFFCF,
                    0x207FFFEF,
                    0x47E0060F,
--- a/src/Ryujinx.HLE/HOS/Kernel/KernelContext.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/KernelContext.cs
@@ -63,6 +63,7 @@ namespace Ryujinx.HLE.HOS.Kernel
            TickSource = tickSource;
            Device = device;
            Memory = memory;
+            KScheduler.CpuCoresCount = device.CpuCoresCount;

            Running = true;

--- a/src/Ryujinx.HLE/HOS/Kernel/KernelStatic.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/KernelStatic.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Kernel
                return result;
            }

-            process.DefaultCpuCore = 3;
+            process.DefaultCpuCore = KScheduler.CpuCoresCount - 1;

            context.Processes.TryAdd(process.Pid, process);

--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
@@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                return result;
            }

-            result = Capabilities.InitializeForUser(capabilities, MemoryManager);
+            result = Capabilities.InitializeForUser(capabilities, MemoryManager, IsApplication);

            if (result != Result.Success)
            {
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
@@ -35,15 +35,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
            DebuggingFlags &= ~3u;
            KernelReleaseVersion = KProcess.KernelVersionPacked;

-            return Parse(capabilities, memoryManager);
+            return Parse(capabilities, memoryManager, false);
        }

-        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
+        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
        {
-            return Parse(capabilities, memoryManager);
+            return Parse(capabilities, memoryManager, isApplication);
        }

-        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
+        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
        {
            int mask0 = 0;
            int mask1 = 0;
@@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process

                if (cap.GetCapabilityType() != CapabilityType.MapRange)
                {
-                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager);
+                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager, isApplication);

                    if (result != Result.Success)
                    {
@@ -120,7 +120,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
            return Result.Success;
        }

-        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager)
+        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager, bool isApplication)
        {
            CapabilityType code = cap.GetCapabilityType();

@@ -176,6 +176,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                        AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                        AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);

+                        if (isApplication)
+                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
+
                        break;
                    }

--- a/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs
@@ -2683,7 +2683,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                    return KernelResult.InvalidCombination;
                }

-                if ((uint)preferredCore > 3)
+                if ((uint)preferredCore > KScheduler.CpuCoresCount - 1)
                {
                    if ((preferredCore | 2) != -1)
                    {
--- a/src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs
@@ -9,13 +9,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
    partial class KScheduler : IDisposable
    {
        public const int PrioritiesCount = 64;
-        public const int CpuCoresCount = 4;
+        public static int CpuCoresCount;

        private const int RoundRobinTimeQuantumMs = 10;

-        private static readonly int[] _preemptionPriorities = { 59, 59, 59, 63 };
-
-        private static readonly int[] _srcCoresHighestPrioThreads = new int[CpuCoresCount];
+        private static int[] _srcCoresHighestPrioThreads;

        private readonly KernelContext _context;
        private readonly int _coreId;
@@ -47,6 +45,16 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
            _coreId = coreId;

            _currentThread = null;
+
+            if (_srcCoresHighestPrioThreads == null)
+            {
+                _srcCoresHighestPrioThreads = new int[CpuCoresCount];
+            }
+        }
+
+        private static int PreemptionPriorities(int index)
+        {
+            return index == CpuCoresCount - 1 ? 63 : 59;
        }

        public static ulong SelectThreads(KernelContext context)
@@ -437,7 +445,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading

                for (int core = 0; core < CpuCoresCount; core++)
                {
-                    RotateScheduledQueue(context, core, _preemptionPriorities[core]);
+                    RotateScheduledQueue(context, core, PreemptionPriorities(core));
                }

                context.CriticalSection.Leave();
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
@@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
            ProfilesJson profilesJson = JsonHelper.DeserializeFromFile(_profilesJsonPath, _serializerContext.ProfilesJson);

            return profilesJson.Profiles
-                .FindFirst(profile => profile.AccountState == AccountState.Open)
+                .FindFirst(profile => profile.UserId == profilesJson.LastOpened)
                .Convert(profileJson => new UserProfile(new UserId(profileJson.UserId), profileJson.Name,
                    profileJson.Image, profileJson.LastModifiedTimestamp));
        }
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
@@ -659,7 +659,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati

                if (string.IsNullOrWhiteSpace(filePath))
                {
-                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
+                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
                }

                context.Device.LoadNca(filePath);
--- a/src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
@@ -15,8 +15,10 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
        {
            _baseStorage = SharedRef<LibHac.FsSrv.Sf.IStorage>.CreateMove(ref baseStorage);
        }
-
-        private const string Xc2TitleId = "0100e95004038000";
+        
+        private const string Xc2JpTitleId = "0100f3400332c000";
+        private const string Xc2GlobalTitleId = "0100e95004038000";
+        private static bool IsXc2 => TitleIDs.CurrentApplication.Value.OrDefault() is Xc2GlobalTitleId or Xc2JpTitleId;

        [CommandCmif(0)]
        // Read(u64 offset, u64 length) -> buffer<u8, 0x46, 0> buffer
@@ -39,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
                using var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true);
                Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size);
                
-                if (context.Device.DirtyHacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication.Value == Xc2TitleId)
+                if (context.Device.DirtyHacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix) && IsXc2)
                {
                    // Add a load-bearing sleep to avoid XC2 softlock
                    // https://web.archive.org/web/20240728045136/https://github.com/Ryujinx/Ryujinx/issues/2357
--- a/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
@@ -702,6 +702,18 @@ namespace Ryujinx.HLE.HOS.Services.Hid

            return ResultCode.Success;
        }
+        
+        [CommandCmif(92)]
+        // SetGestureOutputRanges(pid, ushort Unknown0)
+        public ResultCode SetGestureOutputRanges(ServiceCtx context)
+        {
+            ulong pid = context.Request.HandleDesc.PId;
+            ushort unknown0 = context.RequestData.ReadUInt16();
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
+
+            return ResultCode.Success;
+        }

        [CommandCmif(100)]
        // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)
--- a/src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs
@@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                                titleName = "Unknown";
                            }

-                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
+                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
                        }
                    }
                    else
--- a/src/Ryujinx.HLE/HOS/Services/ServerBase.cs
+++ b/src/Ryujinx.HLE/HOS/Services/ServerBase.cs
@@ -24,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Services
        // not large enough.
        private const int PointerBufferSize = 0x8000;

-        private readonly static uint[] _defaultCapabilities = {
-            0x030363F7,
+        private static uint[] _defaultCapabilities => [
+            (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
            0x1FFFFFCF,
            0x207FFFEF,
            0x47E0060F,
            0x0048BFFF,
            0x01007FFF,
-        };
+        ];

        // The amount of time Dispose() will wait to Join() the thread executing the ServerLoop()
        private static readonly TimeSpan _threadJoinTimeout = TimeSpan.FromSeconds(3);
--- a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -244,6 +244,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
            return ResultCode.Success;
        }

+        [CommandCmif(68)]
+        // GetSerialNumber() -> buffer<nn::settings::system::SerialNumber, 0x16>
+        public ResultCode GetSerialNumber(ServiceCtx context)
+        {
+            context.ResponseData.Write(Encoding.ASCII.GetBytes("RYU00000000000"));
+
+            return ResultCode.Success;
+        }
+
        [CommandCmif(77)]
        // GetDeviceNickName() -> buffer<nn::settings::system::DeviceNickName, 0x16>
        public ResultCode GetDeviceNickName(ServiceCtx context)
--- a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
@@ -51,6 +51,9 @@ namespace Ryujinx.HLE.HOS.Services.Spl

            context.ResponseData.Write(configValue);

+            if (result == SmcResult.Success)
+                return ResultCode.Success;
+
            return (ResultCode)((int)result << 9) | ResultCode.ModuleId;
        }

--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -26,7 +26,17 @@ namespace Ryujinx.HLE.Loaders.Processes

        private ulong _latestPid;

-        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
+        public ProcessResult ActiveApplication
+        {
+            get
+            {
+                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
+                    throw new RyujinxException(
+                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
+                
+                return value;
+            }
+        }

        public ProcessLoader(Switch device)
        {
--- a/src/Ryujinx.HLE/PerformanceStatistics.cs
+++ b/src/Ryujinx.HLE/PerformanceStatistics.cs
@@ -161,5 +161,20 @@ namespace Ryujinx.HLE
        {
            return 1000 / _frameRate[FrameTypeGame];
        }
+        
+        public string FormatGameFrameRate()
+        {
+            double frameRate = GetGameFrameRate();
+            double frameTime = GetGameFrameTime();
+
+            return $"{frameRate:00.00} FPS ({frameTime:00.00}ms)";
+        }
+        
+        public string FormatFifoPercent()
+        {
+            double fifoPercent = GetFifoPercent();
+
+            return $"FIFO: {fifoPercent:00.00}%";
+        }
    }
 }
--- a/src/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/src/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -48,6 +48,7 @@
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
    <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
+    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
  </ItemGroup>

 </Project>
--- a/src/Ryujinx.HLE/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -32,8 +32,10 @@ namespace Ryujinx.HLE
        public TamperMachine TamperMachine { get; }
        public IHostUIHandler UIHandler { get; }

-        public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
-        public bool CustomVSyncIntervalEnabled { get; set; } = false;
+        public int CpuCoresCount = 4; //Switch 1 has 4 cores
+
+        public VSyncMode VSyncMode { get; set; }
+        public bool CustomVSyncIntervalEnabled { get; set; }
        public int CustomVSyncInterval { get; set; }

        public long TargetVSyncInterval { get; set; } = 60;
--- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs
+++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
@@ -1,4 +1,5 @@
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;

 namespace Ryujinx.HLE.UI
@@ -59,5 +60,11 @@ namespace Ryujinx.HLE.UI
        /// Gets fonts and colors used by the host.
        /// </summary>
        IHostUITheme HostUITheme { get; }
+        
+        
+        /// <summary>
+        /// Displays the player select dialog and returns the selected profile.
+        /// </summary>
+        UserProfile ShowPlayerSelectDialog();
    }
 }
--- a/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
@@ -1,6 +1,9 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
+using Ryujinx.HLE.HOS.Services.Hid;
+using SDL2;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -85,7 +88,7 @@ namespace Ryujinx.Input.SDL2
            Id = driverId;
            Features = GetFeaturesFlag();
            _triggerThreshold = 0.0f;
-
+            
            // Enable motion tracking
            if (Features.HasFlag(GamepadFeaturesFlag.Motion))
            {
@@ -101,6 +104,18 @@ namespace Ryujinx.Input.SDL2
            }
        }

+        public void SetLed(uint packedRgb)
+        {
+            if (!Features.HasFlag(GamepadFeaturesFlag.Led)) return;
+
+            byte red = packedRgb > 0 ? (byte)(packedRgb >> 16) : (byte)0;
+            byte green = packedRgb > 0 ? (byte)(packedRgb >> 8) : (byte)0;
+            byte blue = packedRgb > 0 ? (byte)(packedRgb % 256) : (byte)0;
+            
+            if (SDL_GameControllerSetLED(_gamepadHandle, red, green, blue) != 0)
+                Logger.Error?.Print(LogClass.Hid, "LED is not supported on this game controller.");
+        }
+
        private GamepadFeaturesFlag GetFeaturesFlag()
        {
            GamepadFeaturesFlag result = GamepadFeaturesFlag.None;
@@ -111,13 +126,16 @@ namespace Ryujinx.Input.SDL2
                result |= GamepadFeaturesFlag.Motion;
            }

-            int error = SDL_GameControllerRumble(_gamepadHandle, 0, 0, 100);
-
-            if (error == 0)
+            if (SDL_GameControllerHasRumble(_gamepadHandle) == SDL_bool.SDL_TRUE)
            {
                result |= GamepadFeaturesFlag.Rumble;
            }

+            if (SDL_GameControllerHasLED(_gamepadHandle) == SDL_bool.SDL_TRUE)
+            {
+                result |= GamepadFeaturesFlag.Led;
+            }
+
            return result;
        }

@@ -130,6 +148,8 @@ namespace Ryujinx.Input.SDL2
        {
            if (disposing && _gamepadHandle != nint.Zero)
            {
+                Rainbow.Updated -= RainbowColorChanged;
+                
                SDL_GameControllerClose(_gamepadHandle);

                _gamepadHandle = nint.Zero;
@@ -208,12 +228,41 @@ namespace Ryujinx.Input.SDL2

        private static Vector3 GsToMs2(Vector3 gs) => gs / SDL_STANDARD_GRAVITY;

+        private void RainbowColorChanged(int packedRgb)
+        {
+            if (!_configuration.Led.UseRainbow) return;
+            
+            SetLed((uint)packedRgb);
+        }
+
+        private bool _rainbowColorEnabled;
+        
        public void SetConfiguration(InputConfig configuration)
        {
            lock (_userMappingLock)
            {
                _configuration = (StandardControllerInputConfig)configuration;

+                if (Features.HasFlag(GamepadFeaturesFlag.Led) && _configuration.Led.EnableLed)
+                {
+                    if (_configuration.Led.TurnOffLed)
+                        (this as IGamepad).ClearLed();
+                    else switch (_configuration.Led.UseRainbow)
+                    {
+                        case true when !_rainbowColorEnabled:
+                            Rainbow.Updated += RainbowColorChanged;
+                            _rainbowColorEnabled = true;
+                            break;
+                        case false when _rainbowColorEnabled:
+                            Rainbow.Updated -= RainbowColorChanged;
+                            _rainbowColorEnabled = false;
+                            break;
+                    }
+                    
+                    if (!_configuration.Led.TurnOffLed && !_rainbowColorEnabled)
+                        SetLed(_configuration.Led.LedColor);
+                }
+                
                _buttonsUserMapping.Clear();

                // First update sticks
--- a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
@@ -173,5 +173,16 @@ namespace Ryujinx.Input.SDL2

            return new SDL2Gamepad(gamepadHandle, id);
        }
+
+        public IEnumerable<IGamepad> GetGamepads()
+        {
+            lock (_gamepadsIds)
+            {
+                foreach (string gamepadId in _gamepadsIds)
+                {
+                    yield return GetGamepad(gamepadId);
+                }
+            }
+        }
    }
 }
--- a/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
+using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -385,6 +386,11 @@ namespace Ryujinx.Input.SDL2
            }
        }

+        public void SetLed(uint packedRgb)
+        {
+            Logger.Info?.Print(LogClass.UI, "SetLed called on an SDL2Keyboard");
+        }
+
        public void SetTriggerThreshold(float triggerThreshold)
        {
            // No operations
--- a/src/Ryujinx.Input.SDL2/SDL2Mouse.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Mouse.cs
@@ -1,4 +1,5 @@
 using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Logging;
 using System;
 using System.Drawing;
 using System.Numerics;
@@ -76,6 +77,11 @@ namespace Ryujinx.Input.SDL2
            throw new NotImplementedException();
        }

+        public void SetLed(uint packedRgb)
+        {
+            Logger.Info?.Print(LogClass.UI, "SetLed called on an SDL2Mouse");
+        }
+
        public void SetTriggerThreshold(float triggerThreshold)
        {
            throw new NotImplementedException();
--- a/src/Ryujinx.Input.SDL2/SDL2MouseDriver.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2MouseDriver.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Numerics;
@@ -164,6 +165,8 @@ namespace Ryujinx.Input.SDL2
            return new SDL2Mouse(this);
        }

+        public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
+
        public void Dispose()
        {
            if (_isDisposed)
--- a/src/Ryujinx.Input.SDL2/SDLKeyboardDriver.cs
+++ b/src/Ryujinx.Input.SDL2/SDLKeyboardDriver.cs
@@ -1,5 +1,6 @@
 using Ryujinx.SDL2.Common;
 using System;
+using System.Collections.Generic;

 namespace Ryujinx.Input.SDL2
 {
@@ -51,5 +52,13 @@ namespace Ryujinx.Input.SDL2

            return new SDL2Keyboard(this, _keyboardIdentifers[0], "All keyboards");
        }
+
+        public IEnumerable<IGamepad> GetGamepads()
+        {
+            foreach (var keyboardId in _keyboardIdentifers)
+            {
+                yield return GetGamepad(keyboardId);
+            }
+        }
    }
 }
--- a/src/Ryujinx.Input/GamepadFeaturesFlag.cs
+++ b/src/Ryujinx.Input/GamepadFeaturesFlag.cs
@@ -24,5 +24,10 @@ namespace Ryujinx.Input
        /// <remarks>Also named sixaxis</remarks>
        /// </summary>
        Motion,
+        
+        /// <summary>
+        ///     The LED on the back of modern PlayStation controllers (DualSense &amp; DualShock 4).
+        /// </summary>
+        Led,
    }
 }
--- a/src/Ryujinx.Input/IGamepad.cs
+++ b/src/Ryujinx.Input/IGamepad.cs
@@ -65,6 +65,15 @@ namespace Ryujinx.Input
        /// <param name="configuration">The configuration of the gamepad</param>
        void SetConfiguration(InputConfig configuration);

+        /// <summary>
+        /// Set the LED on the gamepad to a given color.
+        /// </summary>
+        /// <remarks>Does nothing on a controller without LED functionality.</remarks>
+        /// <param name="packedRgb">The packed RGB integer.</param>
+        void SetLed(uint packedRgb);
+
+        public void ClearLed() => SetLed(0);
+
        /// <summary>
        /// Starts a rumble effect on the gamepad.
        /// </summary>
--- a/src/Ryujinx.Input/IGamepadDriver.cs
+++ b/src/Ryujinx.Input/IGamepadDriver.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;

 namespace Ryujinx.Input
 {
@@ -33,6 +34,11 @@ namespace Ryujinx.Input
        /// <param name="id">The unique id of the gamepad</param>
        /// <returns>An instance of <see cref="IGamepad"/> associated to the gamepad id given or null if not found</returns>
        IGamepad GetGamepad(string id);
+        
+        /// <summary>
+        /// Returns an <see cref="IEnumerable{T}"/> of the connected gamepads.
+        /// </summary>
+        IEnumerable<IGamepad> GetGamepads();

        /// <summary>
        /// Clear the internal state of the driver.
--- a/src/Ryujinx.SDL2.Common/SDL2Driver.cs
+++ b/src/Ryujinx.SDL2.Common/SDL2Driver.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\Controller_JoyConLeft.svg" />
-    <None Remove="Resources\Controller_JoyConPair.svg" />
-    <None Remove="Resources\Controller_JoyConRight.svg" />
-    <None Remove="Resources\Controller_ProCon.svg" />
-    <None Remove="Resources\Icon_NCA.png" />
-    <None Remove="Resources\Icon_NRO.png" />
-    <None Remove="Resources\Icon_NSO.png" />
-    <None Remove="Resources\Icon_NSP.png" />
-    <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Logo_Amiibo.png" />
-    <None Remove="Resources\Logo_Discord.png" />
-    <None Remove="Resources\Logo_GitHub.png" />
-    <None Remove="Resources\Logo_Ryujinx.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DiscordRichPresence" />
-    <PackageReference Include="DynamicData" />
-    <PackageReference Include="securifybv.ShellLink" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/src/Ryujinx.UI.LocaleGenerator/LocaleGenerator.cs
+++ b/src/Ryujinx.UI.LocaleGenerator/LocaleGenerator.cs
@@ -19,7 +19,7 @@ namespace Ryujinx.UI.LocaleGenerator

                StringBuilder enumSourceBuilder = new();
                enumSourceBuilder.AppendLine("namespace Ryujinx.Ava.Common.Locale;");
-                enumSourceBuilder.AppendLine("internal enum LocaleKeys");
+                enumSourceBuilder.AppendLine("public enum LocaleKeys");
                enumSourceBuilder.AppendLine("{");
                foreach (var line in lines)
                {
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
-using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
@@ -43,7 +42,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
-using Silk.NET.Vulkan;
 using SkiaSharp;
 using SPB.Graphics.Vulkan;
 using System;
@@ -491,7 +489,7 @@ namespace Ryujinx.Ava

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            });

            _viewModel.SetUiProgressHandlers(Device);
@@ -503,6 +501,8 @@ namespace Ryujinx.Ava
            _renderingThread.Start();

            _viewModel.Volume = ConfigurationState.Instance.System.AudioVolume.Value;
+            
+            Rainbow.Enable();

            MainLoop();

@@ -589,6 +589,15 @@ namespace Ryujinx.Ava
                return;
            }

+            foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
+            {
+                gamepad?.ClearLed();
+                gamepad?.Dispose();
+            }
+            
+            Rainbow.Disable();
+            Rainbow.Reset();
+
            _isStopped = true;
            Stop();
        }
@@ -676,7 +685,7 @@ namespace Ryujinx.Ava

        public async Task<bool> LoadGuestApplication(BlitStruct<ApplicationControlProperty>? customNacpData = null)
        {
-            InitializeSwitchInstance();
+            InitEmulatedSwitch();
            MainWindow.UpdateGraphicsConfig();

            SystemVersion firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
@@ -759,6 +768,8 @@ namespace Ryujinx.Ava
                {
                    romFsFiles = Directory.GetFiles(ApplicationPath, "*.romfs");
                }
+                
+                Logger.Notice.Print(LogClass.Application, $"Loading unpacked content archive from '{ApplicationPath}'.");

                if (romFsFiles.Length > 0)
                {
@@ -785,6 +796,8 @@ namespace Ryujinx.Ava
            }
            else if (File.Exists(ApplicationPath))
            {
+                Logger.Notice.Print(LogClass.Application, $"Loading content archive from '{ApplicationPath}'.");
+                
                switch (Path.GetExtension(ApplicationPath).ToLowerInvariant())
                {
                    case ".xci":
@@ -874,7 +887,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }

@@ -883,11 +896,11 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }

-        private void InitializeSwitchInstance()
+        private void InitEmulatedSwitch()
        {
            // Initialize KeySet.
            VirtualFileSystem.ReloadKeySet();
@@ -1042,7 +1055,7 @@ namespace Ryujinx.Ava
                    _viewModel.WindowState = WindowState.FullScreen;
                }

-                if (_viewModel.WindowState is WindowState.FullScreen)
+                if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
                {
                    _viewModel.ShowMenuAndStatusBar = false;
                }
@@ -1149,8 +1162,8 @@ namespace Ryujinx.Ava
                LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                dockedMode,
                ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
-                $"FIFO: {Device.Statistics.GetFifoPercent():00.00} %",
+                Device.Statistics.FormatGameFrameRate(),
+                Device.Statistics.FormatFifoPercent(),
                _displayCount));
        }

--- a/src/Ryujinx/Assets/Fonts/Mono/AUTHORS.txt
+++ b/src/Ryujinx/Assets/Fonts/Mono/AUTHORS.txt
@@ -0,0 +1,10 @@
+# This is the official list of project authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS.txt file.
+# See the latter for an explanation.
+# 
+# Names should be added to this file as:
+# Name or Organization <email address>
+
+JetBrains <>
+Philipp Nurullin <philipp.nurullin@jetbrains.com>
+Konstantin Bulenkov <kb@jetbrains.com>
--- a/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Bold.ttf
+++ b/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Bold.ttf
--- a/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-BoldItalic.ttf
+++ b/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-BoldItalic.ttf
--- a/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Italic.ttf
+++ b/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Italic.ttf
--- a/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Regular.ttf
+++ b/src/Ryujinx/Assets/Fonts/Mono/JetBrainsMonoNL-Regular.ttf
--- a/src/Ryujinx/Assets/Fonts/Mono/OFL.txt
+++ b/src/Ryujinx/Assets/Fonts/Mono/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/src/Ryujinx/Assets/Styles/CheckboxMenuItemStyle.axaml
+++ b/src/Ryujinx/Assets/Styles/CheckboxMenuItemStyle.axaml
@@ -0,0 +1,13 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style Selector="MenuItem.withCheckbox Viewbox#PART_IconPresenter">
+        <Setter Property="MaxHeight" Value="36" />
+        <Setter Property="MinHeight" Value="36" />
+        <Setter Property="MaxWidth" Value="36" />
+        <Setter Property="MinWidth" Value="36" />
+    </Style>
+    <Style Selector="MenuItem.withCheckbox ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Padding" Value="-10,0,0,0" />
+    </Style>
+</Styles>
+
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -402,7 +402,7 @@
        <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
        <x:Double x:Key="MenuItemHeight">26</x:Double>
        <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
        <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
    </Styles.Resources>
 </Styles>
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
--- a/Show More
+++ b/Show More