Silence compile warnings

Fixes Monster Hunter Rise and Apollo Justice

.github/dependabot.yml

@@ -1,40 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: weekly
-    labels:
-      - "infra"
-    reviewers:
-      - TSRBerry
-    commit-message:
-      prefix: "ci"
-
-  - package-ecosystem: nuget
-    directory: /
-    open-pull-requests-limit: 10
-    schedule:
-      interval: daily
-    labels:
-      - "infra"
-    reviewers:
-      - TSRBerry
-    commit-message:
-      prefix: nuget
-    groups:
-      Avalonia:
-        patterns:
-          - "*Avalonia*"
-      Silk.NET:
-        patterns:
-          - "Silk.NET*"
-      OpenTK:
-        patterns:
-          - "OpenTK*"
-      SixLabors:
-        patterns:
-          - "SixLabors*"
-      NUnit:
-        patterns:
-          - "NUnit*"

.github/labeler.yml

@@ -32,4 +32,12 @@ kernel:
 
 infra:
 - changed-files:
-  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props']
+  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props', 'src/Ryujinx.BuildValidationTasks/**']
+
+documentation:
+- changed-files:
+  - any-glob-to-any-file: 'docs/**'
+
+ldn:
+- changed-files:
+  - any-glob-to-any-file: 'src/Ryujinx.HLE/HOS/Services/Ldn/**'

.github/workflows/build.yml

@@ -7,6 +7,7 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2.0"
+  RELEASE: 0
 
 jobs:
   build:
@@ -60,11 +61,11 @@ jobs:
         if: matrix.platform.name != 'linux-arm64'
 
       - name: Publish Ryujinx
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained true
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
       - name: Publish Ryujinx.Headless.SDL2
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
       - name: Set executable bit
@@ -73,6 +74,37 @@ jobs:
           chmod +x ./publish_sdl2_headless/Ryujinx.Headless.SDL2 ./publish_sdl2_headless/Ryujinx.sh
         if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
 
+      - name: Build AppImage
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        run: |
+          PLATFORM_NAME="${{ matrix.platform.name }}"
+
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          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
+
+          # 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
+
+          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+        shell: bash
+
       - name: Upload Ryujinx artifact
         uses: actions/upload-artifact@v4
         with:
@@ -80,10 +112,17 @@ jobs:
           path: publish
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
+      - name: Upload Ryujinx (AppImage) artifact
+        uses: actions/upload-artifact@v4
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
+          path: publish_appimage
+
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
           path: publish_sdl2_headless
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
@@ -146,6 +185,6 @@ jobs:
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
           path: "publish_headless/*.tar.gz"
         if: github.event_name == 'pull_request'

.github/workflows/canary.yml

@@ -0,0 +1,281 @@
+name: Canary release job
+
+on:
+  workflow_dispatch:
+    inputs: {}
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - 'assets/**'
+      - '*.yml'
+      - '*.json'
+      - '*.config'
+      - '*.md'
+
+concurrency: release
+
+env:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  RYUJINX_BASE_VERSION: "1.2"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
+  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
+  RELEASE: 1
+
+jobs:
+  tag:
+    name: Create tag
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Create tag
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/Canary-${{ steps.version_info.outputs.build_version }}',
+              sha: context.sha
+            })
+
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          name: "Canary ${{ steps.version_info.outputs.build_version }}"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: |            
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ github.repository }}/releases/latest) instead if that sounds like something you don't want to deal with.
+            
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Canary macOS artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
+          omitBodyDuringUpdate: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+  release:
+    name: Release for ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
+    strategy:
+      matrix:
+        platform:
+          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
+          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Overwrite csc problem matcher
+        run: echo "::add-matcher::.github/csc.json"
+
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Configure for release
+        run: |
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          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
+        shell: bash
+
+      - name: Create output dir
+        run: "mkdir release_output"
+
+      - 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_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --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
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-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
+          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-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 }}"
+
+      #    sudo apt install -y zsync desktop-file-utils appstream
+
+      #    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
+
+          # 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
+
+      #    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
+
+          # 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
+
+      - 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/*AppImage*"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: |
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/GreemDev/Ryujinx/releases/latest) instead if that sounds like something you don't want to deal with.
+
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          omitBodyDuringUpdate: true
+          allowUpdates: true
+          replacesArtifacts: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+  macos_release:
+    name: Release MacOS universal
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Setup LLVM 15
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 15
+
+      - name: Install rcodesign
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
+          tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
+          rm apple-codesign.tar.gz
+          mv rcodesign $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+
+      - name: Configure for release
+        run: |
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          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
+        shell: bash
+
+      - name: Publish macOS Ryujinx
+        run: |
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+
+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+
+      - name: Pushing new release
+        uses: ncipollo/release-action@v1
+        with:
+          name: "Canary ${{ steps.version_info.outputs.build_version }}"
+          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: ""
+          omitBodyDuringUpdate: true
+          allowUpdates: true
+          replacesArtifacts: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/checks.yml

@@ -1,4 +1,4 @@
-name: Perform checks
+name: Build PR
 
 on:
   pull_request:
@@ -20,55 +20,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: global.json
-
-      - name: Overwrite csc problem matcher
-        run: echo "::add-matcher::.github/csc.json"
-
-      - run: dotnet restore
-
-      - name: Print dotnet format version
-        run: dotnet format --version
-
-      - name: Run dotnet format whitespace
-        run: |
-          dotnet format whitespace --verify-no-changes --report ./whitespace-report.json -v d
-
-      # For some unknown reason this step sometimes fails with exit code 139 (segfault?),
-      # so in that case we'll try again (3 tries max).
-      - name: Run dotnet format style
-        uses: TSRBerry/unstable-commands@v1
-        with:
-          commands: dotnet format style --severity info --verify-no-changes --report ./style-report.json -v d
-          timeout-minutes: 5
-          retry-codes: 139
-
-      # For some unknown reason this step sometimes fails with exit code 139 (segfault?),
-      # so in that case we'll try again (3 tries max).
-      - name: Run dotnet format analyzers
-        uses: TSRBerry/unstable-commands@v1
-        with:
-          commands: dotnet format analyzers --severity info --verify-no-changes --report ./analyzers-report.json -v d
-          timeout-minutes: 5
-          retry-codes: 139
-
-      - name: Upload report
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: dotnet-format
-          path: ./*-report.json
-
   pr_build:
     uses: ./.github/workflows/build.yml
-    needs: format
     secrets: inherit

.github/workflows/nightly_pr_comment.yml

@@ -2,7 +2,7 @@ name: Comment PR artifacts links
 
 on:
   workflow_run:
-    workflows: ['Perform checks']
+    workflows: ['Build PR']
     types: [completed]
 
 jobs:
@@ -10,7 +10,7 @@ jobs:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v6
         with:
           script: |
             const {owner, repo} = context.repo;
@@ -38,12 +38,12 @@ jobs:
               return core.error(`No artifacts found`);
             }
             let body = `Download the artifacts for this pull request:\n`;
-            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less (SDL2)</summary>\n`;
+            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less</summary>\n`;
             let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
             for (const art of artifacts) {
               if(art.name.includes('Debug')) {
                 hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-              } else if(art.name.includes('sdl2-ryujinx-headless')) {
+              } else if(art.name.includes('nogui-ryujinx')) {
                 hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else {
                 body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
@@ -62,4 +62,4 @@ jobs:
             } else {
               core.info(`Creating a comment`);
               await github.rest.issues.createComment({repo, owner, issue_number, body});
-            }
+            }

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs: {}
   push:
-    branches: [ master ]
+    branches: [ release ]
     paths-ignore:
       - '.github/**'
       - 'docs/**'
@@ -20,9 +20,10 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
   RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
   RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
+  RELEASE: 1
 
 jobs:
   tag:
@@ -52,7 +53,16 @@ jobs:
         with:
           name: ${{ steps.version_info.outputs.build_version }}
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64-bit | [Release Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64-bit | [Release Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux ARM 64-bit | [Release Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Release macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
           omitBodyDuringUpdate: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -92,6 +102,7 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           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_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
         shell: bash
 
@@ -100,32 +111,71 @@ 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 true
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained true
+          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
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained
 
       - name: Packing Windows builds
         if: matrix.platform.os == 'windows-latest'
         run: |
-          pushd publish_ava
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          pushd publish
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
 
           pushd publish_sdl2_headless
-          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../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 }}"
+
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          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
+
+          # 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
+
+          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+
+          pushd publish_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        
 
       - name: Packing Linux builds
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
-          pushd publish_ava
-          chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          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
 
           pushd publish_sdl2_headless
-          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
           popd
         shell: bash
 
@@ -133,9 +183,18 @@ jobs:
         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*"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+          
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
@@ -184,24 +243,25 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           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_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
         shell: bash
 
       - name: Publish macOS Ryujinx
         run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
 
       - name: Publish macOS Ryujinx.Headless.SDL2
         run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
 
       - name: Pushing new release
         uses: ncipollo/release-action@v1
         with:
           name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
+          artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: ""
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true

.gitignore

@@ -16,6 +16,8 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+AppDir/
+publish_appimage/
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
@@ -173,3 +175,6 @@ PublishProfiles/
 
 # Glade backup files
 *.glade~
+
+# Ignore MacOS Attribute Files
+._*

COMPILING.md

@@ -0,0 +1,23 @@
+## Compilation
+
+Building the project is for users that want to contribute code only.
+If you wish to build the emulator yourself, follow these steps:
+
+### Step 1
+
+Install the [.NET 9.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/9.0).
+Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).
+
+### Step 2
+
+Either use `git clone https://github.com/GreemDev/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
+
+### Step 3
+
+To build Ryujinx, open a command prompt inside the project directory.
+You can quickly access it on Windows by holding shift in File Explorer, then right clicking and selecting `Open command window here`.
+Then type the following command: `dotnet build -c Release -o build`
+the built files will be found in the newly created build directory.
+
+Ryujinx system files are stored in the `Ryujinx` folder.
+This folder is located in the user folder, which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.

CONTRIBUTING.md

@@ -12,24 +12,15 @@ Please read the entire document before continuing as it can potentially save eve
 
 We always welcome bug reports, feature proposals and overall feedback. Here are a few tips on how you can make reporting your issue as effective as possible.
 
-### Identify Where to Report
-
-The Ryujinx codebase is distributed across multiple repositories in the [Ryujinx organization](https://github.com/Ryujinx). Depending on the feedback you might want to file the issue on a different repo. Here are a few common repos:
-
-* [Ryujinx/Ryujinx](https://github.com/Ryujinx/Ryujinx) Ryujinx core project files.
-* [Ryujinx/Ryujinx-Games-List](https://github.com/Ryujinx/Ryujinx-Games-List) Ryujinx game compatibility list.
-* [Ryujinx/Ryujinx-Website](https://github.com/Ryujinx/Ryujinx-Website) Ryujinx website source code.
-* [Ryujinx/Ryujinx-Ldn-Website](https://github.com/Ryujinx/Ryujinx-Ldn-Website) Ryujinx LDN website source code.
-
 ### Finding Existing Issues
 
-Before filing a new issue, please search our [open issues](https://github.com/Ryujinx/Ryujinx/issues) to check if it already exists.
+Before filing a new issue, please search our [open issues](https://github.com/GreemDev/Ryujinx/issues) to check if it already exists.
 
 If you do find an existing issue, please include your own feedback in the discussion. Do consider upvoting (👍 reaction) the original post, as this helps us prioritize popular issues in our backlog.
 
 ### Writing a Good Feature Request
 
-Please review any feature requests already opened to both check it has not already been suggested, and to familiarize yourself with the format. When ready to submit a proposal, please use the [Feature Request issue template](https://github.com/Ryujinx/Ryujinx/issues/new?assignees=&labels=&projects=&template=feature_request.yml&title=%5BFeature+Request%5D).
+Please review any feature requests already opened to both check it has not already been suggested, and to familiarize yourself with the format. When ready to submit a proposal, please use the [Feature Request issue template](https://github.com/GreemDev/Ryujinx/issues/new?assignees=&labels=&projects=&template=feature_request.yml&title=%5BFeature+Request%5D).
 
 ### Writing a Good Bug Report
 
@@ -43,13 +34,13 @@ Ideally, a bug report should contain the following information:
 * A Ryujinx log file of the run instance where the issue occurred. Log files can be found in `[Executable Folder]/Logs` and are named chronologically.
 * Additional information, e.g. is it a regression from previous versions? Are there any known workarounds?
 
-When ready to submit a bug report, please use the [Bug Report issue template](https://github.com/Ryujinx/Ryujinx/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=%5BBug%5D).
+When ready to submit a bug report, please use the [Bug Report issue template](https://github.com/GreemDev/Ryujinx/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=%5BBug%5D).
 
 ## Contributing Changes
 
 Project maintainers will merge changes that both improve the project and meet our standards for code quality.
 
-The [Pull Request Guide](docs/workflow/pr-guide.md) and [License](https://github.com/Ryujinx/Ryujinx/blob/master/LICENSE.txt) docs define additional guidance.
+The [Pull Request Guide](docs/workflow/pr-guide.md) and [License](https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt) docs define additional guidance.
 
 ### DOs and DON'Ts
 
@@ -83,23 +74,23 @@ We use and recommend the following workflow:
 3. In your fork, create a branch off of main (`git checkout -b mybranch`).
     - Branches are useful since they isolate your changes from incoming changes from upstream. They also enable you to create multiple PRs from the same fork.
 4. Make and commit your changes to your branch.
-    - [Build Instructions](https://github.com/Ryujinx/Ryujinx#building) explains how to build and test.
+    - [Build Instructions](https://github.com/GreemDev/Ryujinx/blob/master/COMPILING.md) explains how to build and test.
     - Commit messages should be clear statements of action and intent.
 6. Build the repository with your changes.
     - Make sure that the builds are clean.
     - Make sure that `dotnet format` has been run and any corrections tested and committed.
 7. Create a pull request (PR) against the Ryujinx/Ryujinx repository's **main** branch.
     - State in the description what issue or improvement your change is addressing.
-    - Check if all the Continuous Integration checks are passing. Refer to [Actions](https://github.com/Ryujinx/Ryujinx/actions) to check for outstanding errors.
-8. Wait for feedback or approval of your changes from the [core development team](https://github.com/orgs/Ryujinx/teams/developers)
-    - Details about the pull request [review procedure](docs/workflow/ci/pr-guide.md).
+    - Check if all the Continuous Integration checks are passing. Refer to [Actions](https://github.com/GreemDev/Ryujinx/actions) to check for outstanding errors.
+8. Wait for feedback or approval of your changes from the core development team
+    - Details about the pull request [review procedure](docs/workflow/pr-guide.md).
 9. When the team members have signed off, and all checks are green, your PR will be merged.
     - The next official build will automatically include your change.
     - You can delete the branch you used for making the change.
 
 ### Good First Issues
 
-The team marks the most straightforward issues as [good first issues](https://github.com/Ryujinx/Ryujinx/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). This set of issues is the place to start if you are interested in contributing but new to the codebase.
+The team marks the most straightforward issues as [good first issues](https://github.com/GreemDev/Ryujinx/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). This set of issues is the place to start if you are interested in contributing but new to the codebase.
 
 ### Commit Messages
 
@@ -122,7 +113,7 @@ Also do your best to factor commits appropriately, not too large with unrelated
 
 ### PR - CI Process
 
-The [Ryujinx continuous integration](https://github.com/Ryujinx/Ryujinx/actions) (CI) system will automatically perform the required builds and run tests (including the ones you are expected to run) for PRs. Builds and test runs must be clean or have bugs properly filed against flaky/unexpected failures that are unrelated to your change.
+The [Ryujinx continuous integration](https://github.com/GreemDev/Ryujinx/actions) (CI) system will automatically perform the required builds and run tests (including the ones you are expected to run) for PRs. Builds and test runs must be clean or have bugs properly filed against flaky/unexpected failures that are unrelated to your change.
 
 If the CI build fails for any reason, the PR actions tab should be consulted for further information on the failure. There are a few usual suspects for such a failure:
 * `dotnet format` has not been run on the PR and has outstanding stylistic issues.
@@ -143,5 +134,5 @@ Ryujinx uses some implementations and frameworks from other projects. The follow
 
 - The license of the file is [permissive](https://en.wikipedia.org/wiki/Permissive_free_software_licence).
 - The license of the file is left in-tact.
-- The contribution is correctly attributed in the [3rd party notices](https://github.com/Ryujinx/Ryujinx/blob/master/distribution/legal/THIRDPARTY.md) file in the repository, as needed.
+- The contribution is correctly attributed in the [3rd party notices](https://github.com/GreemDev/Ryujinx/blob/master/distribution/legal/THIRDPARTY.md) file in the repository, as needed.
 

Directory.Build.props

@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+</Project>

Directory.Packages.props

@@ -10,6 +10,9 @@
     <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
     <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
@@ -22,7 +25,7 @@
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -33,13 +36,15 @@
     <PackageVersion Include="OpenTK.Graphics" Version="4.8.2" />
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.8.2" />
     <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
+    <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <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.5" />
+    <PackageVersion Include="Gommon" Version="2.6.8" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
+    <PackageVersion Include="SharpMetal" Version="1.0.0-preview20" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
@@ -47,8 +52,8 @@
     <PackageVersion Include="SkiaSharp" Version="2.88.7" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
-    <PackageVersion Include="System.Management" Version="8.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

README.md

@@ -1,53 +1,52 @@
-<h1 align="center">
+<table align="center">
+    <tr>
+        <td align="center" width="25%">
+            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+        </td>
+        <td align="center" width="75%">
+          
+# Ryujinx
+          
+[![Release workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml)
+[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/GreemDev/Ryujinx/releases/latest)
   <br>
-  <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/master/distribution/misc/Logo.svg" alt="Ryujinx" width="150"></a>
-  <br>
-  <b>Ryujinx</b>
-  <br>
-  <sub><sup><b>(REE-YOU-JINX)</b></sup></sub>
-  <br>
-</h1>
+[![Canary workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml)
+[![Latest canary release](https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary)](https://github.com/GreemDev/Ryujinx-Canary/releases/latest)
+        </td>
+    </tr>
+</table>
 
 <p align="center">
   Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
   This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
   It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on Github under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on GitHub under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
   <br />
 </p>
 <p align="center">
   On October 1st 2024, Ryujinx was discontinued as the creator was forced to abandon the project.
-  This fork is intended to be a direct continuation for existing Ryujinx users.
-  Guides and documentation will not be provided at this time, though you can find the old ones on the Internet Archive.
+  <br>
+  This fork is intended to be a QoL uplift for existing Ryujinx users.
+  <br>
+  This is not a Ryujinx revival project. This is not a Phoenix project.
+  <br>
+  Guides and documentation can be found on the <a href="https://github.com/GreemDev/Ryujinx/wiki">Wiki tab</a>.
+</p>
+<p align="center">
+  If you would like a more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
 </p>
 
 <p align="center">
-    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml">
-        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg"
-            alt="">
-    </a>
-    <a href="https://crwd.in/ryujinx">
-        <img src="https://badges.crowdin.net/ryujinx/localized.svg"
-            alt="">
-    </a>
+    Click below to join the Discord:
+    <br>
     <a href="https://discord.gg/dHPrkBkkyA">
-        <img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryujinx&logo=discord&logoColor=white"
-            alt="Discord">
+        <img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryubing&logo=discord&logoColor=white" alt="Discord">
     </a>
     <br>
     <br>
     <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/docs/shell.png">
 </p>
 
-## Compatibility
-
-As of May 2024, Ryujinx has been tested on approximately 4,300 titles;
-over 4,100 boot past menus and into gameplay, with roughly 3,550 of those being considered playable.
-
-Anyone is free to submit a new game test or update an existing game test entry;
-simply follow the new issue template and testing guidelines, or post as a reply to the applicable game issue.
-Use the search function to see if a game has been tested already!
-
 ## Usage
 
 To run this emulator, your PC must be equipped with at least 8GiB of RAM;
@@ -55,36 +54,21 @@ failing to meet this requirement may result in a poor gameplay experience or une
 
 ## Latest build
 
-These builds are compiled automatically for each commit on the master branch.
-While we strive to ensure optimal stability and performance prior to pushing an update, our automated builds **may be unstable or completely broken**.
+Stable builds are made every so often onto a separate "release" branch that then gets put into the releases you know and love.
+These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
+
+You can find the latest stable release [here](https://github.com/GreemDev/Ryujinx/releases/latest).
+
+Canary builds are compiled automatically for each commit on the master branch.
+While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
+These canary builds are only recommended for experienced users.
+
+You can find the latest canary release [here](https://github.com/GreemDev/Ryujinx-Canary/releases/latest).
 
 ## Documentation
 
 If you are planning to contribute or just want to learn more about this project please read through our [documentation](docs/README.md).
 
-## Building
-
-If you wish to build the emulator yourself, follow these steps:
-
-### Step 1
-
-Install the [.NET 8.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/8.0).
-Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json). 
-
-### Step 2
-
-Either use `git clone https://github.com/GreemDev/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
-
-### Step 3
-
-To build Ryujinx, open a command prompt inside the project directory.
-You can quickly access it on Windows by holding shift in File Explorer, then right clicking and selecting `Open command window here`.
-Then type the following command: `dotnet build -c Release -o build`
-the built files will be found in the newly created build directory.
-
-Ryujinx system files are stored in the `Ryujinx` folder.
-This folder is located in the user folder, which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
-
 ## Features
 
 - **Audio**
@@ -98,7 +82,7 @@ This folder is located in the user folder, which can be accessed by clicking `Op
   It translates the ARM code to a custom IR, performs a few optimizations, and turns that into x86 code.
   There are three memory manager options available depending on the user's preference, leveraging both software-based (slower) and host-mapped modes (much faster).
   The fastest option (host, unchecked) is set by default.
-  Ryujinx also features an optional Profiled Persistent Translation Cache, which essentially caches translated functions so that they do not need to be translated every time the game loads. 
+  Ryujinx also features an optional Profiled Persistent Translation Cache, which essentially caches translated functions so that they do not need to be translated every time the game loads.
   The net result is a significant reduction in load times (the amount of time between launching a game and arriving at the title screen) for nearly every game.
   NOTE: This feature is enabled by default in the Options menu > System tab.
   You must launch the game at least twice to the title screen or beyond before performance improvements are unlocked on the third launch!

Ryujinx.sln

@@ -29,12 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "src\Ryujinx.Audio\Ryujinx.Audio.csproj", "{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Directory.Packages.props = Directory.Packages.props
-	EndProjectSection
-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}"
@@ -86,6 +80,21 @@ 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}"
+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("{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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -249,6 +258,13 @@ Global
 		{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
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ryujinx.sln.DotSettings

@@ -3,9 +3,13 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseExplicitType</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseExplicitType</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDL/@EntryIndexedValue">SDL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDL/@EntryIndexedValue">OS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"&gt;&lt;ElementKinds&gt;&lt;Kind Name="NAMESPACE" /&gt;&lt;Kind Name="CLASS" /&gt;&lt;Kind Name="STRUCT" /&gt;&lt;Kind Name="ENUM" /&gt;&lt;Kind Name="DELEGATE" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=amiibo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ASET/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Astc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Luma/@EntryIndexedValue">True</s:Boolean>
@@ -20,4 +24,4 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Spirv/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Srgb/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unorm/@EntryIndexedValue">True</s:Boolean>
-</wpf:ResourceDictionary>
+</wpf:ResourceDictionary>

assets/amiibo/Amiibo.json

@@ -707,6 +707,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010300",
@@ -3526,6 +3542,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01400000",
@@ -4160,6 +4192,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -5848,6 +5896,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -6126,6 +6190,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -8341,6 +8421,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -9020,6 +9116,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000100",
@@ -9496,6 +9608,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010000",
@@ -9833,6 +9961,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -14667,6 +14811,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01030000",
@@ -16119,6 +16279,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01050000",
@@ -16717,6 +16893,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01070000",
@@ -19745,6 +19937,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01080000",
@@ -20503,6 +20711,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010000",
@@ -21805,6 +22029,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -22340,6 +22580,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01020100",
@@ -22990,6 +23246,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -23440,6 +23712,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -24660,6 +24948,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01410000",
@@ -24954,6 +25258,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01060000",
@@ -25286,6 +25606,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -29114,6 +29450,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010000",
@@ -32512,6 +32864,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -32928,6 +33296,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000100",
@@ -34800,6 +35184,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Red Tunic",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01000000",
@@ -37569,6 +37969,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010100",
@@ -41293,6 +41709,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Black Cat Clothes",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01020100",
@@ -45153,6 +45585,22 @@
                         "0100F2C0115B6000"
                     ],
                     "gameName": "The Legend of Zelda: Tears of the Kingdom"
+                },
+                {
+                    "amiiboUsage": [
+                        {
+                            "Usage": "Receive the Blue Attire",
+                            "write": false
+                        },
+                        {
+                            "Usage": "Receive random materials",
+                            "write": false
+                        }
+                    ],
+                    "gameID": [
+                        "01008CF01BAAC000"
+                    ],
+                    "gameName": "The Legend of Zelda: Echoes of Wisdom"
                 }
             ],
             "head": "01010000",
@@ -47896,5 +48344,5 @@
             "type": "Figure"
         }
     ],
-    "lastUpdated": "2024-10-01T00:00:25.035619"
-}
+    "lastUpdated": "2024-11-17T15:28:47.035619"
+}

distribution/linux/Ryujinx.sh

@@ -14,7 +14,7 @@ if [ -z "$RYUJINX_BIN" ]; then
     exit 1
 fi
 
-COMMAND="env DOTNET_EnableAlternateStackCheck=1"
+COMMAND="env LANG=C.UTF-8 DOTNET_EnableAlternateStackCheck=1"
 
 if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"

distribution/linux/appimage/AppRun

@@ -0,0 +1,3 @@
+#!/bin/sh
+CURRENTDIR="$(readlink -f "$(dirname "$0")")"
+exec "$CURRENTDIR"/usr/bin/Ryujinx.sh "$@"

distribution/linux/appimage/build-appimage.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+set -eu
+
+ROOTDIR="$(readlink -f "$(dirname "$0")")"/../../../
+cd "$ROOTDIR"
+
+BUILDDIR=${BUILDDIR:-publish}
+OUTDIR=${OUTDIR:-publish_appimage}
+UFLAG=${UFLAG:-"gh-releases-zsync|GreemDev|ryujinx|latest|*-x64.AppImage.zsync"}
+
+rm -rf AppDir
+mkdir -p AppDir/usr/bin
+
+cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
+cp distribution/linux/appimage/AppRun AppDir/AppRun
+cp src/Ryujinx.UI.Common/Resources/Logo_Ryujinx.png AppDir/Ryujinx.svg
+
+
+cp -r "$BUILDDIR"/* AppDir/usr/bin/
+
+# Ensure necessary bins are set as executable
+chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
+
+mkdir -p "$OUTDIR"
+
+appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
+    -u "$UFLAG" \
+    AppDir "$OUTDIR"/Ryujinx.AppImage
+
+# Move zsync file needed for delta updates
+if [ "$RELEASE" = "1" ]; then
+    mv ./*.AppImage.zsync "$OUTDIR"
+fi

distribution/macos/Info.plist

@@ -40,11 +40,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1</string>
+    <string>1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>1.1.0</string>
+    <string>1.2.0</string>
     <key>NSHighResolutionCapable</key>
     <true/>
     <key>CSResourcesFileMapped</key>

distribution/macos/create_app_bundle.sh

@@ -46,5 +46,5 @@ then
     rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$APP_BUNDLE_DIRECTORY"
 else
     echo "Usign codesign for ad-hoc signing"
-    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f --deep -s - "$APP_BUNDLE_DIRECTORY"
-fi
+    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$APP_BUNDLE_DIRECTORY"
+fi

distribution/macos/create_macos_build_ava.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$#" -lt 7 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+if [ "$#" -lt 8 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
     exit 1
 fi
 
@@ -18,10 +18,11 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
 VERSION=$5
 SOURCE_REVISION_ID=$6
 CONFIGURATION=$7
-EXTRA_ARGS=$8
+CANARY=$8
 
-if [ "$VERSION" == "1.1.0" ];
-then
+if [ "$CANARY" == "1" ]; then
+  RELEASE_TAR_FILE_NAME=ryujinx-canary-$VERSION-macos_universal.app.tar
+elif [ "$VERSION" == "1.1.0" ]; then
   RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
 else
   RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
@@ -61,7 +62,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
 cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
 rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
 
-# Make it libraries universal
+# Make its libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
 
 if ! [ -x "$(command -v lipo)" ];
@@ -99,7 +100,7 @@ then
     rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$UNIVERSAL_APP_BUNDLE"
 else
     echo "Using codesign for ad-hoc signing"
-    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f --deep -s - "$UNIVERSAL_APP_BUNDLE"
+    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$UNIVERSAL_APP_BUNDLE"
 fi
 
 echo "Creating archive"
@@ -111,4 +112,4 @@ rm "$RELEASE_TAR_FILE_NAME"
 
 popd
 
-echo "Done"
+echo "Done"

distribution/macos/create_macos_build_headless.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$#" -lt 7 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+if [ "$#" -lt 8 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
     exit 1
 fi
 
@@ -18,13 +18,14 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
 VERSION=$5
 SOURCE_REVISION_ID=$6
 CONFIGURATION=$7
-EXTRA_ARGS=$8
+CANARY=$8
 
-if [ "$VERSION" == "1.1.0" ];
-then
-  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
+if [ "$CANARY" == "1" ]; then
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.tar
+elif [ "$VERSION" == "1.1.0" ]; then
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
 else
-  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-$VERSION-macos_universal.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
 fi
 
 ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
@@ -56,7 +57,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
 cp -R "$ARM64_OUTPUT/" "$UNIVERSAL_OUTPUT"
 rm "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH"
 
-# Make it libraries universal
+# Make its libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTPUT" "$X64_OUTPUT" "$UNIVERSAL_OUTPUT" "**/*.dylib"
 
 if ! [ -x "$(command -v lipo)" ];
@@ -95,7 +96,7 @@ else
     echo "Using codesign for ad-hoc signing"
     for FILE in "$UNIVERSAL_OUTPUT"/*; do
         if [[ $(file "$FILE") == *"Mach-O"* ]]; then
-            codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f --deep -s - "$FILE"
+            codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$FILE"
         fi
     done    
 fi
@@ -108,4 +109,4 @@ gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
 rm "$RELEASE_TAR_FILE_NAME"
 popd
 
-echo "Done"
+echo "Done"

distribution/macos/updater.sh

@@ -17,7 +17,7 @@ error_handler() {
     set the button_pressed to the button returned of the result
 
     if the button_pressed is \"Open Download Page\" then
-        open location \"https://ryujinx.org/download\"
+        open location \"https://ryujinx.app/download\"
     end if
     """
 
@@ -54,4 +54,4 @@ if [ "$#" -le 3 ]; then
     open -a "$INSTALL_DIRECTORY"
 else
     open -a "$INSTALL_DIRECTORY" --args "${APP_ARGUMENTS[@]}"
-fi
+fi

docs/workflow/pr-guide.md

@@ -2,14 +2,14 @@
 
 ## Contributing Rules
 
-All contributions to Ryujinx/Ryujinx repository are made via pull requests (PRs) rather than through direct commits. The pull requests are reviewed and merged by the maintainers after a review and at least two approvals from the core development team.
+All contributions to GreemDev/Ryujinx repository are made via pull requests (PRs) rather than through direct commits. The pull requests are reviewed and merged by the maintainers after a review and at least two approvals from the core development team.
 
 To merge pull requests, you must have write permissions in the repository.
 
 ## Quick Code Review Rules
 
 * Do not mix unrelated changes in one pull request. For example, a code style change should never be mixed with a bug fix.
-* All changes should follow the existing code style. You can read more about our code style at [docs/coding-guidelines](../coding-guidelines/coding-style.md).
+* All changes should follow the existing code style. You can read more about our code style at [docs/coding-style](../coding-guidelines/coding-style.md).
 * Adding external dependencies is to be avoided unless not doing so would introduce _significant_ complexity. Any dependency addition should be justified and discussed before merge.
 * Use Draft pull requests for changes you are still working on but want early CI loop feedback. When you think your changes are ready for review, [change the status](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) of your pull request.
 * Rebase your changes when required or directly requested. Changes should always be commited on top of the upstream branch, not the other way around.
@@ -24,7 +24,7 @@ If during the code review process a merge conflict occurs, the PR author is resp
 
 ## Pull Request Builds
 
-When submitting a PR to the `Ryujinx/Ryujinx` repository, various builds will run validating many areas to ensure we keep developer productivity and product quality high. These various workflows can be tracked in the [Actions](https://github.com/Ryujinx/Ryujinx/actions) tab of the repository. If the job continues to completion, the build artifacts will be uploaded and posted as a comment in the PR discussion.
+When submitting a PR to the `GreemDev/Ryujinx` repository, various builds will run validating many areas to ensure we keep developer productivity and product quality high. These various workflows can be tracked in the [Actions](https://github.com/GreemDev/Ryujinx/actions) tab of the repository. If the job continues to completion, the build artifacts will be uploaded and posted as a comment in the PR discussion.
 
 ## Review Turnaround Times
 
@@ -42,7 +42,7 @@ Anyone with write access can merge a pull request manually when the following co
 
 * The PR has been approved by two reviewers and any other objections are addressed.
     * You can request follow up reviews from the original reviewers if they requested changes.
-* The PR successfully builds and passes all tests in the Continuous Integration (CI) system. In case of failures, refer to the [Actions](https://github.com/Ryujinx/Ryujinx/actions) tab of your PR.
+* The PR successfully builds and passes all tests in the Continuous Integration (CI) system. In case of failures, refer to the [Actions](https://github.com/GreemDev/Ryujinx/actions) tab of your PR.
 
 Typically, PRs are merged as one commit (squash merges). It creates a simpler history than a Merge Commit. "Special circumstances" are rare, and typically mean that there are a series of cleanly separated changes that will be too hard to understand if squashed together, or for some reason we want to preserve the ability to dissect them.
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }

src/ARMeilleure/ARMeilleure.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/ARMeilleure/CodeGen/Arm64/HardwareCapabilities.cs

@@ -127,13 +127,13 @@ namespace ARMeilleure.CodeGen.Arm64
         #region macOS
 
         [LibraryImport("libSystem.dylib", SetLastError = true)]
-        private static unsafe partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, out int oldValue, ref ulong oldSize, IntPtr newValue, ulong newValueSize);
+        private static unsafe partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, out int oldValue, ref ulong oldSize, nint newValue, ulong newValueSize);
 
         [SupportedOSPlatform("macos")]
         private static bool CheckSysctlName(string name)
         {
             ulong size = sizeof(int);
-            if (sysctlbyname(name, out int val, ref size, IntPtr.Zero, 0) == 0 && size == sizeof(int))
+            if (sysctlbyname(name, out int val, ref size, nint.Zero, 0) == 0 && size == sizeof(int))
             {
                 return val != 0;
             }

src/ARMeilleure/CodeGen/CompiledFunction.cs

@@ -58,7 +58,7 @@ namespace ARMeilleure.CodeGen
         /// <typeparam name="T">Type of delegate</typeparam>
         /// <param name="codePointer">Pointer to the function code in memory</param>
         /// <returns>A delegate of type <typeparamref name="T"/> pointing to the mapped function</returns>
-        public T MapWithPointer<T>(out IntPtr codePointer)
+        public T MapWithPointer<T>(out nint codePointer)
         {
             codePointer = JitCache.Map(this);
 

src/ARMeilleure/CodeGen/RegisterAllocators/LiveInterval.cs

@@ -387,7 +387,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
 
         public override int GetHashCode()
         {
-            return HashCode.Combine((IntPtr)_data);
+            return HashCode.Combine((nint)_data);
         }
 
         public override string ToString()

src/ARMeilleure/CodeGen/RegisterAllocators/LiveRange.cs

@@ -63,7 +63,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
 
         public override int GetHashCode()
         {
-            return HashCode.Combine((IntPtr)_data);
+            return HashCode.Combine((nint)_data);
         }
 
         public override string ToString()

src/ARMeilleure/Common/AddressTable.cs

@@ -1,252 +0,0 @@
-using ARMeilleure.Diagnostics;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace ARMeilleure.Common
-{
-    /// <summary>
-    /// Represents a table of guest address to a value.
-    /// </summary>
-    /// <typeparam name="TEntry">Type of the value</typeparam>
-    public unsafe class AddressTable<TEntry> : IDisposable where TEntry : unmanaged
-    {
-        /// <summary>
-        /// Represents a level in an <see cref="AddressTable{TEntry}"/>.
-        /// </summary>
-        public readonly struct Level
-        {
-            /// <summary>
-            /// Gets the index of the <see cref="Level"/> in the guest address.
-            /// </summary>
-            public int Index { get; }
-
-            /// <summary>
-            /// Gets the length of the <see cref="Level"/> in the guest address.
-            /// </summary>
-            public int Length { get; }
-
-            /// <summary>
-            /// Gets the mask which masks the bits used by the <see cref="Level"/>.
-            /// </summary>
-            public ulong Mask => ((1ul << Length) - 1) << Index;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Level"/> structure with the specified
-            /// <paramref name="index"/> and <paramref name="length"/>.
-            /// </summary>
-            /// <param name="index">Index of the <see cref="Level"/></param>
-            /// <param name="length">Length of the <see cref="Level"/></param>
-            public Level(int index, int length)
-            {
-                (Index, Length) = (index, length);
-            }
-
-            /// <summary>
-            /// Gets the value of the <see cref="Level"/> from the specified guest <paramref name="address"/>.
-            /// </summary>
-            /// <param name="address">Guest address</param>
-            /// <returns>Value of the <see cref="Level"/> from the specified guest <paramref name="address"/></returns>
-            public int GetValue(ulong address)
-            {
-                return (int)((address & Mask) >> Index);
-            }
-        }
-
-        private bool _disposed;
-        private TEntry** _table;
-        private readonly List<IntPtr> _pages;
-
-        /// <summary>
-        /// Gets the bits used by the <see cref="Levels"/> of the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        public ulong Mask { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Level"/>s used by the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        public Level[] Levels { get; }
-
-        /// <summary>
-        /// Gets or sets the default fill value of newly created leaf pages.
-        /// </summary>
-        public TEntry Fill { get; set; }
-
-        /// <summary>
-        /// Gets the base address of the <see cref="EntryTable{TEntry}"/>.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException"><see cref="EntryTable{TEntry}"/> instance was disposed</exception>
-        public IntPtr Base
-        {
-            get
-            {
-                ObjectDisposedException.ThrowIf(_disposed, this);
-
-                lock (_pages)
-                {
-                    return (IntPtr)GetRootPage();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
-        /// <see cref="Level"/>.
-        /// </summary>
-        /// <exception cref="ArgumentNullException"><paramref name="levels"/> is null</exception>
-        /// <exception cref="ArgumentException">Length of <paramref name="levels"/> is less than 2</exception>
-        public AddressTable(Level[] levels)
-        {
-            ArgumentNullException.ThrowIfNull(levels);
-
-            if (levels.Length < 2)
-            {
-                throw new ArgumentException("Table must be at least 2 levels deep.", nameof(levels));
-            }
-
-            _pages = new List<IntPtr>(capacity: 16);
-
-            Levels = levels;
-            Mask = 0;
-
-            foreach (var level in Levels)
-            {
-                Mask |= level.Mask;
-            }
-        }
-
-        /// <summary>
-        /// Determines if the specified <paramref name="address"/> is in the range of the
-        /// <see cref="AddressTable{TEntry}"/>.
-        /// </summary>
-        /// <param name="address">Guest address</param>
-        /// <returns><see langword="true"/> if is valid; otherwise <see langword="false"/></returns>
-        public bool IsValid(ulong address)
-        {
-            return (address & ~Mask) == 0;
-        }
-
-        /// <summary>
-        /// Gets a reference to the value at the specified guest <paramref name="address"/>.
-        /// </summary>
-        /// <param name="address">Guest address</param>
-        /// <returns>Reference to the value at the specified guest <paramref name="address"/></returns>
-        /// <exception cref="ObjectDisposedException"><see cref="EntryTable{TEntry}"/> instance was disposed</exception>
-        /// <exception cref="ArgumentException"><paramref name="address"/> is not mapped</exception>
-        public ref TEntry GetValue(ulong address)
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-
-            if (!IsValid(address))
-            {
-                throw new ArgumentException($"Address 0x{address:X} is not mapped onto the table.", nameof(address));
-            }
-
-            lock (_pages)
-            {
-                return ref GetPage(address)[Levels[^1].GetValue(address)];
-            }
-        }
-
-        /// <summary>
-        /// Gets the leaf page for the specified guest <paramref name="address"/>.
-        /// </summary>
-        /// <param name="address">Guest address</param>
-        /// <returns>Leaf page for the specified guest <paramref name="address"/></returns>
-        private TEntry* GetPage(ulong address)
-        {
-            TEntry** page = GetRootPage();
-
-            for (int i = 0; i < Levels.Length - 1; i++)
-            {
-                ref Level level = ref Levels[i];
-                ref TEntry* nextPage = ref page[level.GetValue(address)];
-
-                if (nextPage == null)
-                {
-                    ref Level nextLevel = ref Levels[i + 1];
-
-                    nextPage = i == Levels.Length - 2 ?
-                        (TEntry*)Allocate(1 << nextLevel.Length, Fill, leaf: true) :
-                        (TEntry*)Allocate(1 << nextLevel.Length, IntPtr.Zero, leaf: false);
-                }
-
-                page = (TEntry**)nextPage;
-            }
-
-            return (TEntry*)page;
-        }
-
-        /// <summary>
-        /// Lazily initialize and get the root page of the <see cref="AddressTable{TEntry}"/>.
-        /// </summary>
-        /// <returns>Root page of the <see cref="AddressTable{TEntry}"/></returns>
-        private TEntry** GetRootPage()
-        {
-            if (_table == null)
-            {
-                _table = (TEntry**)Allocate(1 << Levels[0].Length, fill: IntPtr.Zero, leaf: false);
-            }
-
-            return _table;
-        }
-
-        /// <summary>
-        /// Allocates a block of memory of the specified type and length.
-        /// </summary>
-        /// <typeparam name="T">Type of elements</typeparam>
-        /// <param name="length">Number of elements</param>
-        /// <param name="fill">Fill value</param>
-        /// <param name="leaf"><see langword="true"/> if leaf; otherwise <see langword="false"/></param>
-        /// <returns>Allocated block</returns>
-        private IntPtr Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
-        {
-            var size = sizeof(T) * length;
-            var page = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
-            var span = new Span<T>((void*)page, length);
-
-            span.Fill(fill);
-
-            _pages.Add(page);
-
-            TranslatorEventSource.Log.AddressTableAllocated(size, leaf);
-
-            return page;
-        }
-
-        /// <summary>
-        /// Releases all resources used by the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases all unmanaged and optionally managed resources used by the <see cref="AddressTable{TEntry}"/>
-        /// instance.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to dispose managed resources also; otherwise just unmanaged resouces</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                foreach (var page in _pages)
-                {
-                    Marshal.FreeHGlobal(page);
-                }
-
-                _disposed = true;
-            }
-        }
-
-        /// <summary>
-        /// Frees resources used by the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        ~AddressTable()
-        {
-            Dispose(false);
-        }
-    }
-}

src/ARMeilleure/Common/AddressTableLevel.cs

@@ -0,0 +1,44 @@
+namespace ARMeilleure.Common
+{
+    /// <summary>
+    /// Represents a level in an <see cref="IAddressTable{TEntry}"/>.
+    /// </summary>
+    public readonly struct AddressTableLevel
+    {
+        /// <summary>
+        /// Gets the index of the <see cref="Level"/> in the guest address.
+        /// </summary>
+        public int Index { get; }
+
+        /// <summary>
+        /// Gets the length of the <see cref="AddressTableLevel"/> in the guest address.
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Gets the mask which masks the bits used by the <see cref="AddressTableLevel"/>.
+        /// </summary>
+        public ulong Mask => ((1ul << Length) - 1) << Index;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AddressTableLevel"/> structure with the specified
+        /// <paramref name="index"/> and <paramref name="length"/>.
+        /// </summary>
+        /// <param name="index">Index of the <see cref="AddressTableLevel"/></param>
+        /// <param name="length">Length of the <see cref="AddressTableLevel"/></param>
+        public AddressTableLevel(int index, int length)
+        {
+            (Index, Length) = (index, length);
+        }
+
+        /// <summary>
+        /// Gets the value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/>.
+        /// </summary>
+        /// <param name="address">Guest address</param>
+        /// <returns>Value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/></returns>
+        public long GetValue(ulong address)
+        {
+            return (long)((address & Mask) >> Index);
+        }
+    }
+}

src/ARMeilleure/Common/AddressTablePresets.cs

@@ -0,0 +1,75 @@
+namespace ARMeilleure.Common
+{
+    public static class AddressTablePresets
+    {
+        private static readonly AddressTableLevel[] _levels64Bit =
+            new AddressTableLevel[]
+            {
+                new(31, 17),
+                new(23,  8),
+                new(15,  8),
+                new( 7,  8),
+                new( 2,  5),
+            };
+
+        private static readonly AddressTableLevel[] _levels32Bit =
+            new AddressTableLevel[]
+            {
+                new(31, 17),
+                new(23,  8),
+                new(15,  8),
+                new( 7,  8),
+                new( 1,  6),
+            };
+
+        private static readonly AddressTableLevel[] _levels64BitSparseTiny =
+            new AddressTableLevel[]
+            {
+                new( 11, 28),
+                new( 2, 9),
+            };
+
+        private static readonly AddressTableLevel[] _levels32BitSparseTiny =
+            new AddressTableLevel[]
+            {
+                new( 10, 22),
+                new( 1, 9),
+            };
+
+        private static readonly AddressTableLevel[] _levels64BitSparseGiant =
+            new AddressTableLevel[]
+            {
+                new( 38, 1),
+                new( 2, 36),
+            };
+
+        private static readonly AddressTableLevel[] _levels32BitSparseGiant =
+            new AddressTableLevel[]
+            {
+                new( 31, 1),
+                new( 1, 30),
+            };
+
+        //high power will run worse on DDR3 systems and some DDR4 systems due to the higher ram utilization
+        //low power will never run worse than non-sparse, but for most systems it won't be necessary
+        //high power is always used, but I've left low power in here for future reference
+        public static AddressTableLevel[] GetArmPreset(bool for64Bits, bool sparse, bool lowPower = false)
+        {
+            if (sparse)
+            {
+                if (lowPower)
+                {
+                    return for64Bits ? _levels64BitSparseTiny : _levels32BitSparseTiny;
+                }
+                else
+                {
+                    return for64Bits ? _levels64BitSparseGiant : _levels32BitSparseGiant;
+                }
+            }
+            else
+            {
+                return for64Bits ? _levels64Bit : _levels32Bit;
+            }
+        }
+    }
+}

src/ARMeilleure/Common/Allocator.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace ARMeilleure.Common
 {
-    unsafe abstract class Allocator : IDisposable
+    public unsafe abstract class Allocator : IDisposable
     {
         public T* Allocate<T>(ulong count = 1) where T : unmanaged
         {

src/ARMeilleure/Common/ArenaAllocator.cs

@@ -20,7 +20,7 @@ namespace ARMeilleure.Common
         private List<PageInfo> _pages;
         private readonly ulong _pageSize;
         private readonly uint _pageCount;
-        private readonly List<IntPtr> _extras;
+        private readonly List<nint> _extras;
 
         public ArenaAllocator(uint pageSize, uint pageCount)
         {
@@ -31,11 +31,11 @@ namespace ARMeilleure.Common
             _pageIndex = -1;
 
             _page = null;
-            _pages = new List<PageInfo>();
+            _pages = [];
             _pageSize = pageSize;
             _pageCount = pageCount;
 
-            _extras = new List<IntPtr>();
+            _extras = [];
         }
 
         public Span<T> AllocateSpan<T>(ulong count) where T : unmanaged
@@ -64,7 +64,7 @@ namespace ARMeilleure.Common
             {
                 void* extra = NativeAllocator.Instance.Allocate(size);
 
-                _extras.Add((IntPtr)extra);
+                _extras.Add((nint)extra);
 
                 return extra;
             }
@@ -84,7 +84,7 @@ namespace ARMeilleure.Common
             {
                 _page = new PageInfo
                 {
-                    Pointer = (byte*)NativeAllocator.Instance.Allocate(_pageSize),
+                    Pointer = (byte*)NativeAllocator.Instance.Allocate(_pageSize)
                 };
 
                 _pages.Add(_page);
@@ -114,7 +114,7 @@ namespace ARMeilleure.Common
             }
 
             // Free extra blocks that are not page-sized
-            foreach (IntPtr ptr in _extras)
+            foreach (nint ptr in _extras)
             {
                 NativeAllocator.Instance.Free((void*)ptr);
             }
@@ -173,7 +173,7 @@ namespace ARMeilleure.Common
                     NativeAllocator.Instance.Free(info.Pointer);
                 }
 
-                foreach (IntPtr ptr in _extras)
+                foreach (nint ptr in _extras)
                 {
                     NativeAllocator.Instance.Free((void*)ptr);
                 }

src/ARMeilleure/Common/EntryTable.cs

@@ -15,7 +15,7 @@ namespace ARMeilleure.Common
         private int _freeHint;
         private readonly int _pageCapacity; // Number of entries per page.
         private readonly int _pageLogCapacity;
-        private readonly Dictionary<int, IntPtr> _pages;
+        private readonly Dictionary<int, nint> _pages;
         private readonly BitMap _allocated;
 
         /// <summary>
@@ -41,7 +41,7 @@ namespace ARMeilleure.Common
             }
 
             _allocated = new BitMap(NativeAllocator.Instance);
-            _pages = new Dictionary<int, IntPtr>();
+            _pages = new Dictionary<int, nint>();
             _pageLogCapacity = BitOperations.Log2((uint)(pageSize / sizeof(TEntry)));
             _pageCapacity = 1 << _pageLogCapacity;
         }
@@ -138,9 +138,9 @@ namespace ARMeilleure.Common
         {
             var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
 
-            if (!_pages.TryGetValue(pageIndex, out IntPtr page))
+            if (!_pages.TryGetValue(pageIndex, out nint page))
             {
-                page = (IntPtr)NativeAllocator.Instance.Allocate((uint)sizeof(TEntry) * (uint)_pageCapacity);
+                page = (nint)NativeAllocator.Instance.Allocate((uint)sizeof(TEntry) * (uint)_pageCapacity);
 
                 _pages.Add(pageIndex, page);
             }

src/ARMeilleure/Common/IAddressTable.cs

@@ -0,0 +1,51 @@
+using System;
+
+namespace ARMeilleure.Common
+{
+    public interface IAddressTable<TEntry> : IDisposable where TEntry : unmanaged
+    {
+        /// <summary>
+        /// True if the address table's bottom level is sparsely mapped.
+        /// This also ensures the second bottom level is filled with a dummy page rather than 0.
+        /// </summary>
+        bool Sparse { get; }
+
+        /// <summary>
+        /// Gets the bits used by the <see cref="Levels"/> of the <see cref="IAddressTable{TEntry}"/> instance.
+        /// </summary>
+        ulong Mask { get; }
+
+        /// <summary>
+        /// Gets the <see cref="AddressTableLevel"/>s used by the <see cref="IAddressTable{TEntry}"/> instance.
+        /// </summary>
+        AddressTableLevel[] Levels { get; }
+
+        /// <summary>
+        /// Gets or sets the default fill value of newly created leaf pages.
+        /// </summary>
+        TEntry Fill { get; set; }
+
+        /// <summary>
+        /// Gets the base address of the <see cref="EntryTable{TEntry}"/>.
+        /// </summary>
+        /// <exception cref="ObjectDisposedException"><see cref="EntryTable{TEntry}"/> instance was disposed</exception>
+        nint Base { get; }
+
+        /// <summary>
+        /// Determines if the specified <paramref name="address"/> is in the range of the
+        /// <see cref="IAddressTable{TEntry}"/>.
+        /// </summary>
+        /// <param name="address">Guest address</param>
+        /// <returns><see langword="true"/> if is valid; otherwise <see langword="false"/></returns>
+        bool IsValid(ulong address);
+
+        /// <summary>
+        /// Gets a reference to the value at the specified guest <paramref name="address"/>.
+        /// </summary>
+        /// <param name="address">Guest address</param>
+        /// <returns>Reference to the value at the specified guest <paramref name="address"/></returns>
+        /// <exception cref="ObjectDisposedException"><see cref="EntryTable{TEntry}"/> instance was disposed</exception>
+        /// <exception cref="ArgumentException"><paramref name="address"/> is not mapped</exception>
+        ref TEntry GetValue(ulong address);
+    }
+}

src/ARMeilleure/Common/NativeAllocator.cs

@@ -3,13 +3,13 @@ using System.Runtime.InteropServices;
 
 namespace ARMeilleure.Common
 {
-    unsafe sealed class NativeAllocator : Allocator
+    public unsafe sealed class NativeAllocator : Allocator
     {
         public static NativeAllocator Instance { get; } = new();
 
         public override void* Allocate(ulong size)
         {
-            void* result = (void*)Marshal.AllocHGlobal((IntPtr)size);
+            void* result = (void*)Marshal.AllocHGlobal((nint)size);
 
             if (result == null)
             {
@@ -21,7 +21,7 @@ namespace ARMeilleure.Common
 
         public override void Free(void* block)
         {
-            Marshal.FreeHGlobal((IntPtr)block);
+            Marshal.FreeHGlobal((nint)block);
         }
     }
 }

src/ARMeilleure/Decoders/DecoderHelper.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.Common;
+using System;
 
 namespace ARMeilleure.Decoders
 {
@@ -149,7 +150,7 @@ namespace ARMeilleure.Decoders
             return (((long)opCode << 45) >> 48) & ~3;
         }
 
-        public static bool VectorArgumentsInvalid(bool q, params int[] args)
+        public static bool VectorArgumentsInvalid(bool q, params ReadOnlySpan<int> args)
         {
             if (q)
             {

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -193,6 +193,8 @@ namespace ARMeilleure.Instructions
 
             Operand hostAddress;
 
+            var table = context.FunctionTable;
+
             // If address is mapped onto the function table, we can skip the table walk. Otherwise we fallback
             // onto the dispatch stub.
             if (guestAddress.Kind == OperandKind.Constant && context.FunctionTable.IsValid(guestAddress.Value))
@@ -203,6 +205,30 @@ namespace ARMeilleure.Instructions
 
                 hostAddress = context.Load(OperandType.I64, hostAddressAddr);
             }
+            else if (table.Sparse)
+            {
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Deliberately attempts to avoid branches.
+
+                Operand tableBase = !context.HasPtc ?
+                    Const(table.Base) :
+                    Const(table.Base, Ptc.FunctionTableSymbol);
+
+                hostAddress = tableBase;
+
+                for (int i = 0; i < table.Levels.Length; i++)
+                {
+                    var level = table.Levels[i];
+                    int clearBits = 64 - (level.Index + level.Length);
+
+                    Operand index = context.ShiftLeft(
+                        context.ShiftRightUI(context.ShiftLeft(guestAddress, Const(clearBits)), Const(clearBits + level.Index)),
+                        Const(3)
+                    );
+
+                    hostAddress = context.Load(OperandType.I64, context.Add(hostAddress, index));
+                }
+            }
             else
             {
                 hostAddress = !context.HasPtc ?

src/ARMeilleure/Instructions/InstEmitSystem.cs

@@ -49,6 +49,9 @@ namespace ARMeilleure.Instructions
                 case 0b11_011_1101_0000_011:
                     EmitGetTpidrroEl0(context);
                     return;
+                case 0b11_011_1101_0000_101:
+                    EmitGetTpidr2El0(context);
+                    return;
                 case 0b11_011_1110_0000_000:
                     info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntfrqEl0));
                     break;
@@ -84,6 +87,9 @@ namespace ARMeilleure.Instructions
                 case 0b11_011_1101_0000_010:
                     EmitSetTpidrEl0(context);
                     return;
+                case 0b11_011_1101_0000_101:
+                    EmitSetTpidr2El0(context);
+                    return;
 
                 default:
                     throw new NotImplementedException($"Unknown MSR 0x{op.RawOpCode:X8} at 0x{op.Address:X16}.");
@@ -213,6 +219,17 @@ namespace ARMeilleure.Instructions
             SetIntOrZR(context, op.Rt, result);
         }
 
+        private static void EmitGetTpidr2El0(ArmEmitterContext context)
+        {
+            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
+
+            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
+
+            Operand result = context.Load(OperandType.I64, context.Add(nativeContext, Const((ulong)NativeContext.GetTpidr2El0Offset())));
+
+            SetIntOrZR(context, op.Rt, result);
+        }
+
         private static void EmitSetNzcv(ArmEmitterContext context)
         {
             OpCodeSystem op = (OpCodeSystem)context.CurrOp;
@@ -274,5 +291,16 @@ namespace ARMeilleure.Instructions
 
             context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidrEl0Offset())), value);
         }
+
+        private static void EmitSetTpidr2El0(ArmEmitterContext context)
+        {
+            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
+
+            Operand value = GetIntOrZR(context, op.Rt);
+
+            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
+
+            context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidr2El0Offset())), value);
+        }
     }
 }

src/ARMeilleure/Instructions/SoftFallback.cs

@@ -264,7 +264,7 @@ namespace ARMeilleure.Instructions
             return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2, tb3);
         }
 
-        private static V128 TblOrTbx(V128 dest, V128 vector, int bytes, params V128[] tb)
+        private static V128 TblOrTbx(V128 dest, V128 vector, int bytes, params ReadOnlySpan<V128> tb)
         {
             byte[] res = new byte[16];
 

src/ARMeilleure/IntermediateRepresentation/IntrusiveList.cs

@@ -32,7 +32,7 @@ namespace ARMeilleure.IntermediateRepresentation
         /// <exception cref="ArgumentException"><typeparamref name="T"/> is not pointer sized.</exception>
         public IntrusiveList()
         {
-            if (Unsafe.SizeOf<T>() != IntPtr.Size)
+            if (Unsafe.SizeOf<T>() != nint.Size)
             {
                 throw new ArgumentException("T must be a reference type or a pointer sized struct.");
             }

src/ARMeilleure/IntermediateRepresentation/MemoryOperand.cs

@@ -24,7 +24,7 @@ namespace ARMeilleure.IntermediateRepresentation
         {
             Debug.Assert(operand.Kind == OperandKind.Memory);
 
-            _data = (Data*)Unsafe.As<Operand, IntPtr>(ref operand);
+            _data = (Data*)Unsafe.As<Operand, nint>(ref operand);
         }
 
         public Operand BaseAddress

src/ARMeilleure/IntermediateRepresentation/Operation.cs

@@ -228,7 +228,7 @@ namespace ARMeilleure.IntermediateRepresentation
 
         public readonly override int GetHashCode()
         {
-            return HashCode.Combine((IntPtr)_data);
+            return HashCode.Combine((nint)_data);
         }
 
         public static bool operator ==(Operation a, Operation b)
@@ -337,7 +337,7 @@ namespace ARMeilleure.IntermediateRepresentation
                 return result;
             }
 
-            public static Operation Operation(Intrinsic intrin, Operand dest, params Operand[] srcs)
+            public static Operation Operation(Intrinsic intrin, Operand dest, params ReadOnlySpan<Operand> srcs)
             {
                 Operation result = Make(Instruction.Extended, 0, srcs.Length);
 

src/ARMeilleure/Memory/IJitMemoryBlock.cs

@@ -4,7 +4,7 @@ namespace ARMeilleure.Memory
 {
     public interface IJitMemoryBlock : IDisposable
     {
-        IntPtr Pointer { get; }
+        nint Pointer { get; }
 
         void Commit(ulong offset, ulong size);
 

src/ARMeilleure/Memory/IMemoryManager.cs

@@ -6,7 +6,7 @@ namespace ARMeilleure.Memory
     {
         int AddressSpaceBits { get; }
 
-        IntPtr PageTablePointer { get; }
+        nint PageTablePointer { get; }
 
         MemoryManagerType Type { get; }
 

src/ARMeilleure/Memory/ReservedRegion.cs

@@ -8,7 +8,7 @@ namespace ARMeilleure.Memory
 
         public IJitMemoryBlock Block { get; }
 
-        public IntPtr Pointer => Block.Pointer;
+        public nint Pointer => Block.Pointer;
 
         private readonly ulong _maxSize;
         private readonly ulong _sizeGranularity;

src/ARMeilleure/Native/JitSupportDarwin.cs

@@ -8,6 +8,6 @@ namespace ARMeilleure.Native
     static partial class JitSupportDarwin
     {
         [LibraryImport("libarmeilleure-jitsupport", EntryPoint = "armeilleure_jit_memcpy")]
-        public static partial void Copy(IntPtr dst, IntPtr src, ulong n);
+        public static partial void Copy(nint dst, nint src, ulong n);
     }
 }

src/ARMeilleure/Signal/NativeSignalHandlerGenerator.cs

@@ -8,7 +8,7 @@ namespace ARMeilleure.Signal
 {
     public static class NativeSignalHandlerGenerator
     {
-        public const int MaxTrackedRanges = 8;
+        public const int MaxTrackedRanges = 16;
 
         private const int StructAddressOffset = 0;
         private const int StructWriteOffset = 4;
@@ -21,7 +21,7 @@ namespace ARMeilleure.Signal
 
         private const uint EXCEPTION_ACCESS_VIOLATION = 0xc0000005;
 
-        private static Operand EmitGenericRegionCheck(EmitterContext context, IntPtr signalStructPtr, Operand faultAddress, Operand isWrite, int rangeStructSize)
+        private static Operand EmitGenericRegionCheck(EmitterContext context, nint signalStructPtr, Operand faultAddress, Operand isWrite, int rangeStructSize)
         {
             Operand inRegionLocal = context.AllocateLocal(OperandType.I32);
             context.Copy(inRegionLocal, Const(0));
@@ -155,7 +155,7 @@ namespace ARMeilleure.Signal
             throw new PlatformNotSupportedException();
         }
 
-        public static byte[] GenerateUnixSignalHandler(IntPtr signalStructPtr, int rangeStructSize)
+        public static byte[] GenerateUnixSignalHandler(nint signalStructPtr, int rangeStructSize)
         {
             EmitterContext context = new();
 
@@ -203,7 +203,7 @@ namespace ARMeilleure.Signal
             return Compiler.Compile(cfg, argTypes, OperandType.None, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Code;
         }
 
-        public static byte[] GenerateWindowsSignalHandler(IntPtr signalStructPtr, int rangeStructSize)
+        public static byte[] GenerateWindowsSignalHandler(nint signalStructPtr, int rangeStructSize)
         {
             EmitterContext context = new();
 

src/ARMeilleure/Signal/TestMethods.cs

@@ -16,7 +16,7 @@ namespace ARMeilleure.Signal
     {
         public delegate bool DebugPartialUnmap();
         public delegate int DebugThreadLocalMapGetOrReserve(int threadId, int initialState);
-        public delegate void DebugNativeWriteLoop(IntPtr nativeWriteLoopPtr, IntPtr writePtr);
+        public delegate void DebugNativeWriteLoop(nint nativeWriteLoopPtr, nint writePtr);
 
         public static DebugPartialUnmap GenerateDebugPartialUnmap()
         {
@@ -35,7 +35,7 @@ namespace ARMeilleure.Signal
             return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugPartialUnmap>();
         }
 
-        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(IntPtr structPtr)
+        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(nint structPtr)
         {
             EmitterContext context = new();
 

src/ARMeilleure/Signal/WindowsPartialUnmapHandler.cs

@@ -13,18 +13,18 @@ namespace ARMeilleure.Signal
     internal static partial class WindowsPartialUnmapHandler
     {
         [LibraryImport("kernel32.dll", SetLastError = true, EntryPoint = "LoadLibraryA")]
-        private static partial IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName);
+        private static partial nint LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName);
 
         [LibraryImport("kernel32.dll", SetLastError = true)]
-        private static partial IntPtr GetProcAddress(IntPtr hModule, [MarshalAs(UnmanagedType.LPStr)] string procName);
+        private static partial nint GetProcAddress(nint hModule, [MarshalAs(UnmanagedType.LPStr)] string procName);
 
-        private static IntPtr _getCurrentThreadIdPtr;
+        private static nint _getCurrentThreadIdPtr;
 
-        public static IntPtr GetCurrentThreadIdFunc()
+        public static nint GetCurrentThreadIdFunc()
         {
-            if (_getCurrentThreadIdPtr == IntPtr.Zero)
+            if (_getCurrentThreadIdPtr == nint.Zero)
             {
-                IntPtr handle = LoadLibrary("kernel32.dll");
+                nint handle = LoadLibrary("kernel32.dll");
 
                 _getCurrentThreadIdPtr = GetProcAddress(handle, "GetCurrentThreadId");
             }
@@ -34,13 +34,13 @@ namespace ARMeilleure.Signal
 
         public static Operand EmitRetryFromAccessViolation(EmitterContext context)
         {
-            IntPtr partialRemapStatePtr = PartialUnmapState.GlobalState;
-            IntPtr localCountsPtr = IntPtr.Add(partialRemapStatePtr, PartialUnmapState.LocalCountsOffset);
+            nint partialRemapStatePtr = PartialUnmapState.GlobalState;
+            nint localCountsPtr = nint.Add(partialRemapStatePtr, PartialUnmapState.LocalCountsOffset);
 
             // Get the lock first.
-            EmitNativeReaderLockAcquire(context, IntPtr.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapLockOffset));
+            EmitNativeReaderLockAcquire(context, nint.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapLockOffset));
 
-            IntPtr getCurrentThreadId = GetCurrentThreadIdFunc();
+            nint getCurrentThreadId = GetCurrentThreadIdFunc();
             Operand threadId = context.Call(Const((ulong)getCurrentThreadId), OperandType.I32);
             Operand threadIndex = EmitThreadLocalMapIntGetOrReserve(context, localCountsPtr, threadId, Const(0));
 
@@ -58,7 +58,7 @@ namespace ARMeilleure.Signal
 
             Operand threadLocalPartialUnmapsPtr = EmitThreadLocalMapIntGetValuePtr(context, localCountsPtr, threadIndex);
             Operand threadLocalPartialUnmaps = context.Load(OperandType.I32, threadLocalPartialUnmapsPtr);
-            Operand partialUnmapsCount = context.Load(OperandType.I32, Const((ulong)IntPtr.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapsCountOffset)));
+            Operand partialUnmapsCount = context.Load(OperandType.I32, Const((ulong)nint.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapsCountOffset)));
 
             context.Copy(retry, context.ICompareNotEqual(threadLocalPartialUnmaps, partialUnmapsCount));
 
@@ -79,14 +79,14 @@ namespace ARMeilleure.Signal
             context.MarkLabel(endLabel);
 
             // Finally, release the lock and return the retry value.
-            EmitNativeReaderLockRelease(context, IntPtr.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapLockOffset));
+            EmitNativeReaderLockRelease(context, nint.Add(partialRemapStatePtr, PartialUnmapState.PartialUnmapLockOffset));
 
             return retry;
         }
 
-        public static Operand EmitThreadLocalMapIntGetOrReserve(EmitterContext context, IntPtr threadLocalMapPtr, Operand threadId, Operand initialState)
+        public static Operand EmitThreadLocalMapIntGetOrReserve(EmitterContext context, nint threadLocalMapPtr, Operand threadId, Operand initialState)
         {
-            Operand idsPtr = Const((ulong)IntPtr.Add(threadLocalMapPtr, ThreadLocalMap<int>.ThreadIdsOffset));
+            Operand idsPtr = Const((ulong)nint.Add(threadLocalMapPtr, ThreadLocalMap<int>.ThreadIdsOffset));
 
             Operand i = context.AllocateLocal(OperandType.I32);
 
@@ -130,7 +130,7 @@ namespace ARMeilleure.Signal
             // If it was 0, then we need to initialize the struct entry and return i.
             context.BranchIfFalse(idNot0Label, context.ICompareEqual(existingId2, Const(0)));
 
-            Operand structsPtr = Const((ulong)IntPtr.Add(threadLocalMapPtr, ThreadLocalMap<int>.StructsOffset));
+            Operand structsPtr = Const((ulong)nint.Add(threadLocalMapPtr, ThreadLocalMap<int>.StructsOffset));
             Operand structPtr = context.Add(structsPtr, context.SignExtend32(OperandType.I64, offset2));
             context.Store(structPtr, initialState);
 
@@ -149,10 +149,10 @@ namespace ARMeilleure.Signal
             return context.Copy(i);
         }
 
-        private static Operand EmitThreadLocalMapIntGetValuePtr(EmitterContext context, IntPtr threadLocalMapPtr, Operand index)
+        private static Operand EmitThreadLocalMapIntGetValuePtr(EmitterContext context, nint threadLocalMapPtr, Operand index)
         {
             Operand offset = context.Multiply(index, Const(sizeof(int)));
-            Operand structsPtr = Const((ulong)IntPtr.Add(threadLocalMapPtr, ThreadLocalMap<int>.StructsOffset));
+            Operand structsPtr = Const((ulong)nint.Add(threadLocalMapPtr, ThreadLocalMap<int>.StructsOffset));
 
             return context.Add(structsPtr, context.SignExtend32(OperandType.I64, offset));
         }
@@ -170,9 +170,9 @@ namespace ARMeilleure.Signal
             context.BranchIfFalse(loop, context.ICompareEqual(initial, replaced));
         }
 
-        private static void EmitNativeReaderLockAcquire(EmitterContext context, IntPtr nativeReaderLockPtr)
+        private static void EmitNativeReaderLockAcquire(EmitterContext context, nint nativeReaderLockPtr)
         {
-            Operand writeLockPtr = Const((ulong)IntPtr.Add(nativeReaderLockPtr, NativeReaderWriterLock.WriteLockOffset));
+            Operand writeLockPtr = Const((ulong)nint.Add(nativeReaderLockPtr, NativeReaderWriterLock.WriteLockOffset));
 
             // Spin until we can acquire the write lock.
             Operand spinLabel = Label();
@@ -182,16 +182,16 @@ namespace ARMeilleure.Signal
             context.BranchIfTrue(spinLabel, context.CompareAndSwap(writeLockPtr, Const(0), Const(1)));
 
             // Increment reader count.
-            EmitAtomicAddI32(context, Const((ulong)IntPtr.Add(nativeReaderLockPtr, NativeReaderWriterLock.ReaderCountOffset)), Const(1));
+            EmitAtomicAddI32(context, Const((ulong)nint.Add(nativeReaderLockPtr, NativeReaderWriterLock.ReaderCountOffset)), Const(1));
 
             // Release write lock.
             context.CompareAndSwap(writeLockPtr, Const(1), Const(0));
         }
 
-        private static void EmitNativeReaderLockRelease(EmitterContext context, IntPtr nativeReaderLockPtr)
+        private static void EmitNativeReaderLockRelease(EmitterContext context, nint nativeReaderLockPtr)
         {
             // Decrement reader count.
-            EmitAtomicAddI32(context, Const((ulong)IntPtr.Add(nativeReaderLockPtr, NativeReaderWriterLock.ReaderCountOffset)), Const(-1));
+            EmitAtomicAddI32(context, Const((ulong)nint.Add(nativeReaderLockPtr, NativeReaderWriterLock.ReaderCountOffset)), Const(-1));
         }
     }
 }

src/ARMeilleure/State/ExecutionContext.cs

@@ -9,7 +9,7 @@ namespace ARMeilleure.State
 
         private readonly NativeContext _nativeContext;
 
-        internal IntPtr NativeContextPtr => _nativeContext.BasePtr;
+        internal nint NativeContextPtr => _nativeContext.BasePtr;
 
         private bool _interrupted;
 

src/ARMeilleure/State/NativeContext.cs

@@ -21,13 +21,14 @@ namespace ARMeilleure.State
             public ulong ExclusiveValueLow;
             public ulong ExclusiveValueHigh;
             public int Running;
+            public long Tpidr2El0;
         }
 
         private static NativeCtxStorage _dummyStorage = new();
 
         private readonly IJitMemoryBlock _block;
 
-        public IntPtr BasePtr => _block.Pointer;
+        public nint BasePtr => _block.Pointer;
 
         public NativeContext(IJitMemoryAllocator allocator)
         {
@@ -176,6 +177,9 @@ namespace ARMeilleure.State
         public long GetTpidrroEl0() => GetStorage().TpidrroEl0;
         public void SetTpidrroEl0(long value) => GetStorage().TpidrroEl0 = value;
 
+        public long GetTpidr2El0() => GetStorage().Tpidr2El0;
+        public void SetTpidr2El0(long value) => GetStorage().Tpidr2El0 = value;
+
         public int GetCounter() => GetStorage().Counter;
         public void SetCounter(int value) => GetStorage().Counter = value;
 
@@ -232,6 +236,11 @@ namespace ARMeilleure.State
             return StorageOffset(ref _dummyStorage, ref _dummyStorage.TpidrroEl0);
         }
 
+        public static int GetTpidr2El0Offset()
+        {
+            return StorageOffset(ref _dummyStorage, ref _dummyStorage.Tpidr2El0);
+        }
+
         public static int GetCounterOffset()
         {
             return StorageOffset(ref _dummyStorage, ref _dummyStorage.Counter);

src/ARMeilleure/Translation/ArmEmitterContext.cs

@@ -46,7 +46,7 @@ namespace ARMeilleure.Translation
         public IMemoryManager Memory { get; }
 
         public EntryTable<uint> CountTable { get; }
-        public AddressTable<ulong> FunctionTable { get; }
+        public IAddressTable<ulong> FunctionTable { get; }
         public TranslatorStubs Stubs { get; }
 
         public ulong EntryAddress { get; }
@@ -62,7 +62,7 @@ namespace ARMeilleure.Translation
         public ArmEmitterContext(
             IMemoryManager memory,
             EntryTable<uint> countTable,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             TranslatorStubs stubs,
             ulong entryAddress,
             bool highCq,
@@ -92,7 +92,7 @@ namespace ARMeilleure.Translation
             else
             {
                 int index = Delegates.GetDelegateIndex(info);
-                IntPtr funcPtr = Delegates.GetDelegateFuncPtrByIndex(index);
+                nint funcPtr = Delegates.GetDelegateFuncPtrByIndex(index);
 
                 OperandType returnType = GetOperandType(info.ReturnType);
 

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using System.Threading;
 
 namespace ARMeilleure.Translation.Cache
 {
@@ -26,12 +27,12 @@ namespace ARMeilleure.Translation.Cache
 
         private static readonly List<CacheEntry> _cacheEntries = new();
 
-        private static readonly object _lock = new();
+        private static readonly Lock _lock = new();
         private static bool _initialized;
 
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static partial IntPtr FlushInstructionCache(IntPtr hProcess, IntPtr lpAddress, UIntPtr dwSize);
+        public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
 
         public static void Initialize(IJitMemoryAllocator allocator)
         {
@@ -65,7 +66,7 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        public static IntPtr Map(CompiledFunction func)
+        public static nint Map(CompiledFunction func)
         {
             byte[] code = func.Code;
 
@@ -75,7 +76,7 @@ namespace ARMeilleure.Translation.Cache
 
                 int funcOffset = Allocate(code.Length);
 
-                IntPtr funcPtr = _jitRegion.Pointer + funcOffset;
+                nint funcPtr = _jitRegion.Pointer + funcOffset;
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -83,7 +84,7 @@ namespace ARMeilleure.Translation.Cache
                     {
                         fixed (byte* codePtr = code)
                         {
-                            JitSupportDarwin.Copy(funcPtr, (IntPtr)codePtr, (ulong)code.Length);
+                            JitSupportDarwin.Copy(funcPtr, (nint)codePtr, (ulong)code.Length);
                         }
                     }
                 }
@@ -95,7 +96,7 @@ namespace ARMeilleure.Translation.Cache
 
                     if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                     {
-                        FlushInstructionCache(Process.GetCurrentProcess().Handle, funcPtr, (UIntPtr)code.Length);
+                        FlushInstructionCache(Process.GetCurrentProcess().Handle, funcPtr, (nuint)code.Length);
                     }
                     else
                     {
@@ -109,7 +110,7 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        public static void Unmap(IntPtr pointer)
+        public static void Unmap(nint pointer)
         {
             lock (_lock)
             {

src/ARMeilleure/Translation/Cache/JitCacheInvalidation.cs

@@ -68,7 +68,7 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        public void Invalidate(IntPtr basePointer, ulong size)
+        public void Invalidate(nint basePointer, ulong size)
         {
             if (_needsInvalidation)
             {

src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -40,7 +40,7 @@ namespace ARMeilleure.Translation.Cache
             PushMachframe = 10,
         }
 
-        private unsafe delegate RuntimeFunction* GetRuntimeFunctionCallback(ulong controlPc, IntPtr context);
+        private unsafe delegate RuntimeFunction* GetRuntimeFunctionCallback(ulong controlPc, nint context);
 
         [LibraryImport("kernel32.dll")]
         [return: MarshalAs(UnmanagedType.Bool)]
@@ -49,7 +49,7 @@ namespace ARMeilleure.Translation.Cache
             ulong baseAddress,
             uint length,
             GetRuntimeFunctionCallback callback,
-            IntPtr context,
+            nint context,
             [MarshalAs(UnmanagedType.LPWStr)] string outOfProcessCallbackDll);
 
         private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;
@@ -60,7 +60,7 @@ namespace ARMeilleure.Translation.Cache
 
         private unsafe static UnwindInfo* _unwindInfo;
 
-        public static void InstallFunctionTableHandler(IntPtr codeCachePointer, uint codeCacheLength, IntPtr workBufferPtr)
+        public static void InstallFunctionTableHandler(nint codeCachePointer, uint codeCacheLength, nint workBufferPtr)
         {
             ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
 
@@ -91,7 +91,7 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, IntPtr context)
+        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
         {
             int offset = (int)((long)controlPc - context.ToInt64());
 

src/ARMeilleure/Translation/DelegateInfo.cs

@@ -8,9 +8,9 @@ namespace ARMeilleure.Translation
         private readonly Delegate _dlg; // Ensure that this delegate will not be garbage collected.
 #pragma warning restore IDE0052
 
-        public IntPtr FuncPtr { get; }
+        public nint FuncPtr { get; }
 
-        public DelegateInfo(Delegate dlg, IntPtr funcPtr)
+        public DelegateInfo(Delegate dlg, nint funcPtr)
         {
             _dlg = dlg;
             FuncPtr = funcPtr;

src/ARMeilleure/Translation/Delegates.cs

@@ -9,7 +9,7 @@ namespace ARMeilleure.Translation
 {
     static class Delegates
     {
-        public static bool TryGetDelegateFuncPtrByIndex(int index, out IntPtr funcPtr)
+        public static bool TryGetDelegateFuncPtrByIndex(int index, out nint funcPtr)
         {
             if (index >= 0 && index < _delegates.Count)
             {
@@ -25,7 +25,7 @@ namespace ARMeilleure.Translation
             }
         }
 
-        public static IntPtr GetDelegateFuncPtrByIndex(int index)
+        public static nint GetDelegateFuncPtrByIndex(int index)
         {
             if (index < 0 || index >= _delegates.Count)
             {
@@ -35,7 +35,7 @@ namespace ARMeilleure.Translation
             return _delegates.Values[index].FuncPtr; // O(1).
         }
 
-        public static IntPtr GetDelegateFuncPtr(MethodInfo info)
+        public static nint GetDelegateFuncPtr(MethodInfo info)
         {
             ArgumentNullException.ThrowIfNull(info);
 
@@ -65,7 +65,7 @@ namespace ARMeilleure.Translation
             return index;
         }
 
-        private static void SetDelegateInfo(Delegate dlg, IntPtr funcPtr)
+        private static void SetDelegateInfo(Delegate dlg, nint funcPtr)
         {
             string key = GetKey(dlg.Method);
 

src/ARMeilleure/Translation/DispatcherFunction.cs

@@ -2,6 +2,6 @@ using System;
 
 namespace ARMeilleure.Translation
 {
-    delegate void DispatcherFunction(IntPtr nativeContext, ulong startAddress);
-    delegate ulong WrapperFunction(IntPtr nativeContext, ulong startAddress);
+    delegate void DispatcherFunction(nint nativeContext, ulong startAddress);
+    delegate ulong WrapperFunction(nint nativeContext, ulong startAddress);
 }

src/ARMeilleure/Translation/Dominance.cs

@@ -77,7 +77,7 @@ namespace ARMeilleure.Translation
                 {
                     continue;
                 }
-
+                
                 for (int pBlkIndex = 0; pBlkIndex < block.Predecessors.Count; pBlkIndex++)
                 {
                     BasicBlock current = block.Predecessors[pBlkIndex];

src/ARMeilleure/Translation/EmitterContext.cs

@@ -97,7 +97,7 @@ namespace ARMeilleure.Translation
 
         public virtual Operand Call(MethodInfo info, params Operand[] callArgs)
         {
-            IntPtr funcPtr = Delegates.GetDelegateFuncPtr(info);
+            nint funcPtr = Delegates.GetDelegateFuncPtr(info);
 
             OperandType returnType = GetOperandType(info.ReturnType);
 
@@ -559,27 +559,27 @@ namespace ARMeilleure.Translation
             return dest;
         }
 
-        public Operand AddIntrinsic(Intrinsic intrin, params Operand[] args)
+        public Operand AddIntrinsic(Intrinsic intrin, params ReadOnlySpan<Operand> args)
         {
             return Add(intrin, Local(OperandType.V128), args);
         }
 
-        public Operand AddIntrinsicInt(Intrinsic intrin, params Operand[] args)
+        public Operand AddIntrinsicInt(Intrinsic intrin, params ReadOnlySpan<Operand> args)
         {
             return Add(intrin, Local(OperandType.I32), args);
         }
 
-        public Operand AddIntrinsicLong(Intrinsic intrin, params Operand[] args)
+        public Operand AddIntrinsicLong(Intrinsic intrin, params ReadOnlySpan<Operand> args)
         {
             return Add(intrin, Local(OperandType.I64), args);
         }
 
-        public void AddIntrinsicNoRet(Intrinsic intrin, params Operand[] args)
+        public void AddIntrinsicNoRet(Intrinsic intrin, params ReadOnlySpan<Operand> args)
         {
             Add(intrin, default, args);
         }
 
-        private Operand Add(Intrinsic intrin, Operand dest, params Operand[] sources)
+        private Operand Add(Intrinsic intrin, Operand dest, params ReadOnlySpan<Operand> sources)
         {
             NewNextBlockIfNeeded();
 

src/ARMeilleure/Translation/GuestFunction.cs

@@ -2,5 +2,5 @@ using System;
 
 namespace ARMeilleure.Translation
 {
-    delegate ulong GuestFunction(IntPtr nativeContextPtr);
+    delegate ulong GuestFunction(nint nativeContextPtr);
 }

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Runtime;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -29,7 +30,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 6950; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
@@ -40,6 +41,7 @@ namespace ARMeilleure.Translation.PTC
         public static readonly Symbol PageTableSymbol = new(SymbolType.Special, 1);
         public static readonly Symbol CountTableSymbol = new(SymbolType.Special, 2);
         public static readonly Symbol DispatchStubSymbol = new(SymbolType.Special, 3);
+        public static readonly Symbol FunctionTableSymbol = new(SymbolType.Special, 4);
 
         private const byte FillingByte = 0x00;
         private const CompressionLevel SaveCompressionLevel = CompressionLevel.Fastest;
@@ -57,7 +59,7 @@ namespace ARMeilleure.Translation.PTC
 
         private readonly ManualResetEvent _waitEvent;
 
-        private readonly object _lock;
+        private readonly Lock _lock = new();
 
         private bool _disposed;
 
@@ -87,8 +89,6 @@ namespace ARMeilleure.Translation.PTC
 
             _waitEvent = new ManualResetEvent(true);
 
-            _lock = new object();
-
             _disposed = false;
 
             TitleIdText = TitleIdTextDefault;
@@ -100,7 +100,7 @@ namespace ARMeilleure.Translation.PTC
             Disable();
         }
 
-        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode)
+        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode, string cacheSelector)
         {
             Wait();
 
@@ -126,6 +126,8 @@ namespace ARMeilleure.Translation.PTC
             DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
             _memoryMode = memoryMode;
 
+            Logger.Info?.Print(LogClass.Ptc, $"PPTC (v{InternalVersion}) Profile: {DisplayVersion}-{cacheSelector}");
+
             string workPathActual = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", ActualDir);
             string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", BackupDir);
 
@@ -139,8 +141,8 @@ namespace ARMeilleure.Translation.PTC
                 Directory.CreateDirectory(workPathBackup);
             }
 
-            CachePathActual = Path.Combine(workPathActual, DisplayVersion);
-            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion);
+            CachePathActual = Path.Combine(workPathActual, DisplayVersion) + "-" + cacheSelector;
+            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion) + "-" + cacheSelector;
 
             PreLoad();
             Profiler.PreLoad();
@@ -268,11 +270,11 @@ namespace ARMeilleure.Translation.PTC
                     return false;
                 }
 
-                IntPtr intPtr = IntPtr.Zero;
+                nint intPtr = nint.Zero;
 
                 try
                 {
-                    intPtr = Marshal.AllocHGlobal(new IntPtr(outerHeader.UncompressedStreamSize));
+                    intPtr = Marshal.AllocHGlobal(new nint(outerHeader.UncompressedStreamSize));
 
                     using UnmanagedMemoryStream stream = new((byte*)intPtr.ToPointer(), outerHeader.UncompressedStreamSize, outerHeader.UncompressedStreamSize, FileAccess.ReadWrite);
                     try
@@ -373,7 +375,7 @@ namespace ARMeilleure.Translation.PTC
                 }
                 finally
                 {
-                    if (intPtr != IntPtr.Zero)
+                    if (intPtr != nint.Zero)
                     {
                         Marshal.FreeHGlobal(intPtr);
                     }
@@ -455,11 +457,11 @@ namespace ARMeilleure.Translation.PTC
 
             outerHeader.SetHeaderHash();
 
-            IntPtr intPtr = IntPtr.Zero;
+            nint intPtr = nint.Zero;
 
             try
             {
-                intPtr = Marshal.AllocHGlobal(new IntPtr(outerHeader.UncompressedStreamSize));
+                intPtr = Marshal.AllocHGlobal(new nint(outerHeader.UncompressedStreamSize));
 
                 using UnmanagedMemoryStream stream = new((byte*)intPtr.ToPointer(), outerHeader.UncompressedStreamSize, outerHeader.UncompressedStreamSize, FileAccess.ReadWrite);
                 stream.Seek((long)Unsafe.SizeOf<InnerHeader>(), SeekOrigin.Begin);
@@ -513,7 +515,7 @@ namespace ARMeilleure.Translation.PTC
             }
             finally
             {
-                if (intPtr != IntPtr.Zero)
+                if (intPtr != nint.Zero)
                 {
                     Marshal.FreeHGlobal(intPtr);
                 }
@@ -664,7 +666,7 @@ namespace ARMeilleure.Translation.PTC
 
             foreach (RelocEntry relocEntry in relocEntries)
             {
-                IntPtr? imm = null;
+                nint? imm = null;
                 Symbol symbol = relocEntry.Symbol;
 
                 if (symbol.Type == SymbolType.FunctionTable)
@@ -675,7 +677,7 @@ namespace ARMeilleure.Translation.PTC
                     {
                         unsafe
                         {
-                            imm = (IntPtr)Unsafe.AsPointer(ref translator.FunctionTable.GetValue(guestAddress));
+                            imm = (nint)Unsafe.AsPointer(ref translator.FunctionTable.GetValue(guestAddress));
                         }
                     }
                 }
@@ -683,7 +685,7 @@ namespace ARMeilleure.Translation.PTC
                 {
                     int index = (int)symbol.Value;
 
-                    if (Delegates.TryGetDelegateFuncPtrByIndex(index, out IntPtr funcPtr))
+                    if (Delegates.TryGetDelegateFuncPtrByIndex(index, out nint funcPtr))
                     {
                         imm = funcPtr;
                     }
@@ -698,13 +700,17 @@ namespace ARMeilleure.Translation.PTC
 
                     unsafe
                     {
-                        imm = (IntPtr)Unsafe.AsPointer(ref callCounter.Value);
+                        imm = (nint)Unsafe.AsPointer(ref callCounter.Value);
                     }
                 }
                 else if (symbol == DispatchStubSymbol)
                 {
                     imm = translator.Stubs.DispatchStub;
                 }
+                else if (symbol == FunctionTableSymbol)
+                {
+                    imm = translator.FunctionTable.Base;
+                }
 
                 if (imm == null)
                 {
@@ -744,7 +750,7 @@ namespace ARMeilleure.Translation.PTC
             bool highCq)
         {
             var cFunc = new CompiledFunction(code, unwindInfo, RelocInfo.Empty);
-            var gFunc = cFunc.MapWithPointer<GuestFunction>(out IntPtr gFuncPointer);
+            var gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
 
             return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
         }
@@ -848,17 +854,15 @@ namespace ARMeilleure.Translation.PTC
                 }
             }
 
-            List<Thread> threads = new();
 
-            for (int i = 0; i < degreeOfParallelism; i++)
-            {
-                Thread thread = new(TranslateFuncs)
-                {
-                    IsBackground = true,
-                };
-
-                threads.Add(thread);
-            }
+            List<Thread> threads = Enumerable.Range(0, degreeOfParallelism)
+                .Select(idx => 
+                    new Thread(TranslateFuncs)
+                    {
+                        IsBackground = true, 
+                        Name = "Ptc.TranslateThread." + idx 
+                    }
+                ).ToList();
 
             Stopwatch sw = Stopwatch.StartNew();
 
@@ -885,6 +889,7 @@ namespace ARMeilleure.Translation.PTC
             Thread preSaveThread = new(PreSave)
             {
                 IsBackground = true,
+                Name = "Ptc.DiskWriter"
             };
             preSaveThread.Start();
         }

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -41,7 +41,7 @@ namespace ARMeilleure.Translation.PTC
 
         private readonly ManualResetEvent _waitEvent;
 
-        private readonly object _lock;
+        private readonly Lock _lock = new();
 
         private bool _disposed;
 
@@ -65,8 +65,6 @@ namespace ARMeilleure.Translation.PTC
 
             _waitEvent = new ManualResetEvent(true);
 
-            _lock = new object();
-
             _disposed = false;
 
             ProfiledFuncs = new Dictionary<ulong, FuncProfile>();

src/ARMeilleure/Translation/TranslatedFunction.cs

@@ -7,12 +7,12 @@ namespace ARMeilleure.Translation
     {
         private readonly GuestFunction _func; // Ensure that this delegate will not be garbage collected.
 
-        public IntPtr FuncPointer { get; }
+        public nint FuncPointer { get; }
         public Counter<uint> CallCounter { get; }
         public ulong GuestSize { get; }
         public bool HighCq { get; }
 
-        public TranslatedFunction(GuestFunction func, IntPtr funcPointer, Counter<uint> callCounter, ulong guestSize, bool highCq)
+        public TranslatedFunction(GuestFunction func, nint funcPointer, Counter<uint> callCounter, ulong guestSize, bool highCq)
         {
             _func = func;
             FuncPointer = funcPointer;

src/ARMeilleure/Translation/Translator.cs

@@ -22,33 +22,13 @@ namespace ARMeilleure.Translation
 {
     public class Translator
     {
-        private static readonly AddressTable<ulong>.Level[] _levels64Bit =
-            new AddressTable<ulong>.Level[]
-            {
-                new(31, 17),
-                new(23,  8),
-                new(15,  8),
-                new( 7,  8),
-                new( 2,  5),
-            };
-
-        private static readonly AddressTable<ulong>.Level[] _levels32Bit =
-            new AddressTable<ulong>.Level[]
-            {
-                new(31, 17),
-                new(23,  8),
-                new(15,  8),
-                new( 7,  8),
-                new( 1,  6),
-            };
-
         private readonly IJitMemoryAllocator _allocator;
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
 
         private readonly Ptc _ptc;
 
         internal TranslatorCache<TranslatedFunction> Functions { get; }
-        internal AddressTable<ulong> FunctionTable { get; }
+        internal IAddressTable<ulong> FunctionTable { get; }
         internal EntryTable<uint> CountTable { get; }
         internal TranslatorStubs Stubs { get; }
         internal TranslatorQueue Queue { get; }
@@ -57,7 +37,7 @@ namespace ARMeilleure.Translation
         private Thread[] _backgroundTranslationThreads;
         private volatile int _threadCount;
 
-        public Translator(IJitMemoryAllocator allocator, IMemoryManager memory, bool for64Bits)
+        public Translator(IJitMemoryAllocator allocator, IMemoryManager memory, IAddressTable<ulong> functionTable)
         {
             _allocator = allocator;
             Memory = memory;
@@ -72,15 +52,15 @@ namespace ARMeilleure.Translation
 
             CountTable = new EntryTable<uint>();
             Functions = new TranslatorCache<TranslatedFunction>();
-            FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
+            FunctionTable = functionTable;
             Stubs = new TranslatorStubs(FunctionTable);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
         }
 
-        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
+        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
         {
-            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type);
+            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type, cacheSelector);
             return _ptc;
         }
 
@@ -298,7 +278,7 @@ namespace ARMeilleure.Translation
                 _ptc.WriteCompiledFunction(address, funcSize, hash, highCq, compiledFunc);
             }
 
-            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(out IntPtr funcPointer);
+            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(out nint funcPointer);
 
             Allocators.ResetAll();
 

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -15,12 +15,12 @@ namespace ARMeilleure.Translation
     /// </summary>
     class TranslatorStubs : IDisposable
     {
-        private readonly Lazy<IntPtr> _slowDispatchStub;
+        private readonly Lazy<nint> _slowDispatchStub;
 
         private bool _disposed;
 
-        private readonly AddressTable<ulong> _functionTable;
-        private readonly Lazy<IntPtr> _dispatchStub;
+        private readonly IAddressTable<ulong> _functionTable;
+        private readonly Lazy<nint> _dispatchStub;
         private readonly Lazy<DispatcherFunction> _dispatchLoop;
         private readonly Lazy<WrapperFunction> _contextWrapper;
 
@@ -28,7 +28,7 @@ namespace ARMeilleure.Translation
         /// Gets the dispatch stub.
         /// </summary>
         /// <exception cref="ObjectDisposedException"><see cref="TranslatorStubs"/> instance was disposed</exception>
-        public IntPtr DispatchStub
+        public nint DispatchStub
         {
             get
             {
@@ -42,7 +42,7 @@ namespace ARMeilleure.Translation
         /// Gets the slow dispatch stub.
         /// </summary>
         /// <exception cref="ObjectDisposedException"><see cref="TranslatorStubs"/> instance was disposed</exception>
-        public IntPtr SlowDispatchStub
+        public nint SlowDispatchStub
         {
             get
             {
@@ -86,7 +86,7 @@ namespace ARMeilleure.Translation
         /// </summary>
         /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
         /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(AddressTable<ulong> functionTable)
+        public TranslatorStubs(IAddressTable<ulong> functionTable)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
 
@@ -140,7 +140,7 @@ namespace ARMeilleure.Translation
         /// Generates a <see cref="DispatchStub"/>.
         /// </summary>
         /// <returns>Generated <see cref="DispatchStub"/></returns>
-        private IntPtr GenerateDispatchStub()
+        private nint GenerateDispatchStub()
         {
             var context = new EmitterContext();
 
@@ -198,7 +198,7 @@ namespace ARMeilleure.Translation
         /// Generates a <see cref="SlowDispatchStub"/>.
         /// </summary>
         /// <returns>Generated <see cref="SlowDispatchStub"/></returns>
-        private IntPtr GenerateSlowDispatchStub()
+        private nint GenerateSlowDispatchStub()
         {
             var context = new EmitterContext();
 

src/ARMeilleure/Translation/TranslatorTestMethods.cs

@@ -9,7 +9,7 @@ namespace ARMeilleure.Translation
 {
     public static class TranslatorTestMethods
     {
-        public delegate int FpFlagsPInvokeTest(IntPtr managedMethod);
+        public delegate int FpFlagsPInvokeTest(nint managedMethod);
 
         private static bool SetPlatformFtz(EmitterContext context, bool ftz)
         {

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
 
         public OpenALHardwareDeviceDriver()
         {
-            _device = ALC.OpenDevice("");
+            _device = ALC.OpenDevice(string.Empty);
             _context = ALC.CreateContext(_device, new ALContextAttributes());
             _updateRequiredEvent = new ManualResetEvent(false);
             _pauseEvent = new ManualResetEvent(true);

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs

@@ -5,6 +5,7 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Threading;
 
 namespace Ryujinx.Audio.Backends.OpenAL
 {
@@ -18,7 +19,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
         private ulong _playedSampleCount;
         private float _volume;
 
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         public OpenALHardwareDeviceSession(OpenALHardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
         {

src/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio.Backends.SDL2/Ryujinx.Audio.Backends.SDL2.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Audio.Backends.SDL2
         // NOTE: We use a DllImport here because of marshaling issue for spec.
 #pragma warning disable SYSLIB1054
         [DllImport("SDL2")]
-        private static extern int SDL_GetDefaultAudioInfo(IntPtr name, out SDL_AudioSpec spec, int isCapture);
+        private static extern int SDL_GetDefaultAudioInfo(nint name, out SDL_AudioSpec spec, int isCapture);
 #pragma warning restore SYSLIB1054
 
         public SDL2HardwareDeviceDriver()
@@ -37,7 +37,7 @@ namespace Ryujinx.Audio.Backends.SDL2
 
             SDL2Driver.Instance.Initialize();
 
-            int res = SDL_GetDefaultAudioInfo(IntPtr.Zero, out var spec, 0);
+            int res = SDL_GetDefaultAudioInfo(nint.Zero, out var spec, 0);
 
             if (res != 0)
             {
@@ -136,7 +136,7 @@ namespace Ryujinx.Audio.Backends.SDL2
 
             desired.callback = callback;
 
-            uint device = SDL_OpenAudioDevice(IntPtr.Zero, 0, ref desired, out SDL_AudioSpec got, 0);
+            uint device = SDL_OpenAudioDevice(nint.Zero, 0, ref desired, out SDL_AudioSpec got, 0);
 
             if (device == 0)
             {

src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceSession.cs

@@ -72,7 +72,7 @@ namespace Ryujinx.Audio.Backends.SDL2
             }
         }
 
-        private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength)
+        private unsafe void Update(nint userdata, nint stream, int streamLength)
         {
             Span<byte> streamSpan = new((void*)stream, streamLength);
 
@@ -97,7 +97,7 @@ namespace Ryujinx.Audio.Backends.SDL2
 
             fixed (byte* p = samples)
             {
-                IntPtr pStreamSrc = (IntPtr)p;
+                nint pStreamSrc = (nint)p;
 
                 // Zero the dest buffer
                 streamSpan.Clear();

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIo.cs

@@ -10,41 +10,41 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
         private const string LibraryName = "libsoundio";
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void OnDeviceChangeNativeDelegate(IntPtr ctx);
+        public delegate void OnDeviceChangeNativeDelegate(nint ctx);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void OnBackendDisconnectedDelegate(IntPtr ctx, SoundIoError err);
+        public delegate void OnBackendDisconnectedDelegate(nint ctx, SoundIoError err);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void OnEventsSignalDelegate(IntPtr ctx);
+        public delegate void OnEventsSignalDelegate(nint ctx);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate void EmitRtPrioWarningDelegate();
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void JackCallbackDelegate(IntPtr msg);
+        public delegate void JackCallbackDelegate(nint msg);
 
         [StructLayout(LayoutKind.Sequential)]
         public struct SoundIoStruct
         {
-            public IntPtr UserData;
-            public IntPtr OnDeviceChange;
-            public IntPtr OnBackendDisconnected;
-            public IntPtr OnEventsSignal;
+            public nint UserData;
+            public nint OnDeviceChange;
+            public nint OnBackendDisconnected;
+            public nint OnEventsSignal;
             public SoundIoBackend CurrentBackend;
-            public IntPtr ApplicationName;
-            public IntPtr EmitRtPrioWarning;
-            public IntPtr JackInfoCallback;
-            public IntPtr JackErrorCallback;
+            public nint ApplicationName;
+            public nint EmitRtPrioWarning;
+            public nint JackInfoCallback;
+            public nint JackErrorCallback;
         }
 
         public struct SoundIoChannelLayout
         {
-            public IntPtr Name;
+            public nint Name;
             public int ChannelCount;
             public Array24<SoundIoChannelId> Channels;
 
-            public static IntPtr GetDefault(int channelCount)
+            public static nint GetDefault(int channelCount)
             {
                 return soundio_channel_layout_get_default(channelCount);
             }
@@ -63,17 +63,17 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public struct SoundIoDevice
         {
-            public IntPtr SoundIo;
-            public IntPtr Id;
-            public IntPtr Name;
+            public nint SoundIo;
+            public nint Id;
+            public nint Name;
             public SoundIoDeviceAim Aim;
-            public IntPtr Layouts;
+            public nint Layouts;
             public int LayoutCount;
             public SoundIoChannelLayout CurrentLayout;
-            public IntPtr Formats;
+            public nint Formats;
             public int FormatCount;
             public SoundIoFormat CurrentFormat;
-            public IntPtr SampleRates;
+            public nint SampleRates;
             public int SampleRateCount;
             public int SampleRateCurrent;
             public double SoftwareLatencyMin;
@@ -86,17 +86,17 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public struct SoundIoOutStream
         {
-            public IntPtr Device;
+            public nint Device;
             public SoundIoFormat Format;
             public int SampleRate;
             public SoundIoChannelLayout Layout;
             public double SoftwareLatency;
             public float Volume;
-            public IntPtr UserData;
-            public IntPtr WriteCallback;
-            public IntPtr UnderflowCallback;
-            public IntPtr ErrorCallback;
-            public IntPtr Name;
+            public nint UserData;
+            public nint WriteCallback;
+            public nint UnderflowCallback;
+            public nint ErrorCallback;
+            public nint Name;
             public bool NonTerminalHint;
             public int BytesPerFrame;
             public int BytesPerSample;
@@ -105,74 +105,74 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public struct SoundIoChannelArea
         {
-            public IntPtr Pointer;
+            public nint Pointer;
             public int Step;
         }
 
         [LibraryImport(LibraryName)]
-        internal static partial IntPtr soundio_create();
+        internal static partial nint soundio_create();
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_connect(IntPtr ctx);
+        internal static partial SoundIoError soundio_connect(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial void soundio_disconnect(IntPtr ctx);
+        internal static partial void soundio_disconnect(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial void soundio_flush_events(IntPtr ctx);
+        internal static partial void soundio_flush_events(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial int soundio_output_device_count(IntPtr ctx);
+        internal static partial int soundio_output_device_count(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial int soundio_default_output_device_index(IntPtr ctx);
+        internal static partial int soundio_default_output_device_index(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial IntPtr soundio_get_output_device(IntPtr ctx, int index);
+        internal static partial nint soundio_get_output_device(nint ctx, int index);
 
         [LibraryImport(LibraryName)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool soundio_device_supports_format(IntPtr devCtx, SoundIoFormat format);
+        internal static partial bool soundio_device_supports_format(nint devCtx, SoundIoFormat format);
 
         [LibraryImport(LibraryName)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool soundio_device_supports_layout(IntPtr devCtx, IntPtr layout);
+        internal static partial bool soundio_device_supports_layout(nint devCtx, nint layout);
 
         [LibraryImport(LibraryName)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool soundio_device_supports_sample_rate(IntPtr devCtx, int sampleRate);
+        internal static partial bool soundio_device_supports_sample_rate(nint devCtx, int sampleRate);
 
         [LibraryImport(LibraryName)]
-        internal static partial IntPtr soundio_outstream_create(IntPtr devCtx);
+        internal static partial nint soundio_outstream_create(nint devCtx);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_open(IntPtr outStreamCtx);
+        internal static partial SoundIoError soundio_outstream_open(nint outStreamCtx);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_start(IntPtr outStreamCtx);
+        internal static partial SoundIoError soundio_outstream_start(nint outStreamCtx);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_begin_write(IntPtr outStreamCtx, IntPtr areas, IntPtr frameCount);
+        internal static partial SoundIoError soundio_outstream_begin_write(nint outStreamCtx, nint areas, nint frameCount);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_end_write(IntPtr outStreamCtx);
+        internal static partial SoundIoError soundio_outstream_end_write(nint outStreamCtx);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_pause(IntPtr devCtx, [MarshalAs(UnmanagedType.Bool)] bool pause);
+        internal static partial SoundIoError soundio_outstream_pause(nint devCtx, [MarshalAs(UnmanagedType.Bool)] bool pause);
 
         [LibraryImport(LibraryName)]
-        internal static partial SoundIoError soundio_outstream_set_volume(IntPtr devCtx, double volume);
+        internal static partial SoundIoError soundio_outstream_set_volume(nint devCtx, double volume);
 
         [LibraryImport(LibraryName)]
-        internal static partial void soundio_outstream_destroy(IntPtr streamCtx);
+        internal static partial void soundio_outstream_destroy(nint streamCtx);
 
         [LibraryImport(LibraryName)]
-        internal static partial void soundio_destroy(IntPtr ctx);
+        internal static partial void soundio_destroy(nint ctx);
 
         [LibraryImport(LibraryName)]
-        internal static partial IntPtr soundio_channel_layout_get_default(int channelCount);
+        internal static partial nint soundio_channel_layout_get_default(int channelCount);
 
         [LibraryImport(LibraryName)]
-        internal static partial IntPtr soundio_strerror(SoundIoError err);
+        internal static partial nint soundio_strerror(SoundIoError err);
     }
 }

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoContext.cs

@@ -8,13 +8,13 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 {
     public class SoundIoContext : IDisposable
     {
-        private IntPtr _context;
+        private nint _context;
         private Action<SoundIoError> _onBackendDisconnect;
         private OnBackendDisconnectedDelegate _onBackendDisconnectNative;
 
-        public IntPtr Context => _context;
+        public nint Context => _context;
 
-        internal SoundIoContext(IntPtr context)
+        internal SoundIoContext(nint context)
         {
             _context = context;
             _onBackendDisconnect = null;
@@ -60,9 +60,9 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public SoundIoDeviceContext GetOutputDevice(int index)
         {
-            IntPtr deviceContext = soundio_get_output_device(_context, index);
+            nint deviceContext = soundio_get_output_device(_context, index);
 
-            if (deviceContext == IntPtr.Zero)
+            if (deviceContext == nint.Zero)
             {
                 return null;
             }
@@ -72,9 +72,9 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public static SoundIoContext Create()
         {
-            IntPtr context = soundio_create();
+            nint context = soundio_create();
 
-            if (context == IntPtr.Zero)
+            if (context == nint.Zero)
             {
                 return null;
             }
@@ -84,9 +84,9 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         protected virtual void Dispose(bool disposing)
         {
-            IntPtr currentContext = Interlocked.Exchange(ref _context, IntPtr.Zero);
+            nint currentContext = Interlocked.Exchange(ref _context, nint.Zero);
 
-            if (currentContext != IntPtr.Zero)
+            if (currentContext != nint.Zero)
             {
                 soundio_destroy(currentContext);
             }

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoDeviceContext.cs

@@ -7,11 +7,11 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 {
     public class SoundIoDeviceContext
     {
-        private readonly IntPtr _context;
+        private readonly nint _context;
 
-        public IntPtr Context => _context;
+        public nint Context => _context;
 
-        internal SoundIoDeviceContext(IntPtr context)
+        internal SoundIoDeviceContext(nint context)
         {
             _context = context;
         }
@@ -36,9 +36,9 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public SoundIoOutStreamContext CreateOutStream()
         {
-            IntPtr context = soundio_outstream_create(_context);
+            nint context = soundio_outstream_create(_context);
 
-            if (context == IntPtr.Zero)
+            if (context == nint.Zero)
             {
                 return null;
             }

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs

@@ -8,19 +8,19 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
     public class SoundIoOutStreamContext : IDisposable
     {
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private unsafe delegate void WriteCallbackDelegate(IntPtr ctx, int frameCountMin, int frameCountMax);
+        private unsafe delegate void WriteCallbackDelegate(nint ctx, int frameCountMin, int frameCountMax);
 
-        private IntPtr _context;
-        private IntPtr _nameStored;
+        private nint _context;
+        private nint _nameStored;
         private Action<int, int> _writeCallback;
         private WriteCallbackDelegate _writeCallbackNative;
 
-        public IntPtr Context => _context;
+        public nint Context => _context;
 
-        internal SoundIoOutStreamContext(IntPtr context)
+        internal SoundIoOutStreamContext(nint context)
         {
             _context = context;
-            _nameStored = IntPtr.Zero;
+            _nameStored = nint.Zero;
             _writeCallback = null;
             _writeCallbackNative = null;
         }
@@ -40,7 +40,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
             {
                 var context = GetOutContext();
 
-                if (_nameStored != IntPtr.Zero && context.Name == _nameStored)
+                if (_nameStored != nint.Zero && context.Name == _nameStored)
                 {
                     Marshal.FreeHGlobal(_nameStored);
                 }
@@ -124,14 +124,14 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         public Span<SoundIoChannelArea> BeginWrite(ref int frameCount)
         {
-            IntPtr arenas = default;
+            nint arenas = default;
             int nativeFrameCount = frameCount;
 
             unsafe
             {
                 var frameCountPtr = &nativeFrameCount;
                 var arenasPtr = &arenas;
-                CheckError(soundio_outstream_begin_write(_context, (IntPtr)arenasPtr, (IntPtr)frameCountPtr));
+                CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));
 
                 frameCount = *frameCountPtr;
 
@@ -143,10 +143,10 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
         protected virtual void Dispose(bool disposing)
         {
-            if (_context != IntPtr.Zero)
+            if (_context != nint.Zero)
             {
                 soundio_outstream_destroy(_context);
-                _context = IntPtr.Zero;
+                _context = nint.Zero;
             }
         }
 

src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio/AudioManager.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.Audio
         /// <summary>
         /// Lock used to control the waiters registration.
         /// </summary>
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         /// <summary>
         /// Events signaled when the driver played audio buffers.

src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs

@@ -2,6 +2,7 @@ using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using System;
 using System.Buffers;
+using System.Threading;
 
 namespace Ryujinx.Audio.Backends.Common
 {
@@ -12,7 +13,7 @@ namespace Ryujinx.Audio.Backends.Common
     {
         private const int RingBufferAlignment = 2048;
 
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         private MemoryOwner<byte> _bufferOwner;
         private Memory<byte> _buffer;

src/Ryujinx.Audio/Input/AudioInputManager.cs

@@ -14,12 +14,12 @@ namespace Ryujinx.Audio.Input
     /// </summary>
     public class AudioInputManager : IDisposable
     {
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         /// <summary>
         /// Lock used for session allocation.
         /// </summary>
-        private readonly object _sessionLock = new();
+        private readonly Lock _sessionLock = new();
 
         /// <summary>
         /// The session ids allocation table.

src/Ryujinx.Audio/Input/AudioInputSystem.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Audio.Input
         /// <summary>
         /// The lock of the parent.
         /// </summary>
-        private readonly object _parentLock;
+        private readonly Lock _parentLock;
 
         /// <summary>
         /// The dispose state.
@@ -62,7 +62,7 @@ namespace Ryujinx.Audio.Input
         /// <param name="parentLock">The lock of the manager</param>
         /// <param name="deviceSession">The hardware device session</param>
         /// <param name="bufferEvent">The buffer release event of the audio input</param>
-        public AudioInputSystem(AudioInputManager manager, object parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
+        public AudioInputSystem(AudioInputManager manager, Lock parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
         {
             _manager = manager;
             _parentLock = parentLock;

src/Ryujinx.Audio/Output/AudioOutputManager.cs

@@ -14,12 +14,12 @@ namespace Ryujinx.Audio.Output
     /// </summary>
     public class AudioOutputManager : IDisposable
     {
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         /// <summary>
         /// Lock used for session allocation.
         /// </summary>
-        private readonly object _sessionLock = new();
+        private readonly Lock _sessionLock = new();
 
         /// <summary>
         /// The session ids allocation table.

src/Ryujinx.Audio/Output/AudioOutputSystem.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Audio.Output
         /// <summary>
         /// THe lock of the parent.
         /// </summary>
-        private readonly object _parentLock;
+        private readonly Lock _parentLock;
 
         /// <summary>
         /// The dispose state.
@@ -62,7 +62,7 @@ namespace Ryujinx.Audio.Output
         /// <param name="parentLock">The lock of the manager</param>
         /// <param name="deviceSession">The hardware device session</param>
         /// <param name="bufferEvent">The buffer release event of the audio output</param>
-        public AudioOutputSystem(AudioOutputManager manager, object parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
+        public AudioOutputSystem(AudioOutputManager manager, Lock parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
         {
             _manager = manager;
             _parentLock = parentLock;

src/Ryujinx.Audio/Renderer/Dsp/AdpcmHelper.cs

@@ -81,7 +81,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static short GetCoefficientAtIndex(ReadOnlySpan<short> coefficients, int index)
         {
-            if ((uint)index > (uint)coefficients.Length)
+            if ((uint)index >= (uint)coefficients.Length)
             {
                 Logger.Error?.Print(LogClass.AudioRenderer, $"Out of bound read for coefficient at index {index}");
 

src/Ryujinx.Audio/Renderer/Dsp/Command/CommandList.cs

@@ -64,11 +64,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public unsafe IntPtr GetBufferPointer(int index)
+        public unsafe nint GetBufferPointer(int index)
         {
             if (index >= 0 && index < _buffersEntryCount)
             {
-                return (IntPtr)((float*)_buffersMemoryHandle.Pointer + index * _sampleCount);
+                return (nint)((float*)_buffersMemoryHandle.Pointer + index * _sampleCount);
             }
 
             throw new ArgumentOutOfRangeException(nameof(index), index, null);

src/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs

@@ -82,8 +82,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                     statistics.Reset(_parameter.ChannelCount);
                 }
 
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[_parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[_parameter.ChannelCount];
                 Span<float> channelInput = stackalloc float[_parameter.ChannelCount];
                 ExponentialMovingAverage inputMovingAverage = state.InputMovingAverage;
                 float unknown4 = state.Unknown4;

src/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs

@@ -77,7 +77,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelayStereo(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private unsafe void ProcessDelayStereo(ref DelayState state, Span<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             const ushort ChannelCount = 2;
 
@@ -114,7 +114,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelayQuadraphonic(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private unsafe void ProcessDelayQuadraphonic(ref DelayState state, Span<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             const ushort ChannelCount = 4;
 
@@ -160,7 +160,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelaySurround(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private unsafe void ProcessDelaySurround(ref DelayState state, Span<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             const ushort ChannelCount = 6;
 
@@ -219,8 +219,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled && Parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[Parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[Parameter.ChannelCount];
 
                 for (int i = 0; i < Parameter.ChannelCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs

@@ -70,8 +70,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled && _parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[_parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[_parameter.ChannelCount];
 
                 for (int i = 0; i < _parameter.ChannelCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs

@@ -88,8 +88,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                     statistics.Reset();
                 }
 
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[_parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[_parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[_parameter.ChannelCount];
 
                 for (int i = 0; i < _parameter.ChannelCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs

@@ -71,30 +71,30 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverb3dMono(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverb3dMono(ref Reverb3dState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableMono, _targetEarlyDelayLineIndicesTableMono, _targetOutputFeedbackIndicesTableMono);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverb3dStereo(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverb3dStereo(ref Reverb3dState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableStereo, _targetEarlyDelayLineIndicesTableStereo, _targetOutputFeedbackIndicesTableStereo);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverb3dQuadraphonic(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverb3dQuadraphonic(ref Reverb3dState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableQuadraphonic, _targetEarlyDelayLineIndicesTableQuadraphonic, _targetOutputFeedbackIndicesTableQuadraphonic);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverb3dSurround(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverb3dSurround(ref Reverb3dState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableSurround, _targetEarlyDelayLineIndicesTableSurround, _targetOutputFeedbackIndicesTableSurround);
         }
 
-        private unsafe void ProcessReverb3dGeneric(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable)
+        private unsafe void ProcessReverb3dGeneric(ref Reverb3dState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable)
         {
             const int DelayLineSampleIndexOffset = 1;
 
@@ -193,8 +193,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled && Parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[Parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[Parameter.ChannelCount];
 
                 for (int i = 0; i < Parameter.ChannelCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs

@@ -77,7 +77,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbMono(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverbMono(ref ReverbState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverbGeneric(
                 ref state,
@@ -91,7 +91,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbStereo(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverbStereo(ref ReverbState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverbGeneric(
                 ref state,
@@ -105,7 +105,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbQuadraphonic(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverbQuadraphonic(ref ReverbState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverbGeneric(
                 ref state,
@@ -119,7 +119,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbSurround(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
+        private void ProcessReverbSurround(ref ReverbState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount)
         {
             ProcessReverbGeneric(
                 ref state,
@@ -132,7 +132,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                 _outputIndicesTableSurround);
         }
 
-        private unsafe void ProcessReverbGeneric(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable, ReadOnlySpan<int> outputIndicesTable)
+        private unsafe void ProcessReverbGeneric(ref ReverbState state, ReadOnlySpan<nint> outputBuffers, ReadOnlySpan<nint> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable, ReadOnlySpan<int> outputIndicesTable)
         {
             bool isSurround = Parameter.ChannelCount == 6;
 
@@ -223,8 +223,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
             if (IsEffectEnabled && Parameter.IsChannelCountValid())
             {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
+                Span<nint> inputBuffers = stackalloc nint[Parameter.ChannelCount];
+                Span<nint> outputBuffers = stackalloc nint[Parameter.ChannelCount];
 
                 for (int i = 0; i < Parameter.ChannelCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Audio.Renderer.Server
 {
     public class AudioRenderSystem : IDisposable
     {
-        private readonly object _lock = new();
+        private readonly Lock _lock = new();
 
         private AudioRendererRenderingDevice _renderingDevice;
         private AudioRendererExecutionMode _executionMode;