UI: Compatibility List Viewer

Use Canary-Releases for AppImage Canary updates
give canary appimages the ryujinx-canary name
2025-09-11 04:18:16 +00:00 · 2025-01-06 07:31:57 -06:00 · 2025-01-06 01:27:37 -06:00 · 2025-01-06 01:22:05 -06:00 · 2025-01-06 01:15:39 -06:00 · 2025-01-06 01:07:16 -06:00
80 changed files with 2434 additions and 2630 deletions
--- 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:
--- a/.github/workflows/nightly_pr_comment.yml
+++ b/.github/workflows/nightly_pr_comment.yml
@@ -40,8 +40,8 @@ jobs:
            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
@@ -121,6 +121,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 +166,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
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -17,6 +17,7 @@
    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
    <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="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
@@ -41,8 +42,9 @@
    <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.6.8" />
+    <PackageVersion Include="Gommon" Version="2.7.0.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" />
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -0,0 +1,269 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Unicorn", "src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj", "{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE", "src\Ryujinx.HLE\Ryujinx.HLE.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.ShaderTools", "src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj", "{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Common", "src\Ryujinx.Common\Ryujinx.Common.csproj", "{5FD4E4F6-8928-4B3C-BE07-28A675C17226}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMeilleure", "src\ARMeilleure\ARMeilleure.csproj", "{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Gpu", "src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj", "{ADA7EA87-0D63-4D97-9433-922A2124401F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.GAL", "src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj", "{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.OpenGL", "src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj", "{9558FB96-075D-4219-8FFF-401979DC0B69}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture", "src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj", "{E1B1AD28-289D-47B7-A106-326972240207}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "src\Ryujinx.Audio\Ryujinx.Audio.csproj", "{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Memory", "src\Ryujinx.Memory\Ryujinx.Memory.csproj", "{A5E6C691-9E22-4263-8F40-42F002CE66BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Memory", "src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj", "{D1CC5322-7325-4F6B-9625-194B30BE1296}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Cpu", "src\Ryujinx.Cpu\Ryujinx.Cpu.csproj", "{3DF35E3D-D844-4399-A9A1-A9E923264C17}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Device", "src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj", "{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Host1x", "src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj", "{C35F1536-7DE5-4F9D-9604-B5B4E1561947}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.Vp9", "src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj", "{B9AECA11-E248-4886-A10B-81B631CAAF29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vic", "src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj", "{81BB2C11-9408-4EA3-822E-42987AF54429}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Video", "src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj", "{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.OpenAL", "src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj", "{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SoundIo", "src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj", "{716364DE-B988-41A6-BAB4-327964266ECC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input", "src\Ryujinx.Input\Ryujinx.Input.csproj", "{C16F112F-38C3-40BC-9F5F-4791112063D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input.SDL2", "src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj", "{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj", "{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Generators", "src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj", "{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vulkan", "src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj", "{D4D09B08-D580-4D69-B886-C35D2853F6C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spv.Generator", "src\Spv.Generator\Spv.Generator.csproj", "{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.UI.LocaleGenerator", "src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj", "{77D01AD9-2C98-478E-AE1D-8F7100738FB4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Common", "src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj", "{77F96ECE-4952-42DB-A528-DED25572A573}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryujinx.Horizon\Ryujinx.Horizon.csproj", "{AF34127A-3A92-43E5-8496-14960A50B1F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal.SharpMetalExtensions", "src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj", "{81EA598C-DBA1-40B0-8DA4-4796B78F2037}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\canary.yml = .github\workflows\canary.yml
+		Directory.Packages.props = Directory.Packages.props
+		.github\workflows\release.yml = .github\workflows\release.yml
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {110169B3-3328-4730-8AB0-BA05BEF75C1A}
+	EndGlobalSection
+EndGlobal
--- a/Ryujinx.slnx
+++ b/Ryujinx.slnx
@@ -1,52 +0,0 @@
-<Solution>
-  <Folder Name="/Solution Items/">
-    <File Path=".editorconfig" />
-    <File Path=".github\workflows\build.yml" />
-    <File Path=".github\workflows\canary.yml" />
-    <File Path="Directory.Packages.props" />
-    <File Path=".github\workflows\release.yml" />
-  </Folder>
-  <Project Path="src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj" Type="Classic C#" />
-  <Project Path="src\ARMeilleure\ARMeilleure.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
-  <Project Path="src\Ryujinx.Audio\Ryujinx.Audio.csproj" />
-  <Project Path="src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Type="Classic C#">
-    <Configuration Solution="Debug|Any CPU" Project="Debug|Any CPU|NoBuild" />
-    <Configuration Solution="Release|Any CPU" Project="Release|Any CPU|NoBuild" />
-  </Project>
-  <Project Path="src\Ryujinx.Common\Ryujinx.Common.csproj" />
-  <Project Path="src\Ryujinx.Cpu\Ryujinx.Cpu.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj" />
-  <Project Path="src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj" />
-  <Project Path="src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-  <Project Path="src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj" />
-  <Project Path="src\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj" />
-  <Project Path="src\Ryujinx.Horizon\Ryujinx.Horizon.csproj" />
-  <Project Path="src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-  <Project Path="src\Ryujinx.Input\Ryujinx.Input.csproj" />
-  <Project Path="src\Ryujinx.Memory\Ryujinx.Memory.csproj" />
-  <Project Path="src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj" />
-  <Project Path="src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj" />
-  <Project Path="src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj" />
-  <Project Path="src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj" />
-  <Project Path="src\Ryujinx.Tests\Ryujinx.Tests.csproj" />
-  <Project Path="src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj" />
-  <Project Path="src\Ryujinx\Ryujinx.csproj" />
-  <Project Path="src\Spv.Generator\Spv.Generator.csproj" />
-</Solution>
--- 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/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.BuildValidationTasks/IValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/IValidationTask.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.BuildValidationTasks
 {
-    public interface ValidationTask
+    public interface IValidationTask
    {
        public bool Execute(string projectPath, bool isGitRunner);
    }
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -7,7 +7,7 @@ using System.Text.Encodings.Web;

 namespace Ryujinx.BuildValidationTasks
 {
-    public class LocalesValidationTask : ValidationTask
+    public class LocalesValidationTask : IValidationTask
    {
        public LocalesValidationTask() { }

--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -10,6 +10,7 @@
    <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
      Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
      ConsoleToMsBuild="true"
+      Condition="'$(RuntimeIdentifier)' == ''"
      />
  </Target>

--- a/src/Ryujinx.Common/BitTricks.cs
+++ b/src/Ryujinx.Common/BitTricks.cs
@@ -1,35 +0,0 @@
-namespace Ryujinx.Common
-{
-    public class BitTricks
-    {
-        // Never actually written bit packing logic before, so I looked it up.
-        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
-        
-        public static ulong PackBitFields(uint[] values, byte[] bitFields)
-        {
-            ulong retVal = values[0]; //we set the first value right away
-            for (int f = 1; f < values.Length; f++)
-            {
-                retVal <<= bitFields[f]; // we shift the previous value
-                retVal += values[f];// and add our current value
-            }
-            return retVal;
-        }
-
-        public static uint[] UnpackBitFields(ulong packed, byte[] bitFields)
-        {
-            int fields = bitFields.Length - 1; // number of fields to unpack
-            uint[] retArr = new uint[fields + 1]; // init return array
-            int curPos = 0; // current field bit position (start)
-            int lastEnd; // position where last field ended
-            for (int f = fields; f >= 0; f--) // loop from last
-            {
-                lastEnd = curPos; // we store where the last value ended
-                curPos += bitFields[f]; // we get where the current value starts
-                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
-                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
-            }
-            return retArr;
-        }
-    }
-}
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHack.cs
@@ -0,0 +1,60 @@
+using Gommon;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Common.Configuration
+{
+    [Flags]
+    public enum DirtyHack : byte
+    {
+        Xc2MenuSoftlockFix = 1,
+        ShaderTranslationDelay = 2
+    }
+
+    public readonly struct EnabledDirtyHack(DirtyHack hack, int value)
+    {
+        public DirtyHack Hack => hack;
+        public int Value => value;
+        
+        
+        
+        public ulong Pack() => Raw.PackBitFields(PackedFormat);
+
+        public static EnabledDirtyHack Unpack(ulong packedHack)
+        {
+            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
+            if (unpackedFields is not [var hack, var value])
+                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
+            
+            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
+        }
+        
+        private uint[] Raw => [(uint)Hack, (uint)Value.CoerceAtLeast(0)];
+        
+        public static readonly byte[] PackedFormat = [8, 32];
+    }
+
+    public class DirtyHacks : Dictionary<DirtyHack, int>
+    {
+        public DirtyHacks(IEnumerable<EnabledDirtyHack> hacks) 
+            => hacks.ForEach(edh => Add(edh.Hack, edh.Value));
+
+        public DirtyHacks(ulong[] packedHacks) : this(packedHacks.Select(EnabledDirtyHack.Unpack)) {}
+
+        public ulong[] PackEntries() 
+            => Entries.Select(it => it.Pack()).ToArray();
+        
+        public EnabledDirtyHack[] Entries 
+            => this
+                .Select(it => new EnabledDirtyHack(it.Key, it.Value))
+                .ToArray();
+
+        public static implicit operator DirtyHacks(EnabledDirtyHack[] hacks) => new(hacks);
+        public static implicit operator DirtyHacks(ulong[] packedHacks) => new(packedHacks);
+
+        public new int this[DirtyHack hack] => TryGetValue(hack, out var value) ? value : -1;
+
+        public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
+    }
+}
--- a/src/Ryujinx.Common/Configuration/DirtyHacks.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHacks.cs
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Common.Configuration
-{
-    [Flags]
-    public enum DirtyHacks : byte
-    {
-        Xc2MenuSoftlockFix = 1,
-        ShaderCompilationThreadSleep = 2
-    }
-
-    public record EnabledDirtyHack(DirtyHacks Hack, int Value)
-    {
-        public static readonly byte[] PackedFormat = [8, 32];
-        
-        public ulong Pack() => BitTricks.PackBitFields([(uint)Hack, (uint)Value], PackedFormat);
-
-        public static EnabledDirtyHack Unpack(ulong packedHack)
-        {
-            var unpackedFields = BitTricks.UnpackBitFields(packedHack, PackedFormat);
-            if (unpackedFields is not [var hack, var value])
-                throw new ArgumentException(nameof(packedHack));
-            
-            return new EnabledDirtyHack((DirtyHacks)hack, (int)value);
-        }
-    }
-
-    public class DirtyHackCollection : Dictionary<DirtyHacks, int>
-    {
-        public DirtyHackCollection(EnabledDirtyHack[] hacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in hacks)
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-        
-        public DirtyHackCollection(ulong[] packedHacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in packedHacks.Select(EnabledDirtyHack.Unpack))
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-
-        public ulong[] PackEntries() =>
-            this
-                .Select(it => 
-                    BitTricks.PackBitFields([(uint)it.Key, (uint)it.Value], EnabledDirtyHack.PackedFormat))
-                .ToArray();
-
-        public static implicit operator DirtyHackCollection(EnabledDirtyHack[] hacks) => new(hacks);
-        public static implicit operator DirtyHackCollection(ulong[] packedHacks) => new(packedHacks);
-
-        public new int this[DirtyHacks hack] => TryGetValue(hack, out var value) ? value : -1;
-
-        public bool IsEnabled(DirtyHacks hack) => ContainsKey(hack);
-    }
-}
--- a/src/Ryujinx.Common/ReactiveObject.cs
+++ b/src/Ryujinx.Common/ReactiveObject.cs
@@ -53,6 +53,9 @@ namespace Ryujinx.Common
    {
        public static void LogValueChange<T>(LogClass logClass, ReactiveEventArgs<T> eventArgs, string valueName)
        {
+            if (eventArgs.AreValuesEqual)
+                return;
+            
            string message = string.Create(CultureInfo.InvariantCulture, $"{valueName} set to: {eventArgs.NewValue}");

            Logger.Info?.Print(logClass, message);
@@ -65,5 +68,22 @@ namespace Ryujinx.Common
    {
        public T OldValue { get; } = oldValue;
        public T NewValue { get; } = newValue;
+
+        public bool AreValuesEqual
+        {
+            get
+            {
+                if (OldValue == null && NewValue == null)
+                    return true;
+
+                if (OldValue == null && NewValue != null)
+                    return false;
+                
+                if (OldValue != null && NewValue == null)
+                    return false;
+
+                return OldValue!.Equals(NewValue);
+            }
+        }
    }
 }
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -35,7 +35,8 @@ namespace Ryujinx.Common
            "010028600EBDA000", // Mario 3D World
            "0100152000022000", // Mario Kart 8 Deluxe
            "01005CA01580E000", // Persona 5
-            "01001f5010dfa000", // Pokemon Legends Arceus
+            "0100187003A36000", // Pokémon: Let's Go, Evoli!
+            "010003f003a34000", // Pokémon: Let's Go, Pikachu!
            "01008C0016544000", // Sea of Stars
            "01006A800016E000", // Smash Ultimate
            "0100000000010000", // Super Mario Odyessy
@@ -170,6 +171,7 @@ namespace Ryujinx.Common
            "0100b41013c82000", // Cruis'n Blast
            "01001b300b9be000", // Diablo III: Eternal Collection
            "01008c8012920000", // Dying Light Platinum Edition
+            "01001cc01b2d4000", // Goat Simulator 3
            "010073c01af34000", // LEGO Horizon Adventures
            "0100770008dd8000", // Monster Hunter Generations Ultimate
            "0100b04011742000", // Monster Hunter Rise
--- a/src/Ryujinx.Common/Utilities/BitUtils.cs
+++ b/src/Ryujinx.Common/Utilities/BitUtils.cs
@@ -40,5 +40,35 @@ namespace Ryujinx.Common

            return (value >> 32) | (value << 32);
        }
+        
+        // Never actually written bit packing logic before, so I looked it up.
+        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
+        
+        public static ulong PackBitFields(this uint[] values, byte[] bitFields)
+        {
+            ulong retVal = values[0]; //we set the first value right away
+            for (int f = 1; f < values.Length; f++)
+            {
+                retVal <<= bitFields[f]; // we shift the previous value
+                retVal += values[f];// and add our current value
+            }
+            return retVal;
+        }
+
+        public static uint[] UnpackBitFields(this ulong packed, byte[] bitFields)
+        {
+            int fields = bitFields.Length - 1; // number of fields to unpack
+            uint[] retArr = new uint[fields + 1]; // init return array
+            int curPos = 0; // current field bit position (start)
+            int lastEnd; // position where last field ended
+            for (int f = fields; f >= 0; f--) // loop from last
+            {
+                lastEnd = curPos; // we store where the last value ended
+                curPos += bitFields[f]; // we get where the current value starts
+                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
+                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
+            }
+            return retArr;
+        }
    }
 }
--- a/src/Ryujinx.Graphics.Gpu/GpuContext.cs
+++ b/src/Ryujinx.Graphics.Gpu/GpuContext.cs
@@ -92,7 +92,11 @@ namespace Ryujinx.Graphics.Gpu
        /// </summary>
        internal SupportBufferUpdater SupportBufferUpdater { get; }
        
-        internal DirtyHackCollection DirtyHacks { get; }
+        /// <summary>
+        /// Enabled dirty hacks.
+        /// Used for workarounds to emulator bugs we can't fix/don't know how to fix yet.
+        /// </summary>
+        internal DirtyHacks DirtyHacks { get; }
        

        /// <summary>
@@ -117,7 +121,7 @@ namespace Ryujinx.Graphics.Gpu
        /// Creates a new instance of the GPU emulation context.
        /// </summary>
        /// <param name="renderer">Host renderer</param>
-        public GpuContext(IRenderer renderer, DirtyHackCollection hackCollection)
+        public GpuContext(IRenderer renderer, DirtyHacks hacks)
        {
            Renderer = renderer;

@@ -140,7 +144,7 @@ namespace Ryujinx.Graphics.Gpu

            SupportBufferUpdater = new SupportBufferUpdater(renderer);

-            DirtyHacks = hackCollection;
+            DirtyHacks = hacks;

            _firstTimestamp = ConvertNanosecondsToTicks((ulong)PerformanceCounter.ElapsedNanoseconds);
        }
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
@@ -367,8 +367,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        {
            try
            {
-                if (_context.DirtyHacks.IsEnabled(DirtyHacks.ShaderCompilationThreadSleep))
-                    Thread.Sleep(_context.DirtyHacks[DirtyHacks.ShaderCompilationThreadSleep]);
+                if (_context.Capabilities.Api == TargetApi.Metal && _context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
+                    Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
                
                AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
                _asyncTranslationQueue.Add(asyncTranslation, _cancellationToken);
--- 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.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(DirtyHacks.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/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -40,7 +40,7 @@ namespace Ryujinx.HLE

        public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;

-        public DirtyHackCollection DirtyHacks { get; }
+        public DirtyHacks DirtyHacks { get; }

        public Switch(HLEConfiguration configuration)
        {
@@ -57,7 +57,7 @@ namespace Ryujinx.HLE
                : MemoryAllocationFlags.Reserve | MemoryAllocationFlags.Mirrorable;

 #pragma warning disable IDE0055 // Disable formatting
-            DirtyHacks        = new DirtyHackCollection(Configuration.Hacks);
+            DirtyHacks        = new DirtyHacks(Configuration.Hacks);
            AudioDeviceDriver = new CompatLayerHardwareDeviceDriver(Configuration.AudioDeviceDriver);
            Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
            Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);
--- 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;
@@ -314,7 +312,7 @@ namespace Ryujinx.Ava
            
            _renderer.Window?.ChangeVSyncMode(e.NewValue);

-            _viewModel.ShowCustomVSyncIntervalPicker = (e.NewValue == VSyncMode.Custom);
+            _viewModel.UpdateVSyncIntervalPicker();
        }

        public void VSyncModeToggle()
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1234,8 +1234,8 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
+        "ko_KR": "자주 묻는 질문(FAQ) 및 안내",
+        "no_NO": "Vanlige spørsmål og veiledninger",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "FAQ и Руководства",
@@ -1460,7 +1460,7 @@
        "it_IT": "Preferito",
        "ja_JP": "お気に入り",
        "ko_KR": "즐겨찾기",
-        "no_NO": "",
+        "no_NO": "Favoritter",
        "pl_PL": "Ulubione",
        "pt_BR": "Favorito",
        "ru_RU": "Избранное",
@@ -2609,8 +2609,8 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
+        "ko_KR": "펌웨어 버전 : {0}",
+        "no_NO": "Fastvareversjon: {0}",
        "pl_PL": "",
        "pt_BR": "Versão do firmware: {0}",
        "ru_RU": "Версия прошивки: {0}",
@@ -3460,7 +3460,7 @@
        "it_IT": "Corea",
        "ja_JP": "韓国",
        "ko_KR": "한국",
-        "no_NO": "",
+        "no_NO": "Koreansk",
        "pl_PL": "",
        "pt_BR": "Coreia",
        "ru_RU": "Корея",
@@ -4009,8 +4009,8 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
+        "ko_KR": "PC 날짜와 시간에 동기화",
+        "no_NO": "Resynkroniser til PC-dato og -klokkeslett",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Повторная синхронизация с датой и временем на компьютере",
@@ -15259,8 +15259,8 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
+        "ko_KR": "시스템 시간을 PC의 현재 날짜 및 시간과 일치하도록 다시 동기화합니다.\n\n이 설정은 활성 설정이 아니므로 여전히 동기화되지 않을 수 있으며, 이 경우 이 버튼을 다시 클릭하면 됩니다.",
+        "no_NO": "Resynkroniser systemtiden slik at den samsvarer med PC-ens gjeldende dato og klokkeslett. \\Dette er ikke en aktiv innstilling, men den kan likevel komme ut av synkronisering; i så fall er det bare å klikke på denne knappen igjen.",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Повторно синхронизирует системное время, чтобы оно соответствовало текущей дате и времени вашего компьютера.\n\nЭто не активная настройка, она все еще может рассинхронизироваться; в этом случае просто нажмите эту кнопку еще раз.",
@@ -20509,7 +20509,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "자동",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
@@ -20534,8 +20534,8 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
+        "ko_KR": "Vulkan을 사용합니다.\nARM 맥에서 해당 플랫폼에서 잘 실행되는 게임을 플레이하는 경우 Metal 후단부를 사용합니다.",
+        "no_NO": "Bruker Vulkan \nPå en ARM Mac, og når du spiller et spill som kjører bra under den, bruker du Metal-backend.",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Использует Vulkan.\nНа Mac с ARM процессорами используется Metal, если игра с ним совместима и хорошо работает.",
@@ -22596,6 +22596,206 @@
        "zh_CN": "降低自定义刷新率：",
        "zh_TW": ""
      }
+    },
+    {
+      "ID": "CompatibilityListSearchBoxWatermark",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Search compatibility entries...",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListOpen",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Open Compatibility List",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListOnlyShowOwnedGames",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Only show owned games",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListPlayable",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Playable",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListIngame",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Ingame",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListMenus",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Menus",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListBoots",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Boots",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "CompatibilityListNothing",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Nothing",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
    }
  ]
 }
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -52,7 +52,7 @@ namespace Ryujinx.Headless
            // Make process DPI aware for proper window sizing on high-res screens.
            ForceDpiAware.Windows();

-            Console.Title = $"Ryujinx Console {Program.Version} (Headless)";
+            Console.Title = $"HeadlessRyujinx Console {Program.Version}";

            if (OperatingSystem.IsMacOS() || OperatingSystem.IsLinux())
            {
@@ -162,6 +162,11 @@ namespace Ryujinx.Headless
            }
            
            ReloadConfig();
+
+            if (option.InheritConfig)
+            {
+                option.InheritMainConfigInput(originalArgs, ConfigurationState.Instance);
+            }
            
            _virtualFileSystem = VirtualFileSystem.CreateInstance();
            _libHacHorizonManager = new LibHacHorizonManager();
@@ -224,15 +229,7 @@ namespace Ryujinx.Headless
            _enableKeyboard = option.EnableKeyboard;
            _enableMouse = option.EnableMouse;

-            static void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
-            {
-                InputConfig inputConfig = HandlePlayerConfiguration(inputProfileName, inputId, index);

-                if (inputConfig != null)
-                {
-                    _inputConfiguration.Add(inputConfig);
-                }
-            }
            
            LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
            LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -244,7 +241,6 @@ namespace Ryujinx.Headless
            LoadPlayerConfiguration(option.InputProfile8Name, option.InputId8, PlayerIndex.Player8);
            LoadPlayerConfiguration(option.InputProfileHandheldName, option.InputIdHandheld, PlayerIndex.Handheld);
            
-
            if (_inputConfiguration.Count == 0)
            {
                return;
@@ -306,6 +302,24 @@ namespace Ryujinx.Headless
            }

            _inputManager.Dispose();
+
+            return;
+            
+            void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
+            {
+                if (index == PlayerIndex.Handheld && _inputConfiguration.Count > 0)
+                {
+                    Logger.Info?.Print(LogClass.Configuration, "Skipping handheld configuration as there are already other players configured.");
+                    return;
+                }
+                
+                InputConfig inputConfig = option.InheritedInputConfigs[index] ?? HandlePlayerConfiguration(inputProfileName, inputId, index);
+
+                if (inputConfig != null)
+                {
+                    _inputConfiguration.Add(inputConfig);
+                }
+            }
        }

        private static void SetupProgressHandler()
--- a/src/Ryujinx/Headless/Options.cs
+++ b/src/Ryujinx/Headless/Options.cs
@@ -154,10 +154,37 @@ namespace Ryujinx.Headless
            return;
            
            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
-
-            string OptionName(string propertyName) =>
-                typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
        }
+
+        public void InheritMainConfigInput(string[] originalArgs, ConfigurationState configurationState)
+        {
+            Dictionary<PlayerIndex, (string InputId, string InputProfileName)> indicesToProperties = new()
+            {
+                { PlayerIndex.Handheld, (nameof(InputIdHandheld), nameof(InputProfileHandheldName)) },
+                { PlayerIndex.Player1, (nameof(InputId1), nameof(InputProfile1Name)) },
+                { PlayerIndex.Player2, (nameof(InputId2), nameof(InputProfile2Name)) },
+                { PlayerIndex.Player3, (nameof(InputId3), nameof(InputProfile3Name)) },
+                { PlayerIndex.Player4, (nameof(InputId4), nameof(InputProfile4Name)) },
+                { PlayerIndex.Player5, (nameof(InputId5), nameof(InputProfile5Name)) },
+                { PlayerIndex.Player6, (nameof(InputId6), nameof(InputProfile6Name)) },
+                { PlayerIndex.Player7, (nameof(InputId7), nameof(InputProfile7Name)) },
+                { PlayerIndex.Player8, (nameof(InputId8), nameof(InputProfile8Name)) }
+            };
+
+            foreach ((PlayerIndex playerIndex, _) in indicesToProperties
+                         .Where(it => NeedsOverride(it.Value.InputId) && NeedsOverride(it.Value.InputProfileName)))
+            {
+                configurationState.Hid.InputConfig.Value.FindFirst(x => x.PlayerIndex == playerIndex)
+                    .IfPresent(ic => InheritedInputConfigs[playerIndex] = ic);
+            }
+
+            return;
+            
+            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
+        }
+
+        private static string OptionName(string propertyName) =>
+            typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
        
        // General
        
@@ -391,5 +418,7 @@ namespace Ryujinx.Headless

        [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]
        public string InputPath { get; set; }
+
+        public SafeDictionary<PlayerIndex, InputConfig> InheritedInputConfigs = new();
    }
 }
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -15,10 +15,7 @@

  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
    <Message Text="Building Validation Project for $(TargetFramework)" Importance="high" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Message Text="Building Validation Project for $(TargetFramework) with runtime $(RuntimeIdentifier)" Importance="high" Condition="'$(RuntimeIdentifier)' != ''" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --ucr true" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --runtime $(RuntimeIdentifier)" Condition="'$(RuntimeIdentifier)' != ''" />
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Properties="Configuration=Debug" />
+    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet build -c Debug /clp:NoSummary" />
    
  </Target>

@@ -52,6 +49,7 @@
    <PackageReference Include="Avalonia.Svg" />
    <PackageReference Include="Avalonia.Svg.Skia" />
    <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
    <PackageReference Include="DiscordRichPresence" />
    <PackageReference Include="DynamicData" />
    <PackageReference Include="FluentAvaloniaUI" />
@@ -63,6 +61,7 @@
    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
    <PackageReference Include="securifybv.ShellLink" />
+    <PackageReference Include="Sep" />
    <PackageReference Include="Silk.NET.Vulkan" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
@@ -115,6 +114,10 @@
    <AvaloniaResource Include="UI\**\*.xaml">
      <SubType>Designer</SubType>
    </AvaloniaResource>
+    <AvaloniaResource Include="Assets\Fonts\Mono\JetBrainsMonoNL-Bold.ttf" />
+    <AvaloniaResource Include="Assets\Fonts\Mono\JetBrainsMonoNL-BoldItalic.ttf" />
+    <AvaloniaResource Include="Assets\Fonts\Mono\JetBrainsMonoNL-Italic.ttf" />
+    <AvaloniaResource Include="Assets\Fonts\Mono\JetBrainsMonoNL-Regular.ttf" />
    <AvaloniaResource Include="Assets\Fonts\SegoeFluentIcons.ttf" />
    <AvaloniaResource Include="Assets\Styles\Themes.xaml">
      <Generator>MSBuild:Compile</Generator>
@@ -165,4 +168,13 @@
  <ItemGroup>
    <AdditionalFiles Include="Assets\locales.json" />
  </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Compile Update="Utilities\Compat\CompatibilityList.axaml.cs">
+      <DependentUpon>CompatibilityList.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Assets\Fonts\Mono\" />
+  </ItemGroup>
+</Project>
--- a/src/Ryujinx/RyujinxApp.axaml
+++ b/src/Ryujinx/RyujinxApp.axaml
@@ -6,6 +6,9 @@
    <Application.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <FontFamily x:Key="JetBrainsMono">avares://Ryujinx/Assets/Fonts/Mono/#JetBrains Mono</FontFamily>
+                </ResourceDictionary>
                <MergeResourceInclude Source="/Assets/Styles/Themes.xaml"/>
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -15,7 +15,6 @@
    x:DataType="viewModels:MainWindowViewModel">
    <UserControl.Resources>
        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
    </UserControl.Resources>
    <Grid>
        <Grid.RowDefinitions>
@@ -26,10 +25,10 @@
            Padding="8"
            HorizontalAlignment="Stretch"
            VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding GridSelectedApplication}"
+            ContextFlyout="{Binding GridAppContextMenu}"
            DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
-            SelectionChanged="GameList_SelectionChanged">
+            ItemsSource="{Binding AppsObservableList}">
            <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
                    <WrapPanel
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
@@ -26,11 +26,5 @@ namespace Ryujinx.Ava.UI.Controls
            if (sender is ListBox { SelectedItem: ApplicationData selected })
                RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
        }
-
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.GridSelectedApplication = selected;
-        }
    }
 }
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -7,7 +7,6 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:converters="clr-namespace:Avalonia.Data.Converters;assembly=Avalonia.Base"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
@@ -16,7 +15,6 @@
    x:DataType="viewModels:MainWindowViewModel">
    <UserControl.Resources>
        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
    </UserControl.Resources>
    <Grid>
        <Grid.RowDefinitions>
@@ -28,10 +26,10 @@
            Padding="8"
            HorizontalAlignment="Stretch"
            VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding ListSelectedApplication}"
+            ContextFlyout="{Binding ListAppContextMenu}"
            DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
-            SelectionChanged="GameList_SelectionChanged">
+            ItemsSource="{Binding AppsObservableList}">
            <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
                    <StackPanel
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -30,12 +30,6 @@ namespace Ryujinx.Ava.UI.Controls
                RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
        }

-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.ListSelectedApplication = selected;
-        }
-
        private async void IdString_OnClick(object sender, RoutedEventArgs e)
        {
            if (DataContext is not MainWindowViewModel mwvm)
--- a/src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs
+++ b/src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs
@@ -0,0 +1,28 @@
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Gommon;
+using Ryujinx.Ava.Common.Locale;
+using System;
+using System.Globalization;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    public class PlayabilityStatusConverter : IValueConverter
+    {
+        private static readonly Lazy<PlayabilityStatusConverter> _shared = new(() => new());
+        public static PlayabilityStatusConverter Shared => _shared.Value;
+
+        public object Convert(object? value, Type _, object? __, CultureInfo ___) =>
+            value.Cast<LocaleKeys>() switch
+            {
+                LocaleKeys.CompatibilityListNothing or 
+                    LocaleKeys.CompatibilityListBoots or 
+                    LocaleKeys.CompatibilityListMenus => Brushes.Red,
+                LocaleKeys.CompatibilityListIngame => Brushes.Yellow,
+                _ => Brushes.ForestGreen
+            };
+
+        public object ConvertBack(object? value, Type _, object? __, CultureInfo ___) 
+            => throw new NotSupportedException();
+    }
+}
--- a/src/Ryujinx/UI/Renderer/RendererHost.axaml
+++ b/src/Ryujinx/UI/Renderer/RendererHost.axaml
@@ -1,12 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignWidth="800"
-    d:DesignHeight="450"
-    x:Class="Ryujinx.Ava.UI.Renderer.RendererHost"
-    FlowDirection="LeftToRight"
-    Focusable="True">
-</UserControl>
--- a/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
+++ b/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
@@ -1,16 +1,15 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
-using Gommon;
+using Avalonia.Media;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using System;
-using System.Runtime.InteropServices;

 namespace Ryujinx.Ava.UI.Renderer
 {
-    public partial class RendererHost : UserControl, IDisposable
+    public class RendererHost : UserControl, IDisposable
    {
        public readonly EmbeddedWindow EmbeddedWindow;

@@ -19,7 +18,8 @@ namespace Ryujinx.Ava.UI.Renderer

        public RendererHost()
        {
-            InitializeComponent();
+            Focusable = true;
+            FlowDirection = FlowDirection.LeftToRight;

            EmbeddedWindow = ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
            {
@@ -43,8 +43,6 @@ namespace Ryujinx.Ava.UI.Renderer

        public RendererHost(string titleId)
        {
-            InitializeComponent();
-
            switch (TitleIDs.SelectGraphicsBackend(titleId, ConfigurationState.Instance.Graphics.GraphicsBackend))
            {
                case GraphicsBackend.OpenGl:
@@ -109,3 +107,4 @@ namespace Ryujinx.Ava.UI.Renderer
        }
    }
 }
+
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -1,6 +1,7 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Styling;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.Configuration;
@@ -8,42 +9,11 @@ using System;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class AboutWindowViewModel : BaseModel, IDisposable
+    public partial class AboutWindowViewModel : BaseModel, IDisposable
    {
-        private Bitmap _githubLogo;
-        private Bitmap _discordLogo;
-
-        private string _version;
-
-        public Bitmap GithubLogo
-        {
-            get => _githubLogo;
-            set
-            {
-                _githubLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap DiscordLogo
-        {
-            get => _discordLogo;
-            set
-            {
-                _discordLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Version
-        {
-            get => _version;
-            set
-            {
-                _version = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Bitmap _githubLogo;
+        [ObservableProperty] private Bitmap _discordLogo;
+        [ObservableProperty] private string _version;

        public string Developers => "GreemDev";

--- a/src/Ryujinx/UI/ViewModels/BaseModel.cs
+++ b/src/Ryujinx/UI/ViewModels/BaseModel.cs
@@ -1,18 +1,10 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class BaseModel : INotifyPropertyChanged
+    public class BaseModel : ObservableObject
    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        
        protected void OnPropertiesChanged(string firstPropertyName, params ReadOnlySpan<string> propertyNames)
        {
            OnPropertyChanged(firstPropertyName);
--- a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
@@ -2,6 +2,7 @@ using Avalonia.Collections;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
@@ -17,13 +18,13 @@ using Application = Avalonia.Application;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class DownloadableContentManagerViewModel : BaseModel
+    public partial class DownloadableContentManagerViewModel : BaseModel
    {
        private readonly ApplicationLibrary _applicationLibrary;
        private AvaloniaList<DownloadableContentModel> _downloadableContents = new();
-        private AvaloniaList<DownloadableContentModel> _selectedDownloadableContents = new();
-        private AvaloniaList<DownloadableContentModel> _views = new();
-        private bool _showBundledContentNotice = false;
+        [ObservableProperty] private AvaloniaList<DownloadableContentModel> _selectedDownloadableContents = new();
+        [ObservableProperty] private AvaloniaList<DownloadableContentModel> _views = new();
+        [ObservableProperty] private bool _showBundledContentNotice = false;

        private string _search;
        private readonly ApplicationData _applicationData;
@@ -41,26 +42,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public AvaloniaList<DownloadableContentModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<DownloadableContentModel> SelectedDownloadableContents
-        {
-            get => _selectedDownloadableContents;
-            set
-            {
-                _selectedDownloadableContents = value;
-                OnPropertyChanged();
-            }
-        }
-
        public string Search
        {
            get => _search;
@@ -77,26 +58,13 @@ namespace Ryujinx.Ava.UI.ViewModels
            get => string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowHeading], DownloadableContents.Count);
        }

-        public bool ShowBundledContentNotice
-        {
-            get => _showBundledContentNotice;
-            set
-            {
-                _showBundledContentNotice = value;
-                OnPropertyChanged();
-            }
-        }
-
        public DownloadableContentManagerViewModel(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
        {
            _applicationLibrary = applicationLibrary;

            _applicationData = applicationData;

-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;

            LoadDownloadableContents();
        }
@@ -138,9 +106,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            // NOTE(jpr): this works around a bug where calling _views.Clear also clears SelectedDownloadableContents for
            // some reason. so we save the items here and add them back after
            var items = SelectedDownloadableContents.ToArray();
-
-            _views.Clear();
-            _views.AddRange(view);
+            
+            Views.Clear();
+            Views.AddRange(view);

            foreach (DownloadableContentModel item in items)
            {
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -245,9 +245,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        {
            if (Program.PreviewerDetached)
            {
-                _mainWindow =
-                    (MainWindow)((IClassicDesktopStyleApplicationLifetime)Application.Current
-                        .ApplicationLifetime).MainWindow;
+                _mainWindow = RyujinxApp.MainWindow;

                AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);

--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -6,6 +6,7 @@ using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
@@ -54,77 +55,77 @@ using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class MainWindowViewModel : BaseModel
+    public partial class MainWindowViewModel : BaseModel
    {
        private const int HotKeyPressDelayMs = 500;
        private delegate int LoadContentFromFolderDelegate(List<string> dirs, out int numRemoved);

-        private ObservableCollectionExtended<ApplicationData> _applications;
-        private string _aspectStatusText;
-
-        private string _loadHeading;
-        private string _cacheLoadStatus;
-        private string _searchText;
-        private Timer _searchTimer;
-        private string _dockedStatusText;
-        private string _vSyncModeText;
-        private string _fifoStatusText;
-        private string _gameStatusText;
-        private string _volumeStatusText;
-        private string _gpuStatusText;
-        private string _shaderCountText;
+        [ObservableProperty] private ObservableCollectionExtended<ApplicationData> _applications;
+        [ObservableProperty] private string _aspectRatioStatusText;
+        [ObservableProperty] private string _loadHeading;
+        [ObservableProperty] private string _cacheLoadStatus;
+        [ObservableProperty] private string _dockedStatusText;
+        [ObservableProperty] private string _fifoStatusText;
+        [ObservableProperty] private string _gameStatusText;
+        [ObservableProperty] private string _volumeStatusText;
+        [ObservableProperty] private string _gpuNameText;
+        [ObservableProperty] private string _backendText;
+        [ObservableProperty] private string _shaderCountText;
+        [ObservableProperty] private bool _showShaderCompilationHint;
+        [ObservableProperty] private bool _isFullScreen;
+        [ObservableProperty] private int _progressMaximum;
+        [ObservableProperty] private int _progressValue;
+        [ObservableProperty] private bool _showMenuAndStatusBar = true;
+        [ObservableProperty] private bool _showStatusSeparator;
+        [ObservableProperty] private Brush _progressBarForegroundColor;
+        [ObservableProperty] private Brush _progressBarBackgroundColor;
+        [ObservableProperty] private Brush _vSyncModeColor;
+        #nullable enable
+        [ObservableProperty] private byte[]? _selectedIcon;
+        #nullable disable
+        [ObservableProperty] private int _statusBarProgressMaximum;
+        [ObservableProperty] private int _statusBarProgressValue;
+        [ObservableProperty] private string _statusBarProgressStatusText;
+        [ObservableProperty] private bool _statusBarProgressStatusVisible;
+        [ObservableProperty] private bool _isPaused;
+        [ObservableProperty] private bool _isLoadingIndeterminate = true;
+        [ObservableProperty] private bool _showAll;
+        [ObservableProperty] private string _lastScannedAmiiboId;
+        [ObservableProperty] private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
+        [ObservableProperty] private long _lastFullscreenToggle = Environment.TickCount64;
+        [ObservableProperty] private bool _showContent = true;
+        [ObservableProperty] private float _volumeBeforeMute;
+        [ObservableProperty] private bool _areMimeTypesRegistered = FileAssociationHelper.AreMimeTypesRegistered;
+        [ObservableProperty] private Cursor _cursor;
+        [ObservableProperty] private string _title;
+        [ObservableProperty] private WindowState _windowState;
+        [ObservableProperty] private double _windowWidth;
+        [ObservableProperty] private double _windowHeight;
+        [ObservableProperty] private bool _isActive;
+        [ObservableProperty] private bool _isSubMenuOpen;
+        [ObservableProperty] private ApplicationContextMenu _listAppContextMenu;
+        [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
+        
+        private bool _showLoadProgress;
+        private bool _isGameRunning;
        private bool _isAmiiboRequested;
        private bool _isAmiiboBinRequested;
-        private bool _showShaderCompilationHint;
-        private bool _isGameRunning;
-        private bool _isFullScreen;
-        private int _progressMaximum;
-        private int _progressValue;
-        private long _lastFullscreenToggle = Environment.TickCount64;
-        private bool _showLoadProgress;
-        private bool _showMenuAndStatusBar = true;
-        private bool _showStatusSeparator;
-        private Brush _progressBarForegroundColor;
-        private Brush _progressBarBackgroundColor;
-        private Brush _vSyncModeColor;
-        private byte[] _selectedIcon;
-        private bool _isAppletMenuActive;
-        private int _statusBarProgressMaximum;
-        private int _statusBarProgressValue;
-        private string _statusBarProgressStatusText;
-        private bool _statusBarProgressStatusVisible;
-        private bool _isPaused;
-        private bool _showContent = true;
-        private bool _isLoadingIndeterminate = true;
-        private bool _showAll;
-        private string _lastScannedAmiiboId;
-        private bool _statusBarVisible;
-        private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
-
+        private string _searchText;
+        private Timer _searchTimer;
+        private string _vSyncModeText;
        private string _showUiKey = "F4";
        private string _pauseKey = "F5";
        private string _screenshotKey = "F8";
        private float _volume;
-        private float _volumeBeforeMute;
-        private string _backendText;
-
-        private bool _areMimeTypesRegistered = FileAssociationHelper.AreMimeTypesRegistered;
+        private bool _isAppletMenuActive;
+        private bool _statusBarVisible;
        private bool _canUpdate = true;
-        private Cursor _cursor;
-        private string _title;
        private ApplicationData _currentApplicationData;
        private readonly AutoResetEvent _rendererWaitEvent;
-        private WindowState _windowState;
-        private double _windowWidth;
-        private double _windowHeight;
        private int _customVSyncInterval;
        private int _customVSyncIntervalPercentageProxy;
-
-        private bool _isActive;
-        private bool _isSubMenuOpen;
-
-        public ApplicationData ListSelectedApplication;
-        public ApplicationData GridSelectedApplication;
+        private ApplicationData _listSelectedApplication;
+        private ApplicationData _gridSelectedApplication;
        
        // Key is Title ID
        public SafeDictionary<string, LdnGameData.Array> LdnData = [];
@@ -146,8 +147,11 @@ namespace Ryujinx.Ava.UI.ViewModels
            Applications.ToObservableChangeSet()
                .Filter(Filter)
                .Sort(GetComparer())
-                .Bind(out _appsObservableList)
-                .AsObservableList();
+                .OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
+                .OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
+#pragma warning disable MVVMTK0034 // Event to update is fired below
+                .Bind(out _appsObservableList);
+#pragma warning restore MVVMTK0034

            _rendererWaitEvent = new AutoResetEvent(false);

@@ -156,8 +160,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                LoadConfigurableHotKeys();

                Volume = ConfigurationState.Instance.System.AudioVolume;
+                CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
            }
-            CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
        }

        public void Initialize(
@@ -218,7 +222,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool CanUpdate
        {
-            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate(false);
+            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate();
            set
            {
                _canUpdate = value;
@@ -226,49 +230,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public Cursor Cursor
-        {
-            get => _cursor;
-            set
-            {
-                _cursor = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public ReadOnlyObservableCollection<ApplicationData> AppsObservableList
-        {
-            get => _appsObservableList;
-            set
-            {
-                _appsObservableList = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsPaused
-        {
-            get => _isPaused;
-            set
-            {
-                _isPaused = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public long LastFullscreenToggle
-        {
-            get => _lastFullscreenToggle;
-            set
-            {
-                _lastFullscreenToggle = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool StatusBarVisible
        {
            get => _statusBarVisible && EnableNonGameRunningControls;
@@ -284,17 +245,6 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool ShowFirmwareStatus => !ShowLoadProgress;

-        public bool ShowShaderCompilationHint
-        {
-            get => _showShaderCompilationHint;
-            set
-            {
-                _showShaderCompilationHint = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool IsGameRunning
        {
            get => _isGameRunning;
@@ -337,7 +287,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        }

        public bool CanScanAmiiboBinaries => AmiiboBinReader.HasAmiiboKeyFile;
-        
+
        public bool ShowLoadProgress
        {
            get => _showLoadProgress;
@@ -349,58 +299,40 @@ namespace Ryujinx.Ava.UI.ViewModels
                OnPropertyChanged(nameof(ShowFirmwareStatus));
            }
        }
-
-        public string GameStatusText
+        
+        public ApplicationData ListSelectedApplication
        {
-            get => _gameStatusText;
+            get => _listSelectedApplication;
            set
            {
-                _gameStatusText = value;
+                _listSelectedApplication = value;
+
+#pragma warning disable MVVMTK0034
+                if (_listSelectedApplication != null && _listAppContextMenu == null)
+
+                    ListAppContextMenu = new ApplicationContextMenu();
+                else if (_listSelectedApplication == null && _listAppContextMenu != null)
+                    ListAppContextMenu = null!;
+#pragma warning restore MVVMTK0034

                OnPropertyChanged();
            }
        }

-        public bool IsFullScreen
+        public ApplicationData GridSelectedApplication
        {
-            get => _isFullScreen;
+            get => _gridSelectedApplication;
            set
            {
-                _isFullScreen = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsSubMenuOpen
-        {
-            get => _isSubMenuOpen;
-            set
-            {
-                _isSubMenuOpen = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowAll
-        {
-            get => _showAll;
-            set
-            {
-                _showAll = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string LastScannedAmiiboId
-        {
-            get => _lastScannedAmiiboId;
-            set
-            {
-                _lastScannedAmiiboId = value;
+                _gridSelectedApplication = value;

+#pragma warning disable MVVMTK0034
+                if (_gridSelectedApplication != null && _gridAppContextMenu == null)
+                    GridAppContextMenu = new ApplicationContextMenu();
+                else if (_gridSelectedApplication == null && _gridAppContextMenu != null)
+                    GridAppContextMenu = null!;
+#pragma warning restore MVVMTK0034
+                
                OnPropertyChanged();
            }
        }
@@ -418,87 +350,20 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public bool OpenUserSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
+        public bool OpenUserSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;

-        public bool OpenDeviceSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
+        public bool OpenDeviceSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;

        public bool TrimXCIEnabled => XCIFileTrimmer.CanTrim(SelectedApplication.Path, new XCITrimmerLog.MainWindow(this));

-        public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
+        public bool OpenBcatSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;

-        public string LoadHeading
+        public bool ShowCustomVSyncIntervalPicker 
+            => _isGameRunning && AppHost.Device.VSyncMode == VSyncMode.Custom;
+
+        public void UpdateVSyncIntervalPicker()
        {
-            get => _loadHeading;
-            set
-            {
-                _loadHeading = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string CacheLoadStatus
-        {
-            get => _cacheLoadStatus;
-            set
-            {
-                _cacheLoadStatus = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush ProgressBarBackgroundColor
-        {
-            get => _progressBarBackgroundColor;
-            set
-            {
-                _progressBarBackgroundColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush ProgressBarForegroundColor
-        {
-            get => _progressBarForegroundColor;
-            set
-            {
-                _progressBarForegroundColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush VSyncModeColor
-        {
-            get => _vSyncModeColor;
-            set
-            {
-                _vSyncModeColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowCustomVSyncIntervalPicker
-        {
-            get
-            {
-                if (_isGameRunning)
-                {
-                    return AppHost.Device.VSyncMode ==
-                           VSyncMode.Custom;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            set
-            {
-                OnPropertyChanged();
-            }
+            OnPropertyChanged(nameof(ShowCustomVSyncIntervalPicker));
        }

        public int CustomVSyncIntervalPercentageProxy
@@ -551,126 +416,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public byte[] SelectedIcon
-        {
-            get => _selectedIcon;
-            set
-            {
-                _selectedIcon = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int ProgressMaximum
-        {
-            get => _progressMaximum;
-            set
-            {
-                _progressMaximum = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int ProgressValue
-        {
-            get => _progressValue;
-            set
-            {
-                _progressValue = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int StatusBarProgressMaximum
-        {
-            get => _statusBarProgressMaximum;
-            set
-            {
-                _statusBarProgressMaximum = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int StatusBarProgressValue
-        {
-            get => _statusBarProgressValue;
-            set
-            {
-                _statusBarProgressValue = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool StatusBarProgressStatusVisible
-        {
-            get => _statusBarProgressStatusVisible;
-            set
-            {
-                _statusBarProgressStatusVisible = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string StatusBarProgressStatusText
-        {
-            get => _statusBarProgressStatusText;
-            set
-            {
-                _statusBarProgressStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string FifoStatusText
-        {
-            get => _fifoStatusText;
-            set
-            {
-                _fifoStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string GpuNameText
-        {
-            get => _gpuStatusText;
-            set
-            {
-                _gpuStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string ShaderCountText
-        {
-            get => _shaderCountText;
-            set
-            {
-                _shaderCountText = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string BackendText
-        {
-            get => _backendText;
-            set
-            {
-                _backendText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public string VSyncModeText
        {
            get => _vSyncModeText;
@@ -679,39 +424,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                _vSyncModeText = value;

                OnPropertyChanged();
-            }
-        }
-
-        public string DockedStatusText
-        {
-            get => _dockedStatusText;
-            set
-            {
-                _dockedStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string AspectRatioStatusText
-        {
-            get => _aspectStatusText;
-            set
-            {
-                _aspectStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string VolumeStatusText
-        {
-            get => _volumeStatusText;
-            set
-            {
-                _volumeStatusText = value;
-
-                OnPropertyChanged();
+                OnPropertyChanged(nameof(ShowCustomVSyncIntervalPicker));
            }
        }

@@ -735,73 +448,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public float VolumeBeforeMute
-        {
-            get => _volumeBeforeMute;
-            set
-            {
-                _volumeBeforeMute = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowStatusSeparator
-        {
-            get => _showStatusSeparator;
-            set
-            {
-                _showStatusSeparator = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowMenuAndStatusBar
-        {
-            get => _showMenuAndStatusBar;
-            set
-            {
-                _showMenuAndStatusBar = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsLoadingIndeterminate
-        {
-            get => _isLoadingIndeterminate;
-            set
-            {
-                _isLoadingIndeterminate = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsActive
-        {
-            get => _isActive;
-            set
-            {
-                _isActive = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-
-        public bool ShowContent
-        {
-            get => _showContent;
-            set
-            {
-                _showContent = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool IsAppletMenuActive
        {
            get => _isAppletMenuActive && EnableNonGameRunningControls;
@@ -813,39 +459,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public WindowState WindowState
-        {
-            get => _windowState;
-            internal set
-            {
-                _windowState = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public double WindowWidth
-        {
-            get => _windowWidth;
-            set
-            {
-                _windowWidth = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public double WindowHeight
-        {
-            get => _windowHeight;
-            set
-            {
-                _windowHeight = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool IsGrid => Glyph == Glyph.Grid;
        public bool IsList => Glyph == Glyph.List;

@@ -889,17 +502,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public string Title
-        {
-            get => _title;
-            set
-            {
-                _title = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool ShowConsoleVisible
        {
            get => ConsoleHelper.SetConsoleWindowStateSupported;
@@ -910,27 +512,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            get => FileAssociationHelper.IsTypeAssociationSupported;
        }

-        public bool AreMimeTypesRegistered
-        {
-            get => _areMimeTypesRegistered;
-            set {
-                _areMimeTypesRegistered = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public ObservableCollectionExtended<ApplicationData> Applications
-        {
-            get => _applications;
-            set
-            {
-                _applications = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public Glyph Glyph
        {
            get => (Glyph)ConfigurationState.Instance.UI.GameListViewMode.Value;
@@ -948,7 +529,8 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool ShowNames
        {
-            get => ConfigurationState.Instance.UI.ShowNames && ConfigurationState.Instance.UI.GridSize > 1; set
+            get => ConfigurationState.Instance.UI.ShowNames && ConfigurationState.Instance.UI.GridSize > 1; 
+            set
            {
                ConfigurationState.Instance.UI.ShowNames.Value = value;

@@ -1508,8 +1090,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                    }

                    VSyncModeText = args.VSyncMode == "Custom" ? "Custom" : "VSync";
-                    ShowCustomVSyncIntervalPicker =
-                        args.VSyncMode == VSyncMode.Custom.ToString();
                    DockedStatusText = args.DockedMode;
                    AspectRatioStatusText = args.AspectRatio;
                    GameStatusText = args.GameStatus;
@@ -2176,7 +1756,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public async void ProcessTrimResult(String filename, Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome operationOutcome)
+        public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
        {
            string notifyUser = operationOutcome.ToLocalisedText();

@@ -2191,12 +1771,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            {
                switch (operationOutcome)
                {
-                    case Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome.Successful:
-                        if (Avalonia.Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                        {
-                            if (desktop.MainWindow is MainWindow mainWindow)
-                                mainWindow.LoadApplications();
-                        }
+                    case XCIFileTrimmer.OperationOutcome.Successful:
+                        RyujinxApp.MainWindow.LoadApplications();
                        break;
                }
            }
--- a/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs
@@ -1,8 +1,7 @@
-using Avalonia;
 using Avalonia.Collections;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
@@ -18,13 +17,13 @@ using System.Linq;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class ModManagerViewModel : BaseModel
+    public partial class ModManagerViewModel : BaseModel
    {
        private readonly string _modJsonPath;

        private AvaloniaList<ModModel> _mods = new();
-        private AvaloniaList<ModModel> _views = new();
-        private AvaloniaList<ModModel> _selectedMods = new();
+        [ObservableProperty] private AvaloniaList<ModModel> _views = new();
+        [ObservableProperty] private AvaloniaList<ModModel> _selectedMods = new();

        private string _search;
        private readonly ulong _applicationId;
@@ -44,26 +43,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public AvaloniaList<ModModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<ModModel> SelectedMods
-        {
-            get => _selectedMods;
-            set
-            {
-                _selectedMods = value;
-                OnPropertyChanged();
-            }
-        }
-
        public string Search
        {
            get => _search;
@@ -86,10 +65,7 @@ namespace Ryujinx.Ava.UI.ViewModels

            _modJsonPath = Path.Combine(AppDataManager.GamesDirPath, applicationId.ToString("x16"), "mods.json");

-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;

            LoadMods(applicationId);
        }
@@ -146,8 +122,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                .Filter(Filter)
                .Bind(out var view).AsObservableList();

+#pragma warning disable MVVMTK0034 // Event to update is fired below
            _views.Clear();
            _views.AddRange(view);
+#pragma warning restore MVVMTK0034

            SelectedMods = new(Views.Where(x => x.Enabled));

--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@@ -1,9 +1,10 @@
-using Gommon;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Gommon;
 using Ryujinx.Ava.Utilities.Configuration;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class SettingsHacksViewModel : BaseModel
+    public partial class SettingsHacksViewModel : BaseModel
    {
        private readonly SettingsViewModel _baseViewModel;

@@ -14,33 +15,11 @@ namespace Ryujinx.Ava.UI.ViewModels
            _baseViewModel = settingsVm;
        }

-        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
-        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
+        [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        [ObservableProperty] private bool _shaderTranslationDelayEnabled = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
        private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderTranslationDelay;
-        
-        public bool Xc2MenuSoftlockFixEnabled
-        {
-            get => _xc2MenuSoftlockFix;
-            set
-            {
-                _xc2MenuSoftlockFix = value;
-                
-                OnPropertyChanged();
-            }
-        }
-        
-        public bool ShaderTranslationDelayEnabled
-        {
-            get => _shaderTranslationThreadSleep;
-            set
-            {
-                _shaderTranslationThreadSleep = value;
-                
-                OnPropertyChanged();
-            }
-        }

-        public string ShaderTranslationDelayTooltipText => $"Current value: {ShaderTranslationDelay}"; 
+        public string ShaderTranslationDelayValueText => $"{ShaderTranslationDelay}ms"; 
        
        public int ShaderTranslationDelay
        {
@@ -49,7 +28,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            {
                _shaderTranslationSleepDelay = value;
                
-                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayTooltipText));
+                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayValueText));
            }
        }
        
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -1,6 +1,7 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
@@ -46,9 +47,9 @@ namespace Ryujinx.Ava.UI.ViewModels
        private int _resolutionScale;
        private int _graphicsBackendMultithreadingIndex;
        private float _volume;
-        private bool _isVulkanAvailable = true;
-        private bool _gameDirectoryChanged;
-        private bool _autoloadDirectoryChanged;
+        [ObservableProperty] private bool _isVulkanAvailable = true;
+        [ObservableProperty] private bool _gameDirectoryChanged;
+        [ObservableProperty] private bool _autoloadDirectoryChanged;
        private readonly List<string> _gpuIds = new();
        private int _graphicsBackendIndex;
        private int _scalingFilter;
@@ -63,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private int _networkInterfaceIndex;
        private int _multiplayerModeIndex;
        private string _ldnPassphrase;
-        private string _ldnServer;
+        [ObservableProperty] private string _ldnServer;

        public SettingsHacksViewModel DirtyHacks { get; }

@@ -111,43 +112,10 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public bool IsVulkanAvailable
-        {
-            get => _isVulkanAvailable;
-            set
-            {
-                _isVulkanAvailable = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();

        public bool IsAppleSiliconMac => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;

-        public bool GameDirectoryChanged
-        {
-            get => _gameDirectoryChanged;
-            set
-            {
-                _gameDirectoryChanged = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool AutoloadDirectoryChanged
-        {
-            get => _autoloadDirectoryChanged;
-            set
-            {
-                _autoloadDirectoryChanged = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public bool IsMacOS => OperatingSystem.IsMacOS();

        public bool EnableDiscordIntegration { get; set; }
@@ -182,19 +150,12 @@ namespace Ryujinx.Ava.UI.ViewModels
                _customVSyncInterval = newInterval;
                _customVSyncIntervalPercentageProxy = value;
                OnPropertiesChanged(
-                    nameof(CustomVSyncInterval), 
+                    nameof(CustomVSyncInterval),
                    nameof(CustomVSyncIntervalPercentageText));
            }
        }

-        public string CustomVSyncIntervalPercentageText
-        {
-            get
-            {
-                string text = CustomVSyncIntervalPercentageProxy + "%";
-                return text;
-            }
-        }
+        public string CustomVSyncIntervalPercentageText => CustomVSyncIntervalPercentageProxy + "%";

        public bool EnableCustomVSyncInterval
        {
@@ -356,7 +317,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            set
            {
                _networkInterfaceIndex = value != -1 ? value : 0;
-                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value = _networkInterfaces[NetworkInterfaceList[_networkInterfaceIndex]];
            }
        }

@@ -366,7 +326,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            set
            {
                _multiplayerModeIndex = value;
-                ConfigurationState.Instance.Multiplayer.Mode.Value = (MultiplayerMode)_multiplayerModeIndex;
            }
        }

@@ -375,16 +334,6 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool IsInvalidLdnPassphraseVisible { get; set; }

-        public string LdnServer
-        {
-            get => _ldnServer;
-            set
-            {
-                _ldnServer = value;
-                OnPropertyChanged();
-            }
-        }
-
        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
        {
            _virtualFileSystem = virtualFileSystem;
@@ -466,11 +415,10 @@ namespace Ryujinx.Ava.UI.ViewModels

        public void MatchSystemTime()
        {
-            var dto = DateTimeOffset.Now;
-
-            CurrentDate = new DateTimeOffset(dto.Year, dto.Month, dto.Day, 0, 0, 0, dto.Offset);
+            (DateTimeOffset dto, TimeSpan timeOfDay) = DateTimeOffset.Now.Extract();
            
-            CurrentTime = dto.TimeOfDay;
+            CurrentDate = dto;
+            CurrentTime = timeOfDay;
            
            OnPropertyChanged(nameof(CurrentDate));
            OnPropertyChanged(nameof(CurrentTime));
@@ -648,16 +596,14 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.ShowTitleBar.Value = ShowTitleBar;
            config.HideCursor.Value = (HideCursorMode)HideCursor;

-            if (_gameDirectoryChanged)
+            if (GameDirectoryChanged)
            {
-                List<string> gameDirs = new(GameDirectories);
-                config.UI.GameDirs.Value = gameDirs;
+                config.UI.GameDirs.Value = [..GameDirectories];
            }

-            if (_autoloadDirectoryChanged)
+            if (AutoloadDirectoryChanged)
            {
-                List<string> autoloadDirs = new(AutoloadDirectories);
-                config.UI.AutoloadDirs.Value = autoloadDirs;
+                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
            }

            config.UI.BaseStyle.Value = BaseStyleIndex switch
@@ -756,7 +702,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Multiplayer.LdnServer.Value = LdnServer;
            
            // Dirty Hacks
-            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFixEnabled;
+            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
            config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
            config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;

@@ -767,8 +713,8 @@ namespace Ryujinx.Ava.UI.ViewModels

            SaveSettingsEvent?.Invoke();

-            _gameDirectoryChanged = false;
-            _autoloadDirectoryChanged = false;
+            GameDirectoryChanged = false;
+            AutoloadDirectoryChanged = false;
        }

        private static void RevertIfNotSaved()
--- a/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
@@ -1,74 +1,32 @@
 using Avalonia.Collections;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.HLE.FileSystem;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Application = Avalonia.Application;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public record TitleUpdateViewNoUpdateSentinal();
+    public record TitleUpdateViewModelNoUpdate;

-    public class TitleUpdateViewModel : BaseModel
+    public partial class TitleUpdateViewModel : BaseModel
    {
        private ApplicationLibrary ApplicationLibrary { get; }
        private ApplicationData ApplicationData { get; }

-        private AvaloniaList<TitleUpdateModel> _titleUpdates = new();
-        private AvaloniaList<object> _views = new();
-        private object _selectedUpdate = new TitleUpdateViewNoUpdateSentinal();
-        private bool _showBundledContentNotice = false;
+        [ObservableProperty] private AvaloniaList<TitleUpdateModel> _titleUpdates = new();
+        [ObservableProperty] private AvaloniaList<object> _views = new();
+        [ObservableProperty] private object _selectedUpdate = new TitleUpdateViewModelNoUpdate();
+        [ObservableProperty] private bool _showBundledContentNotice;

-        public AvaloniaList<TitleUpdateModel> TitleUpdates
-        {
-            get => _titleUpdates;
-            set
-            {
-                _titleUpdates = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<object> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public object SelectedUpdate
-        {
-            get => _selectedUpdate;
-            set
-            {
-                _selectedUpdate = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowBundledContentNotice
-        {
-            get => _showBundledContentNotice;
-            set
-            {
-                _showBundledContentNotice = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public IStorageProvider StorageProvider;
+        private readonly IStorageProvider _storageProvider;

        public TitleUpdateViewModel(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
        {
@@ -76,10 +34,7 @@ namespace Ryujinx.Ava.UI.ViewModels

            ApplicationData = applicationData;

-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                StorageProvider = desktop.MainWindow.StorageProvider;
-            }
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;

            LoadUpdates();
        }
@@ -90,7 +45,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                .Where(it => it.TitleUpdate.TitleIdBase == ApplicationData.IdBase);

            bool hasBundledContent = false;
-            SelectedUpdate = new TitleUpdateViewNoUpdateSentinal();
+            SelectedUpdate = new TitleUpdateViewModelNoUpdate();
            foreach ((TitleUpdateModel update, bool isSelected) in updates)
            {
                TitleUpdates.Add(update);
@@ -116,12 +71,12 @@ namespace Ryujinx.Ava.UI.ViewModels
            var selected = SelectedUpdate;

            Views.Clear();
-            Views.Add(new TitleUpdateViewNoUpdateSentinal());
+            Views.Add(new TitleUpdateViewModelNoUpdate());
            Views.AddRange(sortedUpdates);

            SelectedUpdate = selected;

-            if (SelectedUpdate is TitleUpdateViewNoUpdateSentinal)
+            if (SelectedUpdate is TitleUpdateViewModelNoUpdate)
            {
                SelectedUpdate = Views[0];
            }
@@ -179,7 +134,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
            else if (update == SelectedUpdate as TitleUpdateModel)
            {
-                SelectedUpdate = new TitleUpdateViewNoUpdateSentinal();
+                SelectedUpdate = new TitleUpdateViewModelNoUpdate();
            }

            SortUpdates();
@@ -187,7 +142,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public async Task Add()
        {
-            var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            var result = await _storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
            {
                AllowMultiple = true,
                FileTypeFilter = new List<FilePickerFileType>
--- a/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
@@ -1,4 +1,5 @@
 using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
@@ -20,12 +21,12 @@ using Image = SkiaSharp.SKImage;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    internal class UserFirmwareAvatarSelectorViewModel : BaseModel
+    internal partial class UserFirmwareAvatarSelectorViewModel : BaseModel
    {
        private static readonly Dictionary<string, byte[]> _avatarStore = new();

-        private ObservableCollection<ProfileImageModel> _images;
-        private Color _backgroundColor = Colors.White;
+        [ObservableProperty] private ObservableCollection<ProfileImageModel> _images;
+        [ObservableProperty] private Color _backgroundColor = Colors.White;

        private int _selectedIndex;

@@ -34,27 +35,11 @@ namespace Ryujinx.Ava.UI.ViewModels
            _images = new ObservableCollection<ProfileImageModel>();

            LoadImagesFromStore();
-        }
-
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set
+            PropertyChanged += (_, args) =>
            {
-                _backgroundColor = value;
-                OnPropertyChanged();
-                ChangeImageBackground();
-            }
-        }
-
-        public ObservableCollection<ProfileImageModel> Images
-        {
-            get => _images;
-            set
-            {
-                _images = value;
-                OnPropertyChanged();
-            }
+                if (args.PropertyName == nameof(BackgroundColor))
+                    ChangeImageBackground();
+            };
        }

        public int SelectedIndex
@@ -70,7 +55,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                }
                else
                {
-                    SelectedImage = _images[_selectedIndex].Data;
+                    SelectedImage = Images[_selectedIndex].Data;
                }

                OnPropertyChanged();
--- a/src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
@@ -1,18 +1,9 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    internal class UserProfileImageSelectorViewModel : BaseModel
+    internal partial class UserProfileImageSelectorViewModel : BaseModel
    {
-        private bool _firmwareFound;
-
-        public bool FirmwareFound
-        {
-            get => _firmwareFound;
-
-            set
-            {
-                _firmwareFound = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private bool _firmwareFound;
    }
 }
--- a/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
@@ -1,3 +1,4 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using DynamicData.Binding;
 using Ryujinx.Ava.Common.Locale;
@@ -8,74 +9,31 @@ using System.Collections.ObjectModel;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class UserSaveManagerViewModel : BaseModel
+    public partial class UserSaveManagerViewModel : BaseModel
    {
-        private int _sortIndex;
-        private int _orderIndex;
-        private string _search;
-        private ObservableCollection<SaveModel> _saves = new();
-        private ObservableCollection<SaveModel> _views = new();
+        [ObservableProperty] private int _sortIndex;
+        [ObservableProperty] private int _orderIndex;
+        [ObservableProperty] private string _search;
+        [ObservableProperty] private ObservableCollection<SaveModel> _saves = new();
+        [ObservableProperty] private ObservableCollection<SaveModel> _views = new();
        private readonly AccountManager _accountManager;

        public string SaveManagerHeading => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SaveManagerHeading, _accountManager.LastOpenedUser.Name, _accountManager.LastOpenedUser.UserId);

-        public int SortIndex
-        {
-            get => _sortIndex;
-            set
-            {
-                _sortIndex = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public int OrderIndex
-        {
-            get => _orderIndex;
-            set
-            {
-                _orderIndex = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public string Search
-        {
-            get => _search;
-            set
-            {
-                _search = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public ObservableCollection<SaveModel> Saves
-        {
-            get => _saves;
-            set
-            {
-                _saves = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public ObservableCollection<SaveModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
        public UserSaveManagerViewModel(AccountManager accountManager)
        {
            _accountManager = accountManager;
+            PropertyChanged += (_, evt) =>
+            {
+                if (evt.PropertyName is
+                    nameof(SortIndex) or
+                    nameof(OrderIndex) or
+                    nameof(Search) or
+                    nameof(Saves))
+                {
+                    Sort();
+                }
+            };
        }

        public void Sort()
@@ -85,8 +43,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                .Sort(GetComparer())
                .Bind(out var view).AsObservableList();

+#pragma warning disable MVVMTK0034
            _views.Clear();
            _views.AddRange(view);
+#pragma warning restore MVVMTK0034
            OnPropertyChanged(nameof(Views));
        }

@@ -94,7 +54,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            if (arg is SaveModel save)
            {
-                return string.IsNullOrWhiteSpace(_search) || save.Title.ToLower().Contains(_search.ToLower());
+                return string.IsNullOrWhiteSpace(Search) || save.Title.ToLower().Contains(Search.ToLower());
            }

            return false;
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -247,6 +247,7 @@
                    Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
                    Icon="{ext:Icon mdi-cube-scan}"
                    IsVisible="{Binding CanScanAmiiboBinaries}"
+                    InputGesture="Ctrl + B"
                    IsEnabled="{Binding IsAmiiboBinRequested}" />
                <MenuItem
                    Command="{Binding TakeScreenshot}"
@@ -303,6 +304,10 @@
                    Header="{ext:Locale MenuBarHelpCheckForUpdates}"
                    Icon="{ext:Icon mdi-update}"
                    ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
+                <MenuItem
+                    Click="OpenCompatibilityList"
+                    Header="{ext:Locale CompatibilityListOpen}"
+                    Icon="{ext:Icon mdi-gamepad}"/>
                <Separator />
                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
                    <MenuItem
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -8,6 +8,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
@@ -225,5 +226,7 @@ namespace Ryujinx.Ava.UI.Views.Main
        public async void OpenAboutWindow(object sender, RoutedEventArgs e) => await AboutWindow.Show();

        public void CloseWindow(object sender, RoutedEventArgs e) => Window.Close();
+
+        private async void OpenCompatibilityList(object sender, RoutedEventArgs e) => await CompatibilityList.Show();
    }
 }
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
@@ -41,7 +41,7 @@ namespace Ryujinx.Ava.UI.Views.Main
        private void VSyncMode_PointerReleased(object sender, PointerReleasedEventArgs e)
        {
            Window.ViewModel.ToggleVSyncMode();
-            Logger.Info?.Print(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
+            Logger.Info?.PrintMsg(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
        }

        private void DockedStatus_PointerReleased(object sender, PointerReleasedEventArgs e)
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
@@ -26,7 +26,6 @@ namespace Ryujinx.Ava.UI.Views.Main
            {
                DataContext = ViewModel = window.ViewModel;
            }
-
        }

        public void Sort_Checked(object sender, RoutedEventArgs args)
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@@ -37,7 +37,7 @@
                    ToolTip.Tip="{Binding DirtyHacks.Xc2MenuFixTooltip}">
                    <CheckBox
                        Margin="0"
-                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFixEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFix}"/>
                    <TextBlock
                        VerticalAlignment="Center"
                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
@@ -54,21 +54,27 @@
                    <TextBlock VerticalAlignment="Center"
                               Text="Arbitrary Delay on Shader Translation"/>
                </StackPanel>
-                <Slider IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
-                        HorizontalAlignment="Center" 
-                        Value="{Binding DirtyHacks.ShaderTranslationDelay}"
-                        ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltipText}"
-                        Width="175"
-                        Margin="0,-3,0,0"
-                        Height="32"
-                        Padding="0,-5"
-                        TickFrequency="1"
-                        IsSnapToTickEnabled="True"
-                        LargeChange="10"
-                        SmallChange="1"
-                        VerticalAlignment="Center"
-                        Minimum="1"
-                        Maximum="1000" />
+                <StackPanel
+                    IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
+                    Margin="0,10,0,0"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center">
+                    <Slider HorizontalAlignment="Center" 
+                            Value="{Binding DirtyHacks.ShaderTranslationDelay}"
+                            Width="175"
+                            Margin="0,-3,0,0"
+                            Height="32"
+                            Padding="0,-5"
+                            TickFrequency="1"
+                            IsSnapToTickEnabled="True"
+                            LargeChange="10"
+                            SmallChange="1"
+                            VerticalAlignment="Center"
+                            Minimum="1"
+                            Maximum="1000" />
+                    <TextBlock Margin="5,0"
+                               Text="{Binding DirtyHacks.ShaderTranslationDelayValueText}"/>
+                </StackPanel>
                <Separator/>
            </StackPanel>
        </Border>
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml
@@ -40,6 +40,7 @@
        <KeyBinding Gesture="F9" Command="{Binding ToggleDockMode}" />
        <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
        <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
+        <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
    </Window.KeyBindings>
    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*">
        <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />
--- a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
@@ -93,6 +93,7 @@
                                        Padding="10"
                                        MinWidth="0"
                                        MinHeight="0"
+                                        ToolTip.Tip="{Binding Path}"
                                        Click="OpenLocation">
                                        <ui:SymbolIcon
                                            Symbol="OpenFolder"
--- a/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
+++ b/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
@@ -95,7 +95,7 @@
                        </Panel>
                    </DataTemplate>
                    <DataTemplate
-                        DataType="viewModels:TitleUpdateViewNoUpdateSentinal">
+                        DataType="viewModels:TitleUpdateViewModelNoUpdate">
                        <Panel
                            Height="33"
                            Margin="10">
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -33,7 +33,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
        public string Path { get; set; }
        public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }

-        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0;
+        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0 && !ControlHolder.ByteSpan.IsZeros();

        public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);

--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -1,4 +1,5 @@
 using DynamicData;
+using DynamicData.Kernel;
 using Gommon;
 using LibHac;
 using LibHac.Common;
@@ -75,11 +76,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            TitleUpdates = _titleUpdates.AsObservableCache();
            DownloadableContents = _downloadableContents.AsObservableCache();

-            _nspIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSP.png");
-            _xciIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_XCI.png");
-            _ncaIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NCA.png");
-            _nroIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NRO.png");
-            _nsoIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSO.png");
+            _nspIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSP.png");
+            _xciIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_XCI.png");
+            _ncaIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NCA.png");
+            _nroIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NRO.png");
+            _nsoIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSO.png");
        }

        /// <exception cref="Ryujinx.HLE.Exceptions.InvalidNpdmException">The npdm file doesn't contain valid data.</exception>
@@ -1069,10 +1070,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
        {
            if (update == null) return false;
            
-            var currentlySelected = TitleUpdates.Items.FindFirst(it =>
+            var currentlySelected = TitleUpdates.Items.FirstOrOptional(it =>
                it.TitleUpdate.TitleIdBase == update.TitleIdBase && it.IsSelected);

-            var shouldSelect = currentlySelected.Check(curr => curr.TitleUpdate?.Version < update.Version);
+            var shouldSelect = !currentlySelected.HasValue ||
+                               currentlySelected.Value.TitleUpdate.Version < update.Version;

            _titleUpdates.AddOrUpdate((update, shouldSelect));
            
@@ -1463,7 +1465,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                    TitleUpdatesHelper.LoadTitleUpdatesJson(_virtualFileSystem, application.IdBase);
                it.AddOrUpdate(savedUpdates);

-                var selectedUpdate = savedUpdates.FindFirst(update => update.IsSelected);
+                var selectedUpdate = savedUpdates.FirstOrOptional(update => update.IsSelected);

                if (TryGetTitleUpdatesFromFile(application.Path, out var bundledUpdates))
                {
@@ -1475,10 +1477,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                        if (!savedUpdateLookup.Contains(update))
                        {
                            bool shouldSelect = false;
-                            if (selectedUpdate.Check(su => su.Update?.Version < update.Version))
+                            if (!selectedUpdate.HasValue || selectedUpdate.Value.Item1.Version < update.Version)
                            {
                                shouldSelect = true;
-                                _titleUpdates.AddOrUpdate((selectedUpdate.Value.Update, false));
+                                if (selectedUpdate.HasValue)
+                                    _titleUpdates.AddOrUpdate((selectedUpdate.Value.Update, false));
                                selectedUpdate = (update, true);
                            }

--- a/src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs
@@ -1,3 +1,4 @@
+using Gommon;
 using LibHac.Ns;
 using System;
 using System.Collections.Generic;
@@ -22,7 +23,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;

            return new Array(receivedData.Where(game =>
-                communicationId.Items.Contains(Convert.ToUInt64(game.TitleId, 16))
+                communicationId.Items.Contains(game.TitleId.ToULong())
            ));
        }

--- a/src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs
@@ -0,0 +1,152 @@
+using Gommon;
+using nietras.SeparatedValues;
+using Ryujinx.Ava.Common.Locale;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Ryujinx.Ava.Utilities.Compat
+{
+    public class CompatibilityCsv
+    {
+        public static CompatibilityCsv Shared { get; set; }
+        
+        public CompatibilityCsv(SepReader reader)
+        {
+            var entries = new List<CompatibilityEntry>();
+
+            foreach (var row in reader)
+            {
+                entries.Add(new CompatibilityEntry(reader.Header, row));
+            }
+
+            Entries = entries.Where(x => x.Status != null)
+                .OrderBy(it => it.GameName).ToArray();
+        }
+
+        public CompatibilityEntry[] Entries { get; }
+    }
+
+    public class CompatibilityEntry
+    {
+        public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
+        {
+            IssueNumber = row[header.IndexOf("issue_number")].Parse<int>();
+
+            var titleIdRow = row[header.IndexOf("extracted_game_id")].ToString();
+            if (!string.IsNullOrEmpty(titleIdRow))
+                TitleId = titleIdRow;
+
+            var issueTitleRow = row[header.IndexOf("issue_title")].ToString();
+            if (TitleId.HasValue)
+                issueTitleRow = issueTitleRow.ReplaceIgnoreCase($" - {TitleId}", string.Empty);
+
+            GameName = issueTitleRow.Trim().Trim('"');
+
+            IssueLabels = row[header.IndexOf("issue_labels")].ToString().Split(';');
+            Status = row[header.IndexOf("extracted_status")].ToString().ToLower() switch
+            {
+                "playable" => LocaleKeys.CompatibilityListPlayable,
+                "ingame" => LocaleKeys.CompatibilityListIngame,
+                "menus" => LocaleKeys.CompatibilityListMenus,
+                "boots" => LocaleKeys.CompatibilityListBoots,
+                "nothing" => LocaleKeys.CompatibilityListNothing,
+                _ => null
+            };
+
+            if (row[header.IndexOf("last_event_date")].TryParse<DateTime>(out var dt))
+                LastEvent = dt;
+
+            if (row[header.IndexOf("events_count")].TryParse<int>(out var eventsCount))
+                EventCount = eventsCount;
+        }
+
+        public int IssueNumber { get; }
+        public string GameName { get; }
+        public Optional<string> TitleId { get; }
+        public string[] IssueLabels { get; }
+        public LocaleKeys? Status { get; }
+        public DateTime LastEvent { get; }
+        public int EventCount { get; }
+
+        public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
+        public string FormattedTitleId => TitleId.OrElse(new string(' ', 16));
+
+        public string FormattedIssueLabels => IssueLabels
+            .Where(it => !it.StartsWithIgnoreCase("status"))
+            .Select(FormatLabelName)
+            .JoinToString(", ");
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder("CompatibilityEntry: {");
+            sb.Append($"{nameof(IssueNumber)}={IssueNumber}, ");
+            sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
+            sb.Append($"{nameof(TitleId)}={TitleId}, ");
+            sb.Append($"{nameof(IssueLabels)}=\"{IssueLabels}\", ");
+            sb.Append($"{nameof(Status)}=\"{Status}\", ");
+            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\", ");
+            sb.Append($"{nameof(EventCount)}={EventCount}");
+            sb.Append('}');
+
+            return sb.ToString();
+        }
+
+        public static string FormatLabelName(string labelName) => labelName.ToLower() switch
+        {
+            "audio" => "Audio",
+            "bug" => "Bug",
+            "cpu" => "CPU",
+            "gpu" => "GPU",
+            "gui" => "GUI",
+            "help wanted" => "Help Wanted",
+            "horizon" => "Horizon",
+            "infra" => "Project Infra",
+            "invalid" => "Invalid",
+            "kernel" => "Kernel",
+            "ldn" => "LDN",
+            "linux" => "Linux",
+            "macos" => "macOS",
+            "question" => "Question",
+            "windows" => "Windows",
+            "graphics-backend:opengl" => "Graphics: OpenGL",
+            "graphics-backend:vulkan" => "Graphics: Vulkan",
+            "ldn-works" => "LDN Works",
+            "ldn-untested" => "LDN Untested",
+            "ldn-broken" => "LDN Broken",
+            "ldn-partial" => "Partial LDN",
+            "nvdec" => "NVDEC",
+            "services" => "NX Services",
+            "services-horizon" => "Horizon OS Services",
+            "slow" => "Runs Slow",
+            "crash" => "Crashes",
+            "deadlock" => "Deadlock",
+            "regression" => "Regression",
+            "opengl" => "OpenGL",
+            "opengl-backend-bug" => "OpenGL Backend Bug",
+            "vulkan-backend-bug" => "Vulkan Backend Bug",
+            "mac-bug" => "Mac-specific Bug(s)",
+            "amd-vendor-bug" => "AMD GPU Bug",
+            "intel-vendor-bug" => "Intel GPU Bug",
+            "loader-allocator" => "Loader Allocator",
+            "audout" => "AudOut",
+            "32-bit" => "32-bit Game",
+            "UE4" => "Unreal Engine 4",
+            "homebrew" => "Homebrew Content",
+            "online-broken" => "Online Broken",
+            _ => Capitalize(labelName)
+        };
+        
+        public static string Capitalize(string value)
+        {
+            if (value == string.Empty)
+                return string.Empty;
+        
+            var firstChar = value[0];
+            var rest = value[1..];
+
+            return $"{char.ToUpper(firstChar)}{rest}";
+        }
+    }
+}
--- a/src/Ryujinx/Utilities/Compat/CompatibilityHelper.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityHelper.cs
@@ -0,0 +1,32 @@
+using Gommon;
+using nietras.SeparatedValues;
+using Ryujinx.Common.Configuration;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Utilities.Compat
+{
+    public static class CompatibilityHelper
+    {
+        private static readonly string _downloadUrl =
+            "https://gist.githubusercontent.com/ezhevita/b41ed3bf64d0cc01269cab036e884f3d/raw/002b1a1c1a5f7a83276625e8c479c987a5f5b722/Ryujinx%2520Games%2520List%2520Compatibility.csv";
+        
+        private static readonly FilePath _compatCsvPath = new FilePath(AppDataManager.BaseDirPath) / "system" / "compatibility.csv";
+
+        public static async Task<SepReader> DownloadAsync()
+        {
+            if (_compatCsvPath.ExistsAsFile)
+                return Sep.Reader().FromFile(_compatCsvPath.Path);
+            
+            using var httpClient = new HttpClient();
+            var compatCsv = await httpClient.GetStringAsync(_downloadUrl);
+            _compatCsvPath.WriteAllText(compatCsv);
+            return Sep.Reader().FromText(compatCsv);
+        }
+
+        public static async Task InitAsync()
+        {
+            CompatibilityCsv.Shared = new CompatibilityCsv(await DownloadAsync());
+        }
+    }
+}
--- a/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml
@@ -0,0 +1,59 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
+             xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
+             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ryujinx.Ava.Utilities.Compat.CompatibilityList"
+             x:DataType="local:CompatibilityViewModel">
+    <UserControl.DataContext>
+        <local:CompatibilityViewModel />
+    </UserControl.DataContext>
+    <StackPanel Orientation="Vertical">
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <TextBox Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
+            <CheckBox Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
+            <TextBlock Margin="-3, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
+        </StackPanel>
+        <ScrollViewer>
+                <ListBox Margin="5"
+                         Padding="10"
+                         Background="Transparent"
+                         ItemsSource="{Binding CurrentEntries}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
+                            <Grid HorizontalAlignment="Center" Width="500" ColumnDefinitions="Auto,Auto,Auto,*"
+                                  Margin="5">
+                                <TextBlock Grid.Column="0"
+                                           FontFamily="{StaticResource JetBrainsMono}"
+                                           Text="{Binding GameName}"
+                                           Width="140"
+                                           TextWrapping="Wrap" />
+                                <TextBlock Grid.Column="1"
+                                           Width="135"
+                                           Padding="7, 0, 0, 0"
+                                           FontFamily="{StaticResource JetBrainsMono}"
+                                           Text="{Binding FormattedTitleId}"
+                                           TextWrapping="Wrap" />
+                                <TextBlock Grid.Column="2"
+                                           Padding="7, 0"
+                                           VerticalAlignment="Center"
+                                           FontFamily="{StaticResource JetBrainsMono}"
+                                           Text="{Binding LocalizedStatus}"
+                                           Width="85"
+                                           Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
+                                           TextWrapping="NoWrap" />
+                                <TextBlock Grid.Column="3"
+                                           VerticalAlignment="Center"
+                                           FontFamily="{StaticResource JetBrainsMono}"
+                                           Text="{Binding FormattedIssueLabels}"
+                                           TextWrapping="WrapWithOverflow" />
+                            </Grid>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+        </ScrollViewer>
+    </StackPanel>
+</UserControl>
--- a/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs
@@ -0,0 +1,56 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.Windows;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Utilities.Compat
+{
+    public partial class CompatibilityList : UserControl
+    {
+        public static async Task Show()
+        {
+            await CompatibilityHelper.InitAsync();
+            
+            ContentDialog contentDialog = new()
+            {
+                PrimaryButtonText = string.Empty,
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                Content = new CompatibilityList { DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary) }
+            };
+
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
+        }
+        
+        public CompatibilityList()
+        {
+            InitializeComponent();
+        }
+
+        private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
+        {
+            if (DataContext is not CompatibilityViewModel cvm)
+                return;
+
+            if (sender is not TextBox searchBox)
+                return;
+        
+            cvm.Search(searchBox.Text);
+        }
+    }
+}
+
--- a/src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs
@@ -0,0 +1,59 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using ExCSS;
+using Gommon;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Ava.Utilities.Compat
+{
+    public partial class CompatibilityViewModel : ObservableObject
+    {
+        [ObservableProperty] private bool _onlyShowOwnedGames;
+
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Shared.Entries;
+        private readonly string[] _ownedGameTitleIds = [];
+        private readonly ApplicationLibrary _appLibrary;
+
+        public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
+            ? _currentEntries.Where(x =>
+                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid))
+                || _appLibrary.Applications.Items.Any(a => a.Name.EqualsIgnoreCase(x.GameName)))
+            : _currentEntries;
+
+        public CompatibilityViewModel() {}
+
+        public CompatibilityViewModel(ApplicationLibrary appLibrary)
+        {
+            _appLibrary = appLibrary;
+            _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
+
+            PropertyChanged += (_, args) =>
+            {
+                if (args.PropertyName is nameof(OnlyShowOwnedGames))
+                    OnPropertyChanged(nameof(CurrentEntries));
+            };
+        }
+
+        public void Search(string searchTerm)
+        {
+            if (string.IsNullOrEmpty(searchTerm))
+            {
+                SetEntries(CompatibilityCsv.Shared.Entries);
+                return;
+            }
+
+            SetEntries(CompatibilityCsv.Shared.Entries.Where(x =>
+                x.GameName.ContainsIgnoreCase(searchTerm)
+                || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
+        }
+
+        private void SetEntries(IEnumerable<CompatibilityEntry> entries)
+        {
+#pragma warning disable MVVMTK0034
+            _currentEntries = entries.ToList();
+#pragma warning restore MVVMTK0034
+            OnPropertyChanged(nameof(CurrentEntries));
+        }
+    }
+}
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs
@@ -272,7 +272,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
        public MemoryManagerMode MemoryManagerMode { get; set; }

        /// <summary>
-        /// Expands the RAM amount on the emulated system from 4GiB to 8GiB
+        /// Expands the RAM amount on the emulated system
        /// </summary>
        public MemoryConfiguration DramSize { get; set; }

--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
@@ -645,6 +645,9 @@ namespace Ryujinx.Ava.Utilities.Configuration

            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
            {
+                if (!ShowDirtyHacks) 
+                    return;
+                
                var newHacks = EnabledHacks.Select(x => x.Hack)
                    .JoinToString(", ");

@@ -666,14 +669,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                    List<EnabledDirtyHack> enabledHacks = [];
                    
                    if (Xc2MenuSoftlockFix)
-                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
+                        Apply(DirtyHack.Xc2MenuSoftlockFix);
                    
                    if (EnableShaderTranslationDelay)
-                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderTranslationDelay);
+                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
                    
                    return enabledHacks.ToArray();

-                    void Apply(DirtyHacks hack, int value = 0)
+                    void Apply(DirtyHack hack, int value = 0)
                    {
                        enabledHacks.Add(new EnabledDirtyHack(hack, value));
                    }
Author	SHA1	Message	Date
Evan Husted	c4cc657b89	UI: Compatibility List Viewer	2025-01-06 07:31:57 -06:00
Evan Husted	9726b0feb0	Use Canary-Releases for AppImage Canary updates	2025-01-06 01:27:37 -06:00
Evan Husted	159ff828a1	give canary appimages the ryujinx-canary name	2025-01-06 01:22:05 -06:00
Evan Husted	6fa2bfc736	fix canary ci	2025-01-06 01:15:39 -06:00
Piplup	2c24df0247	reworked workflows (#497 ) this makes `canary.yml` follow the same order of steps as `release.yml`, adding appimages to the canary versions and i fixed some bugs with the `build-appimage.sh` mainly fixing linking to the old repo	2025-01-06 01:07:16 -06:00
Evan Husted	13efc3e544	Switch back to nightly.link I'm pretty sure them not working was due to old links pointing to GreemDev/Ryujinx after the org change	2025-01-06 00:09:48 -06:00
Evan Husted	845dd9a8db	vk: regression: potentially fix various random graphical anomalies	2025-01-05 22:25:05 -06:00
Evan Husted	b661bdd997	Revert "infra: feat: XML Solution" This reverts commit `cc84041270`.	2025-01-05 16:41:08 -06:00
Evan Husted	cc84041270	infra: feat: XML Solution	2025-01-05 16:33:44 -06:00
Evan Husted	987ab9be41	Fix part 2	2025-01-05 16:03:34 -06:00
Evan Husted	8a2bc3957a	UI: fix: new updates not being autoloaded	2025-01-05 15:45:01 -06:00
Evan Husted	850df38f1e	cleaup imports	2025-01-04 06:54:46 -06:00
Emmanuel Hansen	c8d598d5ac	use UnmanagedCallersOnly for delegates	2025-01-04 06:52:25 -06:00
Evan Husted	3e5b2bda38	UI: RPC: Goat Simulator 3 asset image	2025-01-03 22:25:32 -06:00
Evan Husted	9bb50fc6dd	misc: improve unpacking error & add nullability to SelectedIcon	2025-01-03 22:25:32 -06:00
Evan Husted	e956864697	misc: Remove needless AsObservableList	2025-01-03 22:25:32 -06:00
WilliamWsyHK	f43442f774	Include Hack for XC2 JP Edition (#481 ) XC2 has 2 editions, one JP and one global. I own the JP version and suffered from the soft-lock, meanwhile the current hack only works for global edition, so PR is simply include JP edition from the hack.	2025-01-01 02:15:14 -06:00
Evan Husted	88d11d3d8d	misc: some cleanups and fix compile warnings	2025-01-01 02:14:59 -06:00
Evan Husted	391f57bdd2	misc: Headless: Inherit main input config	2025-01-01 01:55:10 -06:00
Evan Husted	fd2b5a7fc1	misc: Remove RendererHost AXAML	2025-01-01 01:55:10 -06:00
Otozinclus	37c165e9fc	Only delay shader translation on Metal (#480 ) This way the Arbitrary Shader Translation Delay hack will no longer affect shader loading when using Vulkan.	2025-01-01 00:18:17 -06:00
Daenorth	003a6d322b	Update to no_NO Norwegian Translation (#475 ) Updated for time resync & auto graphics backend	2025-01-01 00:15:21 -06:00
jozz024	978d2c132b	add a keyboard shortcut for opening amiibo .bin files (#461 )	2024-12-31 22:45:52 -06:00
Evan Husted	5d63706cea	misc: Bake in ValueEqual logic into ReactiveEventArgs [ci skip]	2024-12-31 22:34:14 -06:00
Evan Husted	732aafd3bb	misc: Prevent value change logging when the value is changed to the same thing it was before the value change.	2024-12-31 22:23:08 -06:00
Evan Husted	3fa714bb72	misc: DateTimeOffset Extract extension from Gommon	2024-12-31 21:21:54 -06:00
Evan Husted	7c01633f13	UI: Show the path of the mod on the folder button	2024-12-31 21:15:50 -06:00
Evan Husted	27c5cba10b	misc: More Mvvm usage instead of writing out the observable properties	2024-12-31 21:11:57 -06:00
Evan Husted	3525d5ecd4	UI: clean up slider UI for shader translation delay	2024-12-31 20:11:49 -06:00
Evan Husted	6286501550	misc: do not log dirty hack changes if ShowDirtyHacks is disabled	2024-12-31 20:11:44 -06:00
Evan Husted	61ae427a4d	misc: Add CommunityToolkit.Mvvm for observable property generation; apply it to MainWindowViewModel for now.	2024-12-31 03:29:08 -06:00
Evan Husted	19d2883a35	UI: Store config migrations in a dictionary and loop through it to do migrations.	2024-12-31 02:51:14 -06:00
Evan Husted	617c03119f	misc: clean vsync toggle log	2024-12-31 00:52:39 -06:00
Evan Husted	e43d899e1d	misc: Use a few static helpers for Avalonia objects	2024-12-31 00:19:23 -06:00
Evan Husted	0cd09ea0c5	misc: Simplify ControlHolder checks in MainWindowViewModel	2024-12-31 00:04:23 -06:00
Evan Husted	4135d74e4d	UI: Only allow right click to create a context menu if a game is selected.	2024-12-30 23:50:55 -06:00
Evan Husted	bd29f658b1	misc: Forgot about OfType [ci skip]	2024-12-30 23:28:32 -06:00
Evan Husted	df150f0788	misc: Significantly reduce duplicated code in ConfigurationState migration logic. 300 lines removed; functionally identical.	2024-12-30 23:14:05 -06:00
Evan Husted	e50198b37d	Clarify DramSize XMLdoc	2024-12-30 23:11:59 -06:00
Evan Husted	f426945fec	misc: Rename DirtyHacks to DirtyHack Rename DirtyHack.ShaderCompilationThreadSleep to ShaderTranslationDelay Changed EnabledDirtyHack to a struct rename DirtyHackCollection to DirtyHacks	2024-12-30 22:18:35 -06:00
Evan Husted	172869bfba	misc: cleanup applying the current dirty hacks to the config upon loading the json	2024-12-30 22:11:16 -06:00
Evan Husted	b6f88514f9	misc: Move BitTricks methods into BitUtils Cleanup DirtyHackCollection	2024-12-30 22:11:16 -06:00
Hack茶ん	e92f52e56c	Korean translations for new locale keys (#465 )	2024-12-30 21:13:43 -06:00
Evan Husted	318498eab0	misc: prefix ValidationTask with I, it's an interface Mention in PR comment script that you now need to be logged into GitHub to download artifacts.	2024-12-30 20:57:18 -06:00
Evan Husted	a5cde8e006	misc: Update Gommon, apply new extension	2024-12-30 20:37:02 -06:00
Evan Husted	d0a344d632	Validation Project v2 (#471 ) Original PR had issues in the CI when building. > Refactor of the Validation System for more ease of use in the future. The project now builds a standalone executable and executes it before the main project is built or published. Since it is now a standalone executable we are also able to use .NET Core features as we are no longer locked to netstandard. > The project currently includes 1 task, LocalesValidationTask, that will check if the locales.json file has any of the following issues: > - The json is invalid. > - The json has locales with missing languages. > - The json has locales with langauges that are just duplicates of the en_US field. > If the project is built or published locally it will also fix any missing languages or duplicate fields. --------- Co-authored-by: LotP1 <68976644+LotP1@users.noreply.github.com>	2024-12-30 20:31:27 -06:00
Otozinclus	ca66298817	Update Metal Games list (#472 ) I tested let's go in most locations and did some battles and it runs perfectly Legends Arceus will freeze occasionally on Metal, so it was removed.	2024-12-30 20:28:35 -06:00
Evan Husted	9ae1c4380d	UI: Fix crashing when opening an Applet or application with no existing icon	2024-12-30 02:32:44 -06:00
Evan Husted	c88518bce2	Revert "Validation Project v2" (#470 ) Reverts Ryubing/Ryujinx#444	2024-12-30 02:06:24 -06:00
Evan Husted	a3888ed7cf	Revert "misc: New Solution Format (.SLNX)" This reverts commit `7cbbd02973`.	2024-12-30 02:05:40 -06:00