GPU: Avoid using garbage size for non-cb0 storage buffers (#4999)

* GPU: Avoid using garbage size for non-cb0 storage buffers

In the depths area, Tears of the Kingdom uses a global memory access with address on constant buffer slot 6. This isn't standard and thus doesn't actually have a size 8 bytes after it, so we were reading back a garbage size that ended up very large (at least in version 1.1.0), and would synchronize a lot of data per frame.

This PR makes storage buffers created from addresses outside constant buffer slot 0 get their size as the number of bytes remaining in the GPU mapping starting at the given virtual address. This should bound the buffer to a reasonable size, and ideally stop it crossing into other memory.

* Limit max size

* Add TODO

* Feedback

.editorconfig

@@ -63,6 +63,10 @@ dotnet_code_quality_unused_parameters = all:suggestion
 
 #### C# Coding Conventions ####
 
+# Namespace preferences
+csharp_style_namespace_declarations = block_scoped:warning
+resharper_csharp_namespace_body = block_scoped
+
 # var preferences
 csharp_style_var_elsewhere = false:silent
 csharp_style_var_for_built_in_types = false:silent

.github/workflows/build.yml

@@ -18,10 +18,16 @@ on:
       - '*.yml'
       - 'README.md'
 
+env:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  RYUJINX_BASE_VERSION: "1.1.0"
+
 jobs:
   build:
-    name: ${{ matrix.os }} (${{ matrix.configuration }})
+    name: ${{ matrix.OS_NAME }} (${{ matrix.configuration }})
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 35
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
@@ -33,7 +39,7 @@ jobs:
           RELEASE_ZIP_OS_NAME: linux_x64
 
         - os: macOS-latest
-          OS_NAME: MacOS x64
+          OS_NAME: macOS x64
           DOTNET_RUNTIME_IDENTIFIER: osx-x64
           RELEASE_ZIP_OS_NAME: osx_x64
 
@@ -43,47 +49,107 @@ jobs:
           RELEASE_ZIP_OS_NAME: win_x64
 
       fail-fast: false
-    env:
-      POWERSHELL_TELEMETRY_OPTOUT: 1
-      DOTNET_CLI_TELEMETRY_OPTOUT: 1
-      RYUJINX_BASE_VERSION: "1.1.0"
     steps:
       - uses: actions/checkout@v3
+
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          global-json-file: global.json
+
       - name: Get git short hash
         id: git_short_hash
         run: echo "result=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
+
       - name: Build
         run: dotnet build -c "${{ matrix.configuration }}" -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER
+
       - name: Test
         run: dotnet test --no-build -c "${{ matrix.configuration }}"
+
       - name: Publish Ryujinx
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx --self-contained true
-        if: github.event_name == 'pull_request'
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -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
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
       - name: Publish Ryujinx.Headless.SDL2
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -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 Ryujinx.Headless.SDL2 --self-contained true
-        if: github.event_name == 'pull_request'
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -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
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
       - name: Publish Ryujinx.Ava
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx.Ava --self-contained true
-        if: github.event_name == 'pull_request'
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Ava --self-contained true
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
+      - name: Set executable bit
+        run: |
+          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
+          chmod +x ./publish_sdl2_headless/Ryujinx.Headless.SDL2 ./publish_sdl2_headless/Ryujinx.sh
+          chmod +x ./publish_ava/Ryujinx.Ava ./publish_ava/Ryujinx.sh
+        if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
+
       - name: Upload Ryujinx artifact
         uses: actions/upload-artifact@v3
         with:
           name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
           path: publish
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v3
         with:
           name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
           path: publish_sdl2_headless
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
       - name: Upload Ryujinx.Ava artifact
         uses: actions/upload-artifact@v3
         with:
           name: ava-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
           path: publish_ava
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest'
+
+  build_macos:
+    name: macOS Universal (${{ matrix.configuration }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 35
+    strategy:
+      matrix:
+        configuration: [ Debug, Release ]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
+
+      - name: Setup LLVM 14
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 14
+
+      - 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 git short hash
+        id: git_short_hash
+        run: echo "result=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+
+      - name: Publish macOS
+        run: |
+          ./distribution/macos/create_macos_build.sh . publish_tmp publish_ava ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"
+
+      - name: Upload Ryujinx.Ava artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ava-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          path: "publish_ava/*.tar.gz"
+        if: github.event_name == 'pull_request'

.github/workflows/flatpak.yml

@@ -0,0 +1,172 @@
+name: Flatpak release job
+
+on:
+  workflow_call:
+    inputs:
+      ryujinx_version:
+        required: true
+        type: string
+
+
+concurrency: flatpak-release
+
+jobs:
+  release:
+    timeout-minutes: 35
+    runs-on: ubuntu-latest
+
+    env:
+      NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
+      GIT_COMMITTER_NAME: "RyujinxBot"
+      GIT_COMMITTER_EMAIL: "61127645+RyujinxBot@users.noreply.github.com"
+      RYUJINX_PROJECT_FILE: "src/Ryujinx/Ryujinx.csproj"
+      NUGET_SOURCES_DESTDIR: "nuget-sources"
+      RYUJINX_VERSION: "${{ inputs.ryujinx_version }}"
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: Ryujinx
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: Ryujinx/global.json
+
+      - name: Get version info
+        id: version_info
+        working-directory: Ryujinx
+        run: |
+          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@v3
+        with:
+          repository: flathub/org.ryujinx.Ryujinx
+          token: ${{ secrets.RYUJINX_BOT_PAT }}
+          submodules: recursive
+          path: flathub
+
+      - name: Install dependencies
+        run: python -m pip install PyYAML lxml
+
+      - name: Restore Nuget packages
+        run: dotnet restore Ryujinx/${{ env.RYUJINX_PROJECT_FILE }}
+
+      - name: Generate nuget_sources.json
+        shell: python
+        run: |
+          from pathlib import Path
+          import base64
+          import binascii
+          import json
+          import os
+
+          sources = []
+
+          for path in Path(os.environ['NUGET_PACKAGES']).glob('**/*.nupkg.sha512'):
+            name = path.parent.parent.name
+            version = path.parent.name
+            filename = '{}.{}.nupkg'.format(name, version)
+            url = 'https://api.nuget.org/v3-flatcontainer/{}/{}/{}'.format(name, version, filename)
+
+            with path.open() as fp:
+                sha512 = binascii.hexlify(base64.b64decode(fp.read())).decode('ascii')
+
+            sources.append({
+                'type': 'file',
+                'url': url,
+                'sha512': sha512,
+                'dest': os.environ['NUGET_SOURCES_DESTDIR'],
+                'dest-filename': filename,
+            })
+
+          with open('flathub/nuget_sources.json', 'w') as fp:
+            json.dump(sources, fp, indent=4)
+
+      - name: Update flatpak metadata
+        id: metadata
+        env:
+          RYUJINX_GIT_HASH: ${{ steps.version_info.outputs.git_hash }}
+        shell: python
+        run: |
+          import hashlib
+          import hmac
+          import json
+          import os
+          import yaml
+          from datetime import datetime
+          from lxml import etree
+          
+          
+          # Ensure we don't destroy multiline strings
+          def str_presenter(dumper, data):
+            if len(data.splitlines()) > 1:
+              return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
+            return dumper.represent_scalar("tag:yaml.org,2002:str", data)
+            
+            
+          yaml.representer.SafeRepresenter.add_representer(str, str_presenter)
+  
+          yaml_file = "flathub/org.ryujinx.Ryujinx.yml"
+          xml_file = "flathub/org.ryujinx.Ryujinx.appdata.xml"
+
+          with open(yaml_file, "r") as f:
+            data = yaml.safe_load(f)
+
+          for source in data["modules"][0]["sources"]:
+            if type(source) is str:
+              continue
+            if (
+              source["type"] == "git"
+              and source["url"] == "https://github.com/Ryujinx/Ryujinx.git"
+            ):
+              source["commit"] = os.environ['RYUJINX_GIT_HASH']
+
+          is_same_version = data["modules"][0]["build-options"]["env"]["RYUJINX_VERSION"] == os.environ['RYUJINX_VERSION']
+
+          with open(os.environ['GITHUB_OUTPUT'], "a") as gh_out:
+            if is_same_version:
+              gh_out.write(f"commit_message=Retry update to {os.environ['RYUJINX_VERSION']}")
+            else:
+              gh_out.write(f"commit_message=Update to {os.environ['RYUJINX_VERSION']}")
+
+          if not is_same_version:
+            data["modules"][0]["build-options"]["env"]["RYUJINX_VERSION"] = os.environ['RYUJINX_VERSION']
+
+            with open(yaml_file, "w") as f:
+                yaml.safe_dump(data, f, sort_keys=False)
+
+            parser = etree.XMLParser(remove_blank_text=True)
+            tree = etree.parse(xml_file, parser)
+
+            root = tree.getroot()
+
+            releases = root.find("releases")
+
+            element = etree.Element("release")
+            element.set("version", os.environ['RYUJINX_VERSION'])
+            element.set("date", datetime.now().date().isoformat())
+            releases.insert(0, element)
+
+            # Ensure 4 spaces
+            etree.indent(root, space="    ")
+
+            with open(xml_file, "wb") as f:
+              f.write(
+                etree.tostring(
+                  tree,
+                  pretty_print=True,
+                  encoding="UTF-8",
+                  doctype='<?xml version="1.0" encoding="UTF-8"?>',
+                )
+              )
+
+      - name: Push flatpak update
+        working-directory: flathub
+        env:
+          COMMIT_MESSAGE: ${{ steps.metadata.outputs.commit_message }}
+        run: |
+          git config user.name "${{ env.GIT_COMMITTER_NAME }}"
+          git config user.email "${{ env.GIT_COMMITTER_EMAIL }}"
+          git add .
+          git commit -m "$COMMIT_MESSAGE"
+          git push origin master

.github/workflows/nightly_pr_comment.yml

@@ -7,6 +7,7 @@ jobs:
   pr_comment:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
+    timeout-minutes: 35
     steps:
       - uses: actions/github-script@v6
         with:
@@ -65,4 +66,4 @@ jobs:
             } else {
               core.info(`Creating a comment`);
               await github.rest.issues.createComment({repo, owner, issue_number, body});
-            }
+            }

.github/workflows/release.yml

@@ -13,89 +13,117 @@ on:
 
 concurrency: release
 
+env:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  RYUJINX_BASE_VERSION: "1.1"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "release-channel-master"
+
 jobs:
+  tag:
+    name: Create tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get version info
+        id: version_info
+        run: |
+          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Create tag
+        uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/${{ steps.version_info.outputs.build_version }}',
+              sha: context.sha
+            })
+
   release:
-    runs-on: windows-latest
-
-    env:
-      POWERSHELL_TELEMETRY_OPTOUT: 1
-      DOTNET_CLI_TELEMETRY_OPTOUT: 1
-      RYUJINX_BASE_VERSION: "1.1"
-      RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
-      RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryujinx"
-      RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "release-channel-master"
+    name: Release ${{ matrix.OS_NAME }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 35
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+        include:
+          - os: ubuntu-latest
+            OS_NAME: Linux x64
+            DOTNET_RUNTIME_IDENTIFIER: linux-x64
+            RELEASE_ZIP_OS_NAME: linux_x64
 
+          - os: windows-latest
+            OS_NAME: Windows x64
+            DOTNET_RUNTIME_IDENTIFIER: win10-x64
+            RELEASE_ZIP_OS_NAME: win_x64
     steps:
       - uses: actions/checkout@v3
+
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          global-json-file: global.json
+
       - name: Get version info
         id: version_info
         run: |
           echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $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;' Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' Ryujinx.Common/ReleaseInformation.cs
+          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
         shell: bash
+
       - name: Create output dir
         run: "mkdir release_output"
-      - name: Publish Windows
+
+      - name: Publish
         run: |
-          dotnet publish -c Release -r win10-x64 -o ./publish_windows/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true
-          dotnet publish -c Release -r win10-x64 -o ./publish_windows_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true
-          dotnet publish -c Release -r win10-x64 -o ./publish_windows_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true
+          dotnet publish -c Release -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_gtk/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.DOTNET_RUNTIME_IDENTIFIER }}" -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.DOTNET_RUNTIME_IDENTIFIER }}" -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.Ava --self-contained true
+
       - name: Packing Windows builds
+        if: matrix.os == 'windows-latest'
         run: |
-          pushd publish_windows
+          pushd publish_gtk
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip publish
           popd
 
-          pushd publish_windows_sdl2_headless
+          pushd publish_sdl2_headless
           7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-win_x64.zip publish
           popd
 
-          pushd publish_windows_ava
+          pushd publish_ava
           7z a ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip publish
           popd
         shell: bash
 
-      - name: Publish Linux
-        run: |
-          dotnet publish -c Release -r linux-x64 -o ./publish_linux/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true
-          dotnet publish -c Release -r linux-x64 -o ./publish_linux_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true
-          dotnet publish -c Release -r linux-x64 -o ./publish_linux_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true
-
       - name: Packing Linux builds
+        if: matrix.os == 'ubuntu-latest'
         run: |
-          pushd publish_linux
-          tar --exclude "publish/Ryujinx" --exclude "publish/Ryujinx.sh" -cvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx" "publish/Ryujinx"
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
-          gzip -9 < ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
-          rm ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
+          pushd publish_gtk
+          chmod +x publish/Ryujinx.sh publish/Ryujinx
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz publish
           popd
 
-          pushd publish_linux_sdl2_headless
-          tar --exclude "publish/Ryujinx.Headless.SDL2" --exclude "publish/Ryujinx.sh" -cvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.Headless.SDL2" "publish/Ryujinx.Headless.SDL2"
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
-          gzip -9 < ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
-          rm ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
+          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 }}-linux_x64.tar.gz publish
           popd
 
-          pushd publish_linux_ava
-          tar --exclude "publish/Ryujinx.Ava" --exclude "publish/Ryujinx.sh" -cvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.Ava" "publish/Ryujinx.Ava"
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
-          gzip -9 < ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
-          rm ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
+          pushd publish_ava
+          chmod +x publish/Ryujinx.sh publish/Ryujinx.Ava
+          tar -czvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz publish
           popd
         shell: bash
 
@@ -105,10 +133,78 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "release_output/*.tar.gz,release_output/*.zip"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "For more informations about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
+          body: "For more information about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
+          omitBodyDuringUpdate: true
           allowUpdates: true
-          removeArtifacts: 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
+    timeout-minutes: 35
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
+
+      - name: Setup LLVM 14
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 14
+
+      - 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 "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
+        shell: bash
+
+      - name: Publish macOS
+        run: |
+          ./distribution/macos/create_macos_build.sh . publish_tmp publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+
+      - name: Pushing new release
+        uses: ncipollo/release-action@v1
+        with:
+          name: ${{ steps.version_info.outputs.build_version }}
+          artifacts: "publish_ava/*.tar.gz"
+          tag: ${{ steps.version_info.outputs.build_version }}
+          body: "For more information about this release please check out the official [Changelog](https://github.com/Ryujinx/Ryujinx/wiki/Changelog)."
+          omitBodyDuringUpdate: true
+          allowUpdates: true
+          replacesArtifacts: true
+          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
+          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+  flatpak_release:
+    uses: ./.github/workflows/flatpak.yml
+    needs: release
+    with:
+      ryujinx_version: "1.1.${{ github.run_number }}"
+    secrets: inherit

ARMeilleure/ARMeilleure.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ContentWithTargetPath Include="Native\libs\libarmeilleure-jitsupport.dylib" Condition="'$(RuntimeIdentifier)' == '' OR '$(RuntimeIdentifier)' == 'osx-arm64'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libarmeilleure-jitsupport.dylib</TargetPath>
-    </ContentWithTargetPath>
-  </ItemGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Ryujinx.Tests</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-</Project>

ARMeilleure/CodeGen/Arm64/CodeGenContext.cs

@@ -1,286 +0,0 @@
-using ARMeilleure.CodeGen.Linking;
-using ARMeilleure.CodeGen.RegisterAllocators;
-using ARMeilleure.IntermediateRepresentation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ARMeilleure.CodeGen.Arm64
-{
-    class CodeGenContext
-    {
-        private const int BccInstLength = 4;
-        private const int CbnzInstLength = 4;
-        private const int LdrLitInstLength = 4;
-
-        private Stream _stream;
-
-        public int StreamOffset => (int)_stream.Length;
-
-        public AllocationResult AllocResult { get; }
-
-        public Assembler Assembler { get; }
-
-        public BasicBlock CurrBlock { get; private set; }
-
-        public bool HasCall { get; }
-
-        public int CallArgsRegionSize { get; }
-        public int FpLrSaveRegionSize { get; }
-
-        private readonly Dictionary<BasicBlock, long> _visitedBlocks;
-        private readonly Dictionary<BasicBlock, List<(ArmCondition Condition, long BranchPos)>> _pendingBranches;
-
-        private struct ConstantPoolEntry
-        {
-            public readonly int Offset;
-            public readonly Symbol Symbol;
-            public readonly List<(Operand, int)> LdrOffsets;
-
-            public ConstantPoolEntry(int offset, Symbol symbol)
-            {
-                Offset = offset;
-                Symbol = symbol;
-                LdrOffsets = new List<(Operand, int)>();
-            }
-        }
-
-        private readonly Dictionary<ulong, ConstantPoolEntry> _constantPool;
-
-        private bool _constantPoolWritten;
-        private long _constantPoolOffset;
-
-        private ArmCondition _jNearCondition;
-        private Operand _jNearValue;
-
-        private long _jNearPosition;
-
-        private readonly bool _relocatable;
-
-        public CodeGenContext(AllocationResult allocResult, int maxCallArgs, int blocksCount, bool relocatable)
-        {
-            _stream = new MemoryStream();
-
-            AllocResult = allocResult;
-
-            Assembler = new Assembler(_stream);
-
-            bool hasCall = maxCallArgs >= 0;
-
-            HasCall = hasCall;
-
-            if (maxCallArgs < 0)
-            {
-                maxCallArgs = 0;
-            }
-
-            CallArgsRegionSize = maxCallArgs * 16;
-            FpLrSaveRegionSize = hasCall ? 16 : 0;
-
-            _visitedBlocks = new Dictionary<BasicBlock, long>();
-            _pendingBranches = new Dictionary<BasicBlock, List<(ArmCondition, long)>>();
-            _constantPool = new Dictionary<ulong, ConstantPoolEntry>();
-
-            _relocatable = relocatable;
-        }
-
-        public void EnterBlock(BasicBlock block)
-        {
-            CurrBlock = block;
-
-            long target = _stream.Position;
-
-            if (_pendingBranches.TryGetValue(block, out var list))
-            {
-                foreach (var tuple in list)
-                {
-                    _stream.Seek(tuple.BranchPos, SeekOrigin.Begin);
-                    WriteBranch(tuple.Condition, target);
-                }
-
-                _stream.Seek(target, SeekOrigin.Begin);
-                _pendingBranches.Remove(block);
-            }
-
-            _visitedBlocks.Add(block, target);
-        }
-
-        public void JumpTo(BasicBlock target)
-        {
-            JumpTo(ArmCondition.Al, target);
-        }
-
-        public void JumpTo(ArmCondition condition, BasicBlock target)
-        {
-            if (_visitedBlocks.TryGetValue(target, out long offset))
-            {
-                WriteBranch(condition, offset);
-            }
-            else
-            {
-                if (!_pendingBranches.TryGetValue(target, out var list))
-                {
-                    list = new List<(ArmCondition, long)>();
-                    _pendingBranches.Add(target, list);
-                }
-
-                list.Add((condition, _stream.Position));
-
-                _stream.Seek(BccInstLength, SeekOrigin.Current);
-            }
-        }
-
-        private void WriteBranch(ArmCondition condition, long to)
-        {
-            int imm = checked((int)(to - _stream.Position));
-
-            if (condition != ArmCondition.Al)
-            {
-                Assembler.B(condition, imm);
-            }
-            else
-            {
-                Assembler.B(imm);
-            }
-        }
-
-        public void JumpToNear(ArmCondition condition)
-        {
-            _jNearCondition = condition;
-            _jNearPosition = _stream.Position;
-
-            _stream.Seek(BccInstLength, SeekOrigin.Current);
-        }
-
-        public void JumpToNearIfNotZero(Operand value)
-        {
-            _jNearValue = value;
-            _jNearPosition = _stream.Position;
-
-            _stream.Seek(CbnzInstLength, SeekOrigin.Current);
-        }
-
-        public void JumpHere()
-        {
-            long currentPosition = _stream.Position;
-            long offset = currentPosition - _jNearPosition;
-
-            _stream.Seek(_jNearPosition, SeekOrigin.Begin);
-
-            if (_jNearValue != default)
-            {
-                Assembler.Cbnz(_jNearValue, checked((int)offset));
-                _jNearValue = default;
-            }
-            else
-            {
-                Assembler.B(_jNearCondition, checked((int)offset));
-            }
-
-            _stream.Seek(currentPosition, SeekOrigin.Begin);
-        }
-
-        public void ReserveRelocatableConstant(Operand rt, Symbol symbol, ulong value)
-        {
-            if (!_constantPool.TryGetValue(value, out ConstantPoolEntry cpe))
-            {
-                cpe = new ConstantPoolEntry(_constantPool.Count * sizeof(ulong), symbol);
-                _constantPool.Add(value, cpe);
-            }
-
-            cpe.LdrOffsets.Add((rt, (int)_stream.Position));
-            _stream.Seek(LdrLitInstLength, SeekOrigin.Current);
-        }
-
-        private long WriteConstantPool()
-        {
-            if (_constantPoolWritten)
-            {
-                return _constantPoolOffset;
-            }
-
-            long constantPoolBaseOffset = _stream.Position;
-
-            foreach (ulong value in _constantPool.Keys)
-            {
-                WriteUInt64(value);
-            }
-
-            foreach (ConstantPoolEntry cpe in _constantPool.Values)
-            {
-                foreach ((Operand rt, int ldrOffset) in cpe.LdrOffsets)
-                {
-                    _stream.Seek(ldrOffset, SeekOrigin.Begin);
-
-                    int absoluteOffset = checked((int)(constantPoolBaseOffset + cpe.Offset));
-                    int pcRelativeOffset = absoluteOffset - ldrOffset;
-
-                    Assembler.LdrLit(rt, pcRelativeOffset);
-                }
-            }
-
-            _stream.Seek(constantPoolBaseOffset + _constantPool.Count * sizeof(ulong), SeekOrigin.Begin);
-
-            _constantPoolOffset = constantPoolBaseOffset;
-            _constantPoolWritten = true;
-
-            return constantPoolBaseOffset;
-        }
-
-        public (byte[], RelocInfo) GetCode()
-        {
-            long constantPoolBaseOffset = WriteConstantPool();
-
-            byte[] code = new byte[_stream.Length];
-
-            long originalPosition = _stream.Position;
-
-            _stream.Seek(0, SeekOrigin.Begin);
-            _stream.Read(code, 0, code.Length);
-            _stream.Seek(originalPosition, SeekOrigin.Begin);
-
-            RelocInfo relocInfo;
-
-            if (_relocatable)
-            {
-                RelocEntry[] relocs = new RelocEntry[_constantPool.Count];
-
-                int index = 0;
-
-                foreach (ConstantPoolEntry cpe in _constantPool.Values)
-                {
-                    if (cpe.Symbol.Type != SymbolType.None)
-                    {
-                        int absoluteOffset = checked((int)(constantPoolBaseOffset + cpe.Offset));
-                        relocs[index++] = new RelocEntry(absoluteOffset, cpe.Symbol);
-                    }
-                }
-
-                if (index != relocs.Length)
-                {
-                    Array.Resize(ref relocs, index);
-                }
-
-                relocInfo = new RelocInfo(relocs);
-            }
-            else
-            {
-                relocInfo = new RelocInfo(new RelocEntry[0]);
-            }
-
-            return (code, relocInfo);
-        }
-
-        private void WriteUInt64(ulong value)
-        {
-            _stream.WriteByte((byte)(value >> 0));
-            _stream.WriteByte((byte)(value >> 8));
-            _stream.WriteByte((byte)(value >> 16));
-            _stream.WriteByte((byte)(value >> 24));
-            _stream.WriteByte((byte)(value >> 32));
-            _stream.WriteByte((byte)(value >> 40));
-            _stream.WriteByte((byte)(value >> 48));
-            _stream.WriteByte((byte)(value >> 56));
-        }
-    }
-}

ARMeilleure/CodeGen/Arm64/IntrinsicTable.cs

@@ -1,461 +0,0 @@
-using ARMeilleure.Common;
-using ARMeilleure.IntermediateRepresentation;
-
-namespace ARMeilleure.CodeGen.Arm64
-{
-    static class IntrinsicTable
-    {
-        private static IntrinsicInfo[] _intrinTable;
-
-        static IntrinsicTable()
-        {
-            _intrinTable = new IntrinsicInfo[EnumUtils.GetCount(typeof(Intrinsic))];
-
-            Add(Intrinsic.Arm64AbsS,          new IntrinsicInfo(0x5e20b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64AbsV,          new IntrinsicInfo(0x0e20b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64AddhnV,        new IntrinsicInfo(0x0e204000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64AddpS,         new IntrinsicInfo(0x5e31b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64AddpV,         new IntrinsicInfo(0x0e20bc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64AddvV,         new IntrinsicInfo(0x0e31b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64AddS,          new IntrinsicInfo(0x5e208400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64AddV,          new IntrinsicInfo(0x0e208400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64AesdV,         new IntrinsicInfo(0x4e285800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64AeseV,         new IntrinsicInfo(0x4e284800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64AesimcV,       new IntrinsicInfo(0x4e287800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64AesmcV,        new IntrinsicInfo(0x4e286800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64AndV,          new IntrinsicInfo(0x0e201c00u, IntrinsicType.VectorBinaryBitwise));
-            Add(Intrinsic.Arm64BicVi,         new IntrinsicInfo(0x2f001400u, IntrinsicType.VectorBinaryBitwiseImm));
-            Add(Intrinsic.Arm64BicV,          new IntrinsicInfo(0x0e601c00u, IntrinsicType.VectorBinaryBitwise));
-            Add(Intrinsic.Arm64BifV,          new IntrinsicInfo(0x2ee01c00u, IntrinsicType.VectorTernaryRdBitwise));
-            Add(Intrinsic.Arm64BitV,          new IntrinsicInfo(0x2ea01c00u, IntrinsicType.VectorTernaryRdBitwise));
-            Add(Intrinsic.Arm64BslV,          new IntrinsicInfo(0x2e601c00u, IntrinsicType.VectorTernaryRdBitwise));
-            Add(Intrinsic.Arm64ClsV,          new IntrinsicInfo(0x0e204800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64ClzV,          new IntrinsicInfo(0x2e204800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmeqS,         new IntrinsicInfo(0x7e208c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmeqV,         new IntrinsicInfo(0x2e208c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CmeqSz,        new IntrinsicInfo(0x5e209800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64CmeqVz,        new IntrinsicInfo(0x0e209800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmgeS,         new IntrinsicInfo(0x5e203c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmgeV,         new IntrinsicInfo(0x0e203c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CmgeSz,        new IntrinsicInfo(0x7e208800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64CmgeVz,        new IntrinsicInfo(0x2e208800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmgtS,         new IntrinsicInfo(0x5e203400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmgtV,         new IntrinsicInfo(0x0e203400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CmgtSz,        new IntrinsicInfo(0x5e208800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64CmgtVz,        new IntrinsicInfo(0x0e208800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmhiS,         new IntrinsicInfo(0x7e203400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmhiV,         new IntrinsicInfo(0x2e203400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CmhsS,         new IntrinsicInfo(0x7e203c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmhsV,         new IntrinsicInfo(0x2e203c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CmleSz,        new IntrinsicInfo(0x7e209800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64CmleVz,        new IntrinsicInfo(0x2e209800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmltSz,        new IntrinsicInfo(0x5e20a800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64CmltVz,        new IntrinsicInfo(0x0e20a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64CmtstS,        new IntrinsicInfo(0x5e208c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64CmtstV,        new IntrinsicInfo(0x0e208c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64CntV,          new IntrinsicInfo(0x0e205800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64DupSe,         new IntrinsicInfo(0x5e000400u, IntrinsicType.ScalarUnaryByElem));
-            Add(Intrinsic.Arm64DupVe,         new IntrinsicInfo(0x0e000400u, IntrinsicType.VectorUnaryByElem));
-            Add(Intrinsic.Arm64DupGp,         new IntrinsicInfo(0x0e000c00u, IntrinsicType.VectorUnaryByElem));
-            Add(Intrinsic.Arm64EorV,          new IntrinsicInfo(0x2e201c00u, IntrinsicType.VectorBinaryBitwise));
-            Add(Intrinsic.Arm64ExtV,          new IntrinsicInfo(0x2e000000u, IntrinsicType.VectorExt));
-            Add(Intrinsic.Arm64FabdS,         new IntrinsicInfo(0x7ea0d400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FabdV,         new IntrinsicInfo(0x2ea0d400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FabsV,         new IntrinsicInfo(0x0ea0f800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FabsS,         new IntrinsicInfo(0x1e20c000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FacgeS,        new IntrinsicInfo(0x7e20ec00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FacgeV,        new IntrinsicInfo(0x2e20ec00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FacgtS,        new IntrinsicInfo(0x7ea0ec00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FacgtV,        new IntrinsicInfo(0x2ea0ec00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FaddpS,        new IntrinsicInfo(0x7e30d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FaddpV,        new IntrinsicInfo(0x2e20d400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FaddV,         new IntrinsicInfo(0x0e20d400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FaddS,         new IntrinsicInfo(0x1e202800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FccmpeS,       new IntrinsicInfo(0x1e200410u, IntrinsicType.ScalarFPCompareCond));
-            Add(Intrinsic.Arm64FccmpS,        new IntrinsicInfo(0x1e200400u, IntrinsicType.ScalarFPCompareCond));
-            Add(Intrinsic.Arm64FcmeqS,        new IntrinsicInfo(0x5e20e400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FcmeqV,        new IntrinsicInfo(0x0e20e400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FcmeqSz,       new IntrinsicInfo(0x5ea0d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcmeqVz,       new IntrinsicInfo(0x0ea0d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcmgeS,        new IntrinsicInfo(0x7e20e400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FcmgeV,        new IntrinsicInfo(0x2e20e400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FcmgeSz,       new IntrinsicInfo(0x7ea0c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcmgeVz,       new IntrinsicInfo(0x2ea0c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcmgtS,        new IntrinsicInfo(0x7ea0e400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FcmgtV,        new IntrinsicInfo(0x2ea0e400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FcmgtSz,       new IntrinsicInfo(0x5ea0c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcmgtVz,       new IntrinsicInfo(0x0ea0c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcmleSz,       new IntrinsicInfo(0x7ea0d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcmleVz,       new IntrinsicInfo(0x2ea0d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcmltSz,       new IntrinsicInfo(0x5ea0e800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcmltVz,       new IntrinsicInfo(0x0ea0e800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcmpeS,        new IntrinsicInfo(0x1e202010u, IntrinsicType.ScalarFPCompare));
-            Add(Intrinsic.Arm64FcmpS,         new IntrinsicInfo(0x1e202000u, IntrinsicType.ScalarFPCompare));
-            Add(Intrinsic.Arm64FcselS,        new IntrinsicInfo(0x1e200c00u, IntrinsicType.ScalarFcsel));
-            Add(Intrinsic.Arm64FcvtasS,       new IntrinsicInfo(0x5e21c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtasV,       new IntrinsicInfo(0x0e21c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtasGp,      new IntrinsicInfo(0x1e240000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtauS,       new IntrinsicInfo(0x7e21c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtauV,       new IntrinsicInfo(0x2e21c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtauGp,      new IntrinsicInfo(0x1e250000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtlV,        new IntrinsicInfo(0x0e217800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtmsS,       new IntrinsicInfo(0x5e21b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtmsV,       new IntrinsicInfo(0x0e21b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtmsGp,      new IntrinsicInfo(0x1e300000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtmuS,       new IntrinsicInfo(0x7e21b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtmuV,       new IntrinsicInfo(0x2e21b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtmuGp,      new IntrinsicInfo(0x1e310000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtnsS,       new IntrinsicInfo(0x5e21a800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtnsV,       new IntrinsicInfo(0x0e21a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtnsGp,      new IntrinsicInfo(0x1e200000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtnuS,       new IntrinsicInfo(0x7e21a800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtnuV,       new IntrinsicInfo(0x2e21a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtnuGp,      new IntrinsicInfo(0x1e210000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtnV,        new IntrinsicInfo(0x0e216800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64FcvtpsS,       new IntrinsicInfo(0x5ea1a800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtpsV,       new IntrinsicInfo(0x0ea1a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtpsGp,      new IntrinsicInfo(0x1e280000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtpuS,       new IntrinsicInfo(0x7ea1a800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtpuV,       new IntrinsicInfo(0x2ea1a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtpuGp,      new IntrinsicInfo(0x1e290000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtxnS,       new IntrinsicInfo(0x7e216800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtxnV,       new IntrinsicInfo(0x2e216800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtzsSFixed,  new IntrinsicInfo(0x5f00fc00u, IntrinsicType.ScalarFPConvFixed));
-            Add(Intrinsic.Arm64FcvtzsVFixed,  new IntrinsicInfo(0x0f00fc00u, IntrinsicType.VectorFPConvFixed));
-            Add(Intrinsic.Arm64FcvtzsS,       new IntrinsicInfo(0x5ea1b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtzsV,       new IntrinsicInfo(0x0ea1b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtzsGpFixed, new IntrinsicInfo(0x1e180000u, IntrinsicType.ScalarFPConvFixedGpr));
-            Add(Intrinsic.Arm64FcvtzsGp,      new IntrinsicInfo(0x1e380000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtzuSFixed,  new IntrinsicInfo(0x7f00fc00u, IntrinsicType.ScalarFPConvFixed));
-            Add(Intrinsic.Arm64FcvtzuVFixed,  new IntrinsicInfo(0x2f00fc00u, IntrinsicType.VectorFPConvFixed));
-            Add(Intrinsic.Arm64FcvtzuS,       new IntrinsicInfo(0x7ea1b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FcvtzuV,       new IntrinsicInfo(0x2ea1b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FcvtzuGpFixed, new IntrinsicInfo(0x1e190000u, IntrinsicType.ScalarFPConvFixedGpr));
-            Add(Intrinsic.Arm64FcvtzuGp,      new IntrinsicInfo(0x1e390000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FcvtS,         new IntrinsicInfo(0x1e224000u, IntrinsicType.ScalarFPConv));
-            Add(Intrinsic.Arm64FdivV,         new IntrinsicInfo(0x2e20fc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FdivS,         new IntrinsicInfo(0x1e201800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FmaddS,        new IntrinsicInfo(0x1f000000u, IntrinsicType.ScalarTernary));
-            Add(Intrinsic.Arm64FmaxnmpS,      new IntrinsicInfo(0x7e30c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FmaxnmpV,      new IntrinsicInfo(0x2e20c400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmaxnmvV,      new IntrinsicInfo(0x2e30c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FmaxnmV,       new IntrinsicInfo(0x0e20c400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmaxnmS,       new IntrinsicInfo(0x1e206800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FmaxpS,        new IntrinsicInfo(0x7e30f800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FmaxpV,        new IntrinsicInfo(0x2e20f400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmaxvV,        new IntrinsicInfo(0x2e30f800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FmaxV,         new IntrinsicInfo(0x0e20f400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmaxS,         new IntrinsicInfo(0x1e204800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FminnmpS,      new IntrinsicInfo(0x7eb0c800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FminnmpV,      new IntrinsicInfo(0x2ea0c400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FminnmvV,      new IntrinsicInfo(0x2eb0c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FminnmV,       new IntrinsicInfo(0x0ea0c400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FminnmS,       new IntrinsicInfo(0x1e207800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FminpS,        new IntrinsicInfo(0x7eb0f800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FminpV,        new IntrinsicInfo(0x2ea0f400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FminvV,        new IntrinsicInfo(0x2eb0f800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FminV,         new IntrinsicInfo(0x0ea0f400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FminS,         new IntrinsicInfo(0x1e205800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FmlaSe,        new IntrinsicInfo(0x5f801000u, IntrinsicType.ScalarTernaryFPRdByElem));
-            Add(Intrinsic.Arm64FmlaVe,        new IntrinsicInfo(0x0f801000u, IntrinsicType.VectorTernaryFPRdByElem));
-            Add(Intrinsic.Arm64FmlaV,         new IntrinsicInfo(0x0e20cc00u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64FmlsSe,        new IntrinsicInfo(0x5f805000u, IntrinsicType.ScalarTernaryFPRdByElem));
-            Add(Intrinsic.Arm64FmlsVe,        new IntrinsicInfo(0x0f805000u, IntrinsicType.VectorTernaryFPRdByElem));
-            Add(Intrinsic.Arm64FmlsV,         new IntrinsicInfo(0x0ea0cc00u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64FmovVi,        new IntrinsicInfo(0x0f00f400u, IntrinsicType.VectorFmovi));
-            Add(Intrinsic.Arm64FmovS,         new IntrinsicInfo(0x1e204000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FmovGp,        new IntrinsicInfo(0x1e260000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64FmovSi,        new IntrinsicInfo(0x1e201000u, IntrinsicType.ScalarFmovi));
-            Add(Intrinsic.Arm64FmsubS,        new IntrinsicInfo(0x1f008000u, IntrinsicType.ScalarTernary));
-            Add(Intrinsic.Arm64FmulxSe,       new IntrinsicInfo(0x7f809000u, IntrinsicType.ScalarBinaryFPByElem));
-            Add(Intrinsic.Arm64FmulxVe,       new IntrinsicInfo(0x2f809000u, IntrinsicType.VectorBinaryFPByElem));
-            Add(Intrinsic.Arm64FmulxS,        new IntrinsicInfo(0x5e20dc00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FmulxV,        new IntrinsicInfo(0x0e20dc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmulSe,        new IntrinsicInfo(0x5f809000u, IntrinsicType.ScalarBinaryFPByElem));
-            Add(Intrinsic.Arm64FmulVe,        new IntrinsicInfo(0x0f809000u, IntrinsicType.VectorBinaryFPByElem));
-            Add(Intrinsic.Arm64FmulV,         new IntrinsicInfo(0x2e20dc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FmulS,         new IntrinsicInfo(0x1e200800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FnegV,         new IntrinsicInfo(0x2ea0f800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FnegS,         new IntrinsicInfo(0x1e214000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FnmaddS,       new IntrinsicInfo(0x1f200000u, IntrinsicType.ScalarTernary));
-            Add(Intrinsic.Arm64FnmsubS,       new IntrinsicInfo(0x1f208000u, IntrinsicType.ScalarTernary));
-            Add(Intrinsic.Arm64FnmulS,        new IntrinsicInfo(0x1e208800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FrecpeS,       new IntrinsicInfo(0x5ea1d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrecpeV,       new IntrinsicInfo(0x0ea1d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrecpsS,       new IntrinsicInfo(0x5e20fc00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FrecpsV,       new IntrinsicInfo(0x0e20fc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FrecpxS,       new IntrinsicInfo(0x5ea1f800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintaV,       new IntrinsicInfo(0x2e218800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintaS,       new IntrinsicInfo(0x1e264000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintiV,       new IntrinsicInfo(0x2ea19800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintiS,       new IntrinsicInfo(0x1e27c000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintmV,       new IntrinsicInfo(0x0e219800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintmS,       new IntrinsicInfo(0x1e254000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintnV,       new IntrinsicInfo(0x0e218800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintnS,       new IntrinsicInfo(0x1e244000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintpV,       new IntrinsicInfo(0x0ea18800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintpS,       new IntrinsicInfo(0x1e24c000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintxV,       new IntrinsicInfo(0x2e219800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintxS,       new IntrinsicInfo(0x1e274000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrintzV,       new IntrinsicInfo(0x0ea19800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrintzS,       new IntrinsicInfo(0x1e25c000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrsqrteS,      new IntrinsicInfo(0x7ea1d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FrsqrteV,      new IntrinsicInfo(0x2ea1d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FrsqrtsS,      new IntrinsicInfo(0x5ea0fc00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64FrsqrtsV,      new IntrinsicInfo(0x0ea0fc00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FsqrtV,        new IntrinsicInfo(0x2ea1f800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64FsqrtS,        new IntrinsicInfo(0x1e21c000u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64FsubV,         new IntrinsicInfo(0x0ea0d400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64FsubS,         new IntrinsicInfo(0x1e203800u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64InsVe,         new IntrinsicInfo(0x6e000400u, IntrinsicType.VectorInsertByElem));
-            Add(Intrinsic.Arm64InsGp,         new IntrinsicInfo(0x4e001c00u, IntrinsicType.ScalarUnaryByElem));
-            Add(Intrinsic.Arm64Ld1rV,         new IntrinsicInfo(0x0d40c000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld1Vms,        new IntrinsicInfo(0x0c402000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld1Vss,        new IntrinsicInfo(0x0d400000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64Ld2rV,         new IntrinsicInfo(0x0d60c000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld2Vms,        new IntrinsicInfo(0x0c408000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld2Vss,        new IntrinsicInfo(0x0d600000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64Ld3rV,         new IntrinsicInfo(0x0d40e000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld3Vms,        new IntrinsicInfo(0x0c404000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld3Vss,        new IntrinsicInfo(0x0d402000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64Ld4rV,         new IntrinsicInfo(0x0d60e000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld4Vms,        new IntrinsicInfo(0x0c400000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64Ld4Vss,        new IntrinsicInfo(0x0d602000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64MlaVe,         new IntrinsicInfo(0x2f000000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64MlaV,          new IntrinsicInfo(0x0e209400u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64MlsVe,         new IntrinsicInfo(0x2f004000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64MlsV,          new IntrinsicInfo(0x2e209400u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64MoviV,         new IntrinsicInfo(0x0f000400u, IntrinsicType.VectorMovi));
-            Add(Intrinsic.Arm64MrsFpsr,       new IntrinsicInfo(0xd53b4420u, IntrinsicType.GetRegister));
-            Add(Intrinsic.Arm64MsrFpsr,       new IntrinsicInfo(0xd51b4420u, IntrinsicType.SetRegister));
-            Add(Intrinsic.Arm64MulVe,         new IntrinsicInfo(0x0f008000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64MulV,          new IntrinsicInfo(0x0e209c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64MvniV,         new IntrinsicInfo(0x2f000400u, IntrinsicType.VectorMvni));
-            Add(Intrinsic.Arm64NegS,          new IntrinsicInfo(0x7e20b800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64NegV,          new IntrinsicInfo(0x2e20b800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64NotV,          new IntrinsicInfo(0x2e205800u, IntrinsicType.VectorUnaryBitwise));
-            Add(Intrinsic.Arm64OrnV,          new IntrinsicInfo(0x0ee01c00u, IntrinsicType.VectorBinaryBitwise));
-            Add(Intrinsic.Arm64OrrVi,         new IntrinsicInfo(0x0f001400u, IntrinsicType.VectorBinaryBitwiseImm));
-            Add(Intrinsic.Arm64OrrV,          new IntrinsicInfo(0x0ea01c00u, IntrinsicType.VectorBinaryBitwise));
-            Add(Intrinsic.Arm64PmullV,        new IntrinsicInfo(0x0e20e000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64PmulV,         new IntrinsicInfo(0x2e209c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64RaddhnV,       new IntrinsicInfo(0x2e204000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64RbitV,         new IntrinsicInfo(0x2e605800u, IntrinsicType.VectorUnaryBitwise));
-            Add(Intrinsic.Arm64Rev16V,        new IntrinsicInfo(0x0e201800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64Rev32V,        new IntrinsicInfo(0x2e200800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64Rev64V,        new IntrinsicInfo(0x0e200800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64RshrnV,        new IntrinsicInfo(0x0f008c00u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64RsubhnV,       new IntrinsicInfo(0x2e206000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SabalV,        new IntrinsicInfo(0x0e205000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SabaV,         new IntrinsicInfo(0x0e207c00u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SabdlV,        new IntrinsicInfo(0x0e207000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SabdV,         new IntrinsicInfo(0x0e207400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SadalpV,       new IntrinsicInfo(0x0e206800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64SaddlpV,       new IntrinsicInfo(0x0e202800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SaddlvV,       new IntrinsicInfo(0x0e303800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SaddlV,        new IntrinsicInfo(0x0e200000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SaddwV,        new IntrinsicInfo(0x0e201000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64ScvtfSFixed,   new IntrinsicInfo(0x5f00e400u, IntrinsicType.ScalarFPConvFixed));
-            Add(Intrinsic.Arm64ScvtfVFixed,   new IntrinsicInfo(0x0f00e400u, IntrinsicType.VectorFPConvFixed));
-            Add(Intrinsic.Arm64ScvtfS,        new IntrinsicInfo(0x5e21d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64ScvtfV,        new IntrinsicInfo(0x0e21d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64ScvtfGpFixed,  new IntrinsicInfo(0x1e020000u, IntrinsicType.ScalarFPConvFixedGpr));
-            Add(Intrinsic.Arm64ScvtfGp,       new IntrinsicInfo(0x1e220000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64Sha1cV,        new IntrinsicInfo(0x5e000000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha1hV,        new IntrinsicInfo(0x5e280800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64Sha1mV,        new IntrinsicInfo(0x5e002000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha1pV,        new IntrinsicInfo(0x5e001000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha1su0V,      new IntrinsicInfo(0x5e003000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha1su1V,      new IntrinsicInfo(0x5e281800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64Sha256h2V,     new IntrinsicInfo(0x5e005000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha256hV,      new IntrinsicInfo(0x5e004000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64Sha256su0V,    new IntrinsicInfo(0x5e282800u, IntrinsicType.Vector128Unary));
-            Add(Intrinsic.Arm64Sha256su1V,    new IntrinsicInfo(0x5e006000u, IntrinsicType.Vector128Binary));
-            Add(Intrinsic.Arm64ShaddV,        new IntrinsicInfo(0x0e200400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64ShllV,         new IntrinsicInfo(0x2e213800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64ShlS,          new IntrinsicInfo(0x5f005400u, IntrinsicType.ScalarBinaryShl));
-            Add(Intrinsic.Arm64ShlV,          new IntrinsicInfo(0x0f005400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64ShrnV,         new IntrinsicInfo(0x0f008400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64ShsubV,        new IntrinsicInfo(0x0e202400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SliS,          new IntrinsicInfo(0x7f005400u, IntrinsicType.ScalarTernaryShlRd));
-            Add(Intrinsic.Arm64SliV,          new IntrinsicInfo(0x2f005400u, IntrinsicType.VectorTernaryShlRd));
-            Add(Intrinsic.Arm64SmaxpV,        new IntrinsicInfo(0x0e20a400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SmaxvV,        new IntrinsicInfo(0x0e30a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SmaxV,         new IntrinsicInfo(0x0e206400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SminpV,        new IntrinsicInfo(0x0e20ac00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SminvV,        new IntrinsicInfo(0x0e31a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SminV,         new IntrinsicInfo(0x0e206c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SmlalVe,       new IntrinsicInfo(0x0f002000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64SmlalV,        new IntrinsicInfo(0x0e208000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SmlslVe,       new IntrinsicInfo(0x0f006000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64SmlslV,        new IntrinsicInfo(0x0e20a000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SmovV,         new IntrinsicInfo(0x0e002c00u, IntrinsicType.VectorUnaryByElem));
-            Add(Intrinsic.Arm64SmullVe,       new IntrinsicInfo(0x0f00a000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SmullV,        new IntrinsicInfo(0x0e20c000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqabsS,        new IntrinsicInfo(0x5e207800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64SqabsV,        new IntrinsicInfo(0x0e207800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SqaddS,        new IntrinsicInfo(0x5e200c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqaddV,        new IntrinsicInfo(0x0e200c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqdmlalSe,     new IntrinsicInfo(0x5f003000u, IntrinsicType.ScalarBinaryByElem));
-            Add(Intrinsic.Arm64SqdmlalVe,     new IntrinsicInfo(0x0f003000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SqdmlalS,      new IntrinsicInfo(0x5e209000u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqdmlalV,      new IntrinsicInfo(0x0e209000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqdmlslSe,     new IntrinsicInfo(0x5f007000u, IntrinsicType.ScalarBinaryByElem));
-            Add(Intrinsic.Arm64SqdmlslVe,     new IntrinsicInfo(0x0f007000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SqdmlslS,      new IntrinsicInfo(0x5e20b000u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqdmlslV,      new IntrinsicInfo(0x0e20b000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqdmulhSe,     new IntrinsicInfo(0x5f00c000u, IntrinsicType.ScalarBinaryByElem));
-            Add(Intrinsic.Arm64SqdmulhVe,     new IntrinsicInfo(0x0f00c000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SqdmulhS,      new IntrinsicInfo(0x5e20b400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqdmulhV,      new IntrinsicInfo(0x0e20b400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqdmullSe,     new IntrinsicInfo(0x5f00b000u, IntrinsicType.ScalarBinaryByElem));
-            Add(Intrinsic.Arm64SqdmullVe,     new IntrinsicInfo(0x0f00b000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SqdmullS,      new IntrinsicInfo(0x5e20d000u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqdmullV,      new IntrinsicInfo(0x0e20d000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqnegS,        new IntrinsicInfo(0x7e207800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64SqnegV,        new IntrinsicInfo(0x2e207800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64SqrdmulhSe,    new IntrinsicInfo(0x5f00d000u, IntrinsicType.ScalarBinaryByElem));
-            Add(Intrinsic.Arm64SqrdmulhVe,    new IntrinsicInfo(0x0f00d000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64SqrdmulhS,     new IntrinsicInfo(0x7e20b400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqrdmulhV,     new IntrinsicInfo(0x2e20b400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqrshlS,       new IntrinsicInfo(0x5e205c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqrshlV,       new IntrinsicInfo(0x0e205c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqrshrnS,      new IntrinsicInfo(0x5f009c00u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SqrshrnV,      new IntrinsicInfo(0x0f009c00u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SqrshrunS,     new IntrinsicInfo(0x7f008c00u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SqrshrunV,     new IntrinsicInfo(0x2f008c00u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SqshluS,       new IntrinsicInfo(0x7f006400u, IntrinsicType.ScalarBinaryShl));
-            Add(Intrinsic.Arm64SqshluV,       new IntrinsicInfo(0x2f006400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64SqshlSi,       new IntrinsicInfo(0x5f007400u, IntrinsicType.ScalarBinaryShl));
-            Add(Intrinsic.Arm64SqshlVi,       new IntrinsicInfo(0x0f007400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64SqshlS,        new IntrinsicInfo(0x5e204c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqshlV,        new IntrinsicInfo(0x0e204c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqshrnS,       new IntrinsicInfo(0x5f009400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SqshrnV,       new IntrinsicInfo(0x0f009400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SqshrunS,      new IntrinsicInfo(0x7f008400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SqshrunV,      new IntrinsicInfo(0x2f008400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SqsubS,        new IntrinsicInfo(0x5e202c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SqsubV,        new IntrinsicInfo(0x0e202c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SqxtnS,        new IntrinsicInfo(0x5e214800u, IntrinsicType.ScalarBinaryRd));
-            Add(Intrinsic.Arm64SqxtnV,        new IntrinsicInfo(0x0e214800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64SqxtunS,       new IntrinsicInfo(0x7e212800u, IntrinsicType.ScalarBinaryRd));
-            Add(Intrinsic.Arm64SqxtunV,       new IntrinsicInfo(0x2e212800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64SrhaddV,       new IntrinsicInfo(0x0e201400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SriS,          new IntrinsicInfo(0x7f004400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SriV,          new IntrinsicInfo(0x2f004400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SrshlS,        new IntrinsicInfo(0x5e205400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SrshlV,        new IntrinsicInfo(0x0e205400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SrshrS,        new IntrinsicInfo(0x5f002400u, IntrinsicType.ScalarBinaryShr));
-            Add(Intrinsic.Arm64SrshrV,        new IntrinsicInfo(0x0f002400u, IntrinsicType.VectorBinaryShr));
-            Add(Intrinsic.Arm64SrsraS,        new IntrinsicInfo(0x5f003400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SrsraV,        new IntrinsicInfo(0x0f003400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SshllV,        new IntrinsicInfo(0x0f00a400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64SshlS,         new IntrinsicInfo(0x5e204400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SshlV,         new IntrinsicInfo(0x0e204400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SshrS,         new IntrinsicInfo(0x5f000400u, IntrinsicType.ScalarBinaryShr));
-            Add(Intrinsic.Arm64SshrV,         new IntrinsicInfo(0x0f000400u, IntrinsicType.VectorBinaryShr));
-            Add(Intrinsic.Arm64SsraS,         new IntrinsicInfo(0x5f001400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64SsraV,         new IntrinsicInfo(0x0f001400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64SsublV,        new IntrinsicInfo(0x0e202000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SsubwV,        new IntrinsicInfo(0x0e203000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64St1Vms,        new IntrinsicInfo(0x0c002000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64St1Vss,        new IntrinsicInfo(0x0d000000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64St2Vms,        new IntrinsicInfo(0x0c008000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64St2Vss,        new IntrinsicInfo(0x0d200000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64St3Vms,        new IntrinsicInfo(0x0c004000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64St3Vss,        new IntrinsicInfo(0x0d002000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64St4Vms,        new IntrinsicInfo(0x0c000000u, IntrinsicType.VectorLdSt));
-            Add(Intrinsic.Arm64St4Vss,        new IntrinsicInfo(0x0d202000u, IntrinsicType.VectorLdStSs));
-            Add(Intrinsic.Arm64SubhnV,        new IntrinsicInfo(0x0e206000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64SubS,          new IntrinsicInfo(0x7e208400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64SubV,          new IntrinsicInfo(0x2e208400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64SuqaddS,       new IntrinsicInfo(0x5e203800u, IntrinsicType.ScalarBinaryRd));
-            Add(Intrinsic.Arm64SuqaddV,       new IntrinsicInfo(0x0e203800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64TblV,          new IntrinsicInfo(0x0e000000u, IntrinsicType.VectorLookupTable));
-            Add(Intrinsic.Arm64TbxV,          new IntrinsicInfo(0x0e001000u, IntrinsicType.VectorLookupTable));
-            Add(Intrinsic.Arm64Trn1V,         new IntrinsicInfo(0x0e002800u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64Trn2V,         new IntrinsicInfo(0x0e006800u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UabalV,        new IntrinsicInfo(0x2e205000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64UabaV,         new IntrinsicInfo(0x2e207c00u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64UabdlV,        new IntrinsicInfo(0x2e207000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UabdV,         new IntrinsicInfo(0x2e207400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UadalpV,       new IntrinsicInfo(0x2e206800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64UaddlpV,       new IntrinsicInfo(0x2e202800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UaddlvV,       new IntrinsicInfo(0x2e303800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UaddlV,        new IntrinsicInfo(0x2e200000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UaddwV,        new IntrinsicInfo(0x2e201000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UcvtfSFixed,   new IntrinsicInfo(0x7f00e400u, IntrinsicType.ScalarFPConvFixed));
-            Add(Intrinsic.Arm64UcvtfVFixed,   new IntrinsicInfo(0x2f00e400u, IntrinsicType.VectorFPConvFixed));
-            Add(Intrinsic.Arm64UcvtfS,        new IntrinsicInfo(0x7e21d800u, IntrinsicType.ScalarUnary));
-            Add(Intrinsic.Arm64UcvtfV,        new IntrinsicInfo(0x2e21d800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UcvtfGpFixed,  new IntrinsicInfo(0x1e030000u, IntrinsicType.ScalarFPConvFixedGpr));
-            Add(Intrinsic.Arm64UcvtfGp,       new IntrinsicInfo(0x1e230000u, IntrinsicType.ScalarFPConvGpr));
-            Add(Intrinsic.Arm64UhaddV,        new IntrinsicInfo(0x2e200400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UhsubV,        new IntrinsicInfo(0x2e202400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UmaxpV,        new IntrinsicInfo(0x2e20a400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UmaxvV,        new IntrinsicInfo(0x2e30a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UmaxV,         new IntrinsicInfo(0x2e206400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UminpV,        new IntrinsicInfo(0x2e20ac00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UminvV,        new IntrinsicInfo(0x2e31a800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UminV,         new IntrinsicInfo(0x2e206c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UmlalVe,       new IntrinsicInfo(0x2f002000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64UmlalV,        new IntrinsicInfo(0x2e208000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64UmlslVe,       new IntrinsicInfo(0x2f006000u, IntrinsicType.VectorTernaryRdByElem));
-            Add(Intrinsic.Arm64UmlslV,        new IntrinsicInfo(0x2e20a000u, IntrinsicType.VectorTernaryRd));
-            Add(Intrinsic.Arm64UmovV,         new IntrinsicInfo(0x0e003c00u, IntrinsicType.VectorUnaryByElem));
-            Add(Intrinsic.Arm64UmullVe,       new IntrinsicInfo(0x2f00a000u, IntrinsicType.VectorBinaryByElem));
-            Add(Intrinsic.Arm64UmullV,        new IntrinsicInfo(0x2e20c000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UqaddS,        new IntrinsicInfo(0x7e200c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UqaddV,        new IntrinsicInfo(0x2e200c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UqrshlS,       new IntrinsicInfo(0x7e205c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UqrshlV,       new IntrinsicInfo(0x2e205c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UqrshrnS,      new IntrinsicInfo(0x7f009c00u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64UqrshrnV,      new IntrinsicInfo(0x2f009c00u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64UqshlSi,       new IntrinsicInfo(0x7f007400u, IntrinsicType.ScalarBinaryShl));
-            Add(Intrinsic.Arm64UqshlVi,       new IntrinsicInfo(0x2f007400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64UqshlS,        new IntrinsicInfo(0x7e204c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UqshlV,        new IntrinsicInfo(0x2e204c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UqshrnS,       new IntrinsicInfo(0x7f009400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64UqshrnV,       new IntrinsicInfo(0x2f009400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64UqsubS,        new IntrinsicInfo(0x7e202c00u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UqsubV,        new IntrinsicInfo(0x2e202c00u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UqxtnS,        new IntrinsicInfo(0x7e214800u, IntrinsicType.ScalarBinaryRd));
-            Add(Intrinsic.Arm64UqxtnV,        new IntrinsicInfo(0x2e214800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64UrecpeV,       new IntrinsicInfo(0x0ea1c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UrhaddV,       new IntrinsicInfo(0x2e201400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UrshlS,        new IntrinsicInfo(0x7e205400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UrshlV,        new IntrinsicInfo(0x2e205400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UrshrS,        new IntrinsicInfo(0x7f002400u, IntrinsicType.ScalarBinaryShr));
-            Add(Intrinsic.Arm64UrshrV,        new IntrinsicInfo(0x2f002400u, IntrinsicType.VectorBinaryShr));
-            Add(Intrinsic.Arm64UrsqrteV,      new IntrinsicInfo(0x2ea1c800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64UrsraS,        new IntrinsicInfo(0x7f003400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64UrsraV,        new IntrinsicInfo(0x2f003400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64UshllV,        new IntrinsicInfo(0x2f00a400u, IntrinsicType.VectorBinaryShl));
-            Add(Intrinsic.Arm64UshlS,         new IntrinsicInfo(0x7e204400u, IntrinsicType.ScalarBinary));
-            Add(Intrinsic.Arm64UshlV,         new IntrinsicInfo(0x2e204400u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UshrS,         new IntrinsicInfo(0x7f000400u, IntrinsicType.ScalarBinaryShr));
-            Add(Intrinsic.Arm64UshrV,         new IntrinsicInfo(0x2f000400u, IntrinsicType.VectorBinaryShr));
-            Add(Intrinsic.Arm64UsqaddS,       new IntrinsicInfo(0x7e203800u, IntrinsicType.ScalarBinaryRd));
-            Add(Intrinsic.Arm64UsqaddV,       new IntrinsicInfo(0x2e203800u, IntrinsicType.VectorBinaryRd));
-            Add(Intrinsic.Arm64UsraS,         new IntrinsicInfo(0x7f001400u, IntrinsicType.ScalarTernaryShrRd));
-            Add(Intrinsic.Arm64UsraV,         new IntrinsicInfo(0x2f001400u, IntrinsicType.VectorTernaryShrRd));
-            Add(Intrinsic.Arm64UsublV,        new IntrinsicInfo(0x2e202000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64UsubwV,        new IntrinsicInfo(0x2e203000u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64Uzp1V,         new IntrinsicInfo(0x0e001800u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64Uzp2V,         new IntrinsicInfo(0x0e005800u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64XtnV,          new IntrinsicInfo(0x0e212800u, IntrinsicType.VectorUnary));
-            Add(Intrinsic.Arm64Zip1V,         new IntrinsicInfo(0x0e003800u, IntrinsicType.VectorBinary));
-            Add(Intrinsic.Arm64Zip2V,         new IntrinsicInfo(0x0e007800u, IntrinsicType.VectorBinary));
-        }
-
-        private static void Add(Intrinsic intrin, IntrinsicInfo info)
-        {
-            _intrinTable[(int)intrin] = info;
-        }
-
-        public static IntrinsicInfo GetInfo(Intrinsic intrin)
-        {
-            return _intrinTable[(int)intrin];
-        }
-    }
-}

ARMeilleure/CodeGen/Arm64/PreAllocator.cs

@@ -1,940 +0,0 @@
-using ARMeilleure.CodeGen.RegisterAllocators;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-using static ARMeilleure.IntermediateRepresentation.Operation.Factory;
-
-namespace ARMeilleure.CodeGen.Arm64
-{
-    class PreAllocator
-    {
-        private class ConstantDict
-        {
-            private readonly Dictionary<(ulong, OperandType), Operand> _constants;
-
-            public ConstantDict()
-            {
-                _constants = new Dictionary<(ulong, OperandType), Operand>();
-            }
-
-            public void Add(ulong value, OperandType type, Operand local)
-            {
-                _constants.Add((value, type), local);
-            }
-
-            public bool TryGetValue(ulong value, OperandType type, out Operand local)
-            {
-                return _constants.TryGetValue((value, type), out local);
-            }
-        }
-
-        public static void RunPass(CompilerContext cctx, StackAllocator stackAlloc, out int maxCallArgs)
-        {
-            maxCallArgs = -1;
-
-            Span<Operation> buffer = default;
-
-            Operand[] preservedArgs = new Operand[CallingConvention.GetArgumentsOnRegsCount()];
-
-            for (BasicBlock block = cctx.Cfg.Blocks.First; block != null; block = block.ListNext)
-            {
-                ConstantDict constants = new ConstantDict();
-
-                Operation nextNode;
-
-                for (Operation node = block.Operations.First; node != default; node = nextNode)
-                {
-                    nextNode = node.ListNext;
-
-                    if (node.Instruction == Instruction.Phi)
-                    {
-                        continue;
-                    }
-
-                    HandleConstantRegCopy(constants, block.Operations, node);
-                    HandleDestructiveRegCopy(block.Operations, node);
-
-                    switch (node.Instruction)
-                    {
-                        case Instruction.Call:
-                            // Get the maximum number of arguments used on a call.
-                            // On windows, when a struct is returned from the call,
-                            // we also need to pass the pointer where the struct
-                            // should be written on the first argument.
-                            int argsCount = node.SourcesCount - 1;
-
-                            if (node.Destination != default && node.Destination.Type == OperandType.V128)
-                            {
-                                argsCount++;
-                            }
-
-                            if (maxCallArgs < argsCount)
-                            {
-                                maxCallArgs = argsCount;
-                            }
-
-                            // Copy values to registers expected by the function
-                            // being called, as mandated by the ABI.
-                            HandleCall(constants, block.Operations, node);
-                            break;
-                        case Instruction.CompareAndSwap:
-                        case Instruction.CompareAndSwap16:
-                        case Instruction.CompareAndSwap8:
-                            nextNode = HandleCompareAndSwap(block.Operations, node);
-                            break;
-                        case Instruction.LoadArgument:
-                            nextNode = HandleLoadArgument(cctx, ref buffer, block.Operations, preservedArgs, node);
-                            break;
-                        case Instruction.Return:
-                            HandleReturn(block.Operations, node);
-                            break;
-                        case Instruction.Tailcall:
-                            HandleTailcall(constants, block.Operations, stackAlloc, node, node);
-                            break;
-                    }
-                }
-            }
-        }
-
-        private static void HandleConstantRegCopy(ConstantDict constants, IntrusiveList<Operation> nodes, Operation node)
-        {
-            if (node.SourcesCount == 0 || IsIntrinsicWithConst(node))
-            {
-                return;
-            }
-
-            Instruction inst = node.Instruction;
-
-            Operand src1 = node.GetSource(0);
-            Operand src2;
-
-            if (src1.Kind == OperandKind.Constant)
-            {
-                if (!src1.Type.IsInteger())
-                {
-                    // Handle non-integer types (FP32, FP64 and V128).
-                    // For instructions without an immediate operand, we do the following:
-                    // - Insert a copy with the constant value (as integer) to a GPR.
-                    // - Insert a copy from the GPR to a XMM register.
-                    // - Replace the constant use with the XMM register.
-                    src1 = AddFloatConstantCopy(constants, nodes, node, src1);
-
-                    node.SetSource(0, src1);
-                }
-                else if (!HasConstSrc1(node, src1.Value))
-                {
-                    // Handle integer types.
-                    // Most ALU instructions accepts a 32-bits immediate on the second operand.
-                    // We need to ensure the following:
-                    // - If the constant is on operand 1, we need to move it.
-                    // -- But first, we try to swap operand 1 and 2 if the instruction is commutative.
-                    // -- Doing so may allow us to encode the constant as operand 2 and avoid a copy.
-                    // - If the constant is on operand 2, we check if the instruction supports it,
-                    // if not, we also add a copy. 64-bits constants are usually not supported.
-                    if (IsCommutative(node))
-                    {
-                        src2 = node.GetSource(1);
-
-                        Operand temp = src1;
-
-                        src1 = src2;
-                        src2 = temp;
-
-                        node.SetSource(0, src1);
-                        node.SetSource(1, src2);
-                    }
-
-                    if (src1.Kind == OperandKind.Constant)
-                    {
-                        src1 = AddIntConstantCopy(constants, nodes, node, src1);
-
-                        node.SetSource(0, src1);
-                    }
-                }
-            }
-
-            if (node.SourcesCount < 2)
-            {
-                return;
-            }
-
-            src2 = node.GetSource(1);
-
-            if (src2.Kind == OperandKind.Constant)
-            {
-                if (!src2.Type.IsInteger())
-                {
-                    src2 = AddFloatConstantCopy(constants, nodes, node, src2);
-
-                    node.SetSource(1, src2);
-                }
-                else if (!HasConstSrc2(inst, src2))
-                {
-                    src2 = AddIntConstantCopy(constants, nodes, node, src2);
-
-                    node.SetSource(1, src2);
-                }
-            }
-
-            if (node.SourcesCount < 3 ||
-                node.Instruction == Instruction.BranchIf ||
-                node.Instruction == Instruction.Compare ||
-                node.Instruction == Instruction.VectorInsert ||
-                node.Instruction == Instruction.VectorInsert16 ||
-                node.Instruction == Instruction.VectorInsert8)
-            {
-                return;
-            }
-
-            for (int srcIndex = 2; srcIndex < node.SourcesCount; srcIndex++)
-            {
-                Operand src = node.GetSource(srcIndex);
-
-                if (src.Kind == OperandKind.Constant)
-                {
-                    if (!src.Type.IsInteger())
-                    {
-                        src = AddFloatConstantCopy(constants, nodes, node, src);
-
-                        node.SetSource(srcIndex, src);
-                    }
-                    else
-                    {
-                        src = AddIntConstantCopy(constants, nodes, node, src);
-
-                        node.SetSource(srcIndex, src);
-                    }
-                }
-            }
-        }
-
-        private static void HandleDestructiveRegCopy(IntrusiveList<Operation> nodes, Operation node)
-        {
-            if (node.Destination == default || node.SourcesCount == 0)
-            {
-                return;
-            }
-
-            Operand dest = node.Destination;
-            Operand src1 = node.GetSource(0);
-
-            if (IsSameOperandDestSrc1(node) && src1.Kind == OperandKind.LocalVariable)
-            {
-                bool useNewLocal = false;
-
-                for (int srcIndex = 1; srcIndex < node.SourcesCount; srcIndex++)
-                {
-                    if (node.GetSource(srcIndex) == dest)
-                    {
-                        useNewLocal = true;
-
-                        break;
-                    }
-                }
-
-                if (useNewLocal)
-                {
-                    // Dest is being used as some source already, we need to use a new
-                    // local to store the temporary value, otherwise the value on dest
-                    // local would be overwritten.
-                    Operand temp = Local(dest.Type);
-
-                    nodes.AddBefore(node, Operation(Instruction.Copy, temp, src1));
-
-                    node.SetSource(0, temp);
-
-                    nodes.AddAfter(node, Operation(Instruction.Copy, dest, temp));
-
-                    node.Destination = temp;
-                }
-                else
-                {
-                    nodes.AddBefore(node, Operation(Instruction.Copy, dest, src1));
-
-                    node.SetSource(0, dest);
-                }
-            }
-        }
-
-        private static void HandleCall(ConstantDict constants, IntrusiveList<Operation> nodes, Operation node)
-        {
-            Operation operation = node;
-
-            Operand dest = operation.Destination;
-
-            List<Operand> sources = new List<Operand>
-            {
-                operation.GetSource(0)
-            };
-
-            int argsCount = operation.SourcesCount - 1;
-
-            int intMax = CallingConvention.GetArgumentsOnRegsCount();
-            int vecMax = CallingConvention.GetArgumentsOnRegsCount();
-
-            int intCount = 0;
-            int vecCount = 0;
-
-            int stackOffset = 0;
-
-            for (int index = 0; index < argsCount; index++)
-            {
-                Operand source = operation.GetSource(index + 1);
-
-                bool passOnReg;
-
-                if (source.Type.IsInteger())
-                {
-                    passOnReg = intCount < intMax;
-                }
-                else if (source.Type == OperandType.V128)
-                {
-                    passOnReg = intCount + 1 < intMax;
-                }
-                else
-                {
-                    passOnReg = vecCount < vecMax;
-                }
-
-                if (source.Type == OperandType.V128 && passOnReg)
-                {
-                    // V128 is a struct, we pass each half on a GPR if possible.
-                    Operand argReg  = Gpr(CallingConvention.GetIntArgumentRegister(intCount++), OperandType.I64);
-                    Operand argReg2 = Gpr(CallingConvention.GetIntArgumentRegister(intCount++), OperandType.I64);
-
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, argReg,  source, Const(0)));
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, argReg2, source, Const(1)));
-
-                    continue;
-                }
-
-                if (passOnReg)
-                {
-                    Operand argReg = source.Type.IsInteger()
-                        ? Gpr(CallingConvention.GetIntArgumentRegister(intCount++), source.Type)
-                        : Xmm(CallingConvention.GetVecArgumentRegister(vecCount++), source.Type);
-
-                    Operation copyOp = Operation(Instruction.Copy, argReg, source);
-
-                    HandleConstantRegCopy(constants, nodes, nodes.AddBefore(node, copyOp));
-
-                    sources.Add(argReg);
-                }
-                else
-                {
-                    Operand offset = Const(stackOffset);
-
-                    Operation spillOp = Operation(Instruction.SpillArg, default, offset, source);
-
-                    HandleConstantRegCopy(constants, nodes, nodes.AddBefore(node, spillOp));
-
-                    stackOffset += source.Type.GetSizeInBytes();
-                }
-            }
-
-            if (dest != default)
-            {
-                if (dest.Type == OperandType.V128)
-                {
-                    Operand retLReg = Gpr(CallingConvention.GetIntReturnRegister(),     OperandType.I64);
-                    Operand retHReg = Gpr(CallingConvention.GetIntReturnRegisterHigh(), OperandType.I64);
-
-                    node = nodes.AddAfter(node, Operation(Instruction.VectorCreateScalar, dest, retLReg));
-                    nodes.AddAfter(node, Operation(Instruction.VectorInsert, dest, dest, retHReg, Const(1)));
-
-                    operation.Destination = default;
-                }
-                else
-                {
-                    Operand retReg = dest.Type.IsInteger()
-                        ? Gpr(CallingConvention.GetIntReturnRegister(), dest.Type)
-                        : Xmm(CallingConvention.GetVecReturnRegister(), dest.Type);
-
-                    Operation copyOp = Operation(Instruction.Copy, dest, retReg);
-
-                    nodes.AddAfter(node, copyOp);
-
-                    operation.Destination = retReg;
-                }
-            }
-
-            operation.SetSources(sources.ToArray());
-        }
-
-        private static void HandleTailcall(
-            ConstantDict constants,
-            IntrusiveList<Operation> nodes,
-            StackAllocator stackAlloc,
-            Operation node,
-            Operation operation)
-        {
-            List<Operand> sources = new List<Operand>
-            {
-                operation.GetSource(0)
-            };
-
-            int argsCount = operation.SourcesCount - 1;
-
-            int intMax = CallingConvention.GetArgumentsOnRegsCount();
-            int vecMax = CallingConvention.GetArgumentsOnRegsCount();
-
-            int intCount = 0;
-            int vecCount = 0;
-
-            // Handle arguments passed on registers.
-            for (int index = 0; index < argsCount; index++)
-            {
-                Operand source = operation.GetSource(1 + index);
-
-                bool passOnReg;
-
-                if (source.Type.IsInteger())
-                {
-                    passOnReg = intCount + 1 < intMax;
-                }
-                else
-                {
-                    passOnReg = vecCount < vecMax;
-                }
-
-                if (source.Type == OperandType.V128 && passOnReg)
-                {
-                    // V128 is a struct, we pass each half on a GPR if possible.
-                    Operand argReg  = Gpr(CallingConvention.GetIntArgumentRegister(intCount++), OperandType.I64);
-                    Operand argReg2 = Gpr(CallingConvention.GetIntArgumentRegister(intCount++), OperandType.I64);
-
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, argReg, source, Const(0)));
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, argReg2, source, Const(1)));
-
-                    continue;
-                }
-
-                if (passOnReg)
-                {
-                    Operand argReg = source.Type.IsInteger()
-                        ? Gpr(CallingConvention.GetIntArgumentRegister(intCount++), source.Type)
-                        : Xmm(CallingConvention.GetVecArgumentRegister(vecCount++), source.Type);
-
-                    Operation copyOp = Operation(Instruction.Copy, argReg, source);
-
-                    HandleConstantRegCopy(constants, nodes, nodes.AddBefore(node, copyOp));
-
-                    sources.Add(argReg);
-                }
-                else
-                {
-                    throw new NotImplementedException("Spilling is not currently supported for tail calls. (too many arguments)");
-                }
-            }
-
-            // The target address must be on the return registers, since we
-            // don't return anything and it is guaranteed to not be a
-            // callee saved register (which would be trashed on the epilogue).
-            Operand tcAddress = Gpr(CodeGenCommon.TcAddressRegister, OperandType.I64);
-
-            Operation addrCopyOp = Operation(Instruction.Copy, tcAddress, operation.GetSource(0));
-
-            nodes.AddBefore(node, addrCopyOp);
-
-            sources[0] = tcAddress;
-
-            operation.SetSources(sources.ToArray());
-        }
-
-        private static Operation HandleCompareAndSwap(IntrusiveList<Operation> nodes, Operation node)
-        {
-            Operand expected = node.GetSource(1);
-
-            if (expected.Type == OperandType.V128)
-            {
-                Operand dest = node.Destination;
-                Operand expectedLow = Local(OperandType.I64);
-                Operand expectedHigh = Local(OperandType.I64);
-                Operand desiredLow = Local(OperandType.I64);
-                Operand desiredHigh = Local(OperandType.I64);
-                Operand actualLow = Local(OperandType.I64);
-                Operand actualHigh = Local(OperandType.I64);
-
-                Operand address = node.GetSource(0);
-                Operand desired = node.GetSource(2);
-
-                void SplitOperand(Operand source, Operand low, Operand high)
-                {
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, low, source, Const(0)));
-                    nodes.AddBefore(node, Operation(Instruction.VectorExtract, high, source, Const(1)));
-                }
-
-                SplitOperand(expected, expectedLow, expectedHigh);
-                SplitOperand(desired, desiredLow, desiredHigh);
-
-                Operation operation = node;
-
-                // Update the sources and destinations with split 64-bit halfs of the whole 128-bit values.
-                // We also need a additional registers that will be used to store temporary information.
-                operation.SetDestinations(new[] { actualLow, actualHigh, Local(OperandType.I64), Local(OperandType.I64) });
-                operation.SetSources(new[] { address, expectedLow, expectedHigh, desiredLow, desiredHigh });
-
-                // Add some dummy uses of the input operands, as the CAS operation will be a loop,
-                // so they can't be used as destination operand.
-                for (int i = 0; i < operation.SourcesCount; i++)
-                {
-                    Operand src = operation.GetSource(i);
-                    node = nodes.AddAfter(node, Operation(Instruction.Copy, src, src));
-                }
-
-                // Assemble the vector with the 64-bit values at the given memory location.
-                node = nodes.AddAfter(node, Operation(Instruction.VectorCreateScalar, dest, actualLow));
-                node = nodes.AddAfter(node, Operation(Instruction.VectorInsert, dest, dest, actualHigh, Const(1)));
-            }
-            else
-            {
-                // We need a additional register where the store result will be written to.
-                node.SetDestinations(new[] { node.Destination, Local(OperandType.I32) });
-
-                // Add some dummy uses of the input operands, as the CAS operation will be a loop,
-                // so they can't be used as destination operand.
-                Operation operation = node;
-
-                for (int i = 0; i < operation.SourcesCount; i++)
-                {
-                    Operand src = operation.GetSource(i);
-                    node = nodes.AddAfter(node, Operation(Instruction.Copy, src, src));
-                }
-            }
-
-            return node.ListNext;
-        }
-
-        private static void HandleReturn(IntrusiveList<Operation> nodes, Operation node)
-        {
-            if (node.SourcesCount == 0)
-            {
-                return;
-            }
-
-            Operand source = node.GetSource(0);
-
-            if (source.Type == OperandType.V128)
-            {
-                Operand retLReg = Gpr(CallingConvention.GetIntReturnRegister(),     OperandType.I64);
-                Operand retHReg = Gpr(CallingConvention.GetIntReturnRegisterHigh(), OperandType.I64);
-
-                nodes.AddBefore(node, Operation(Instruction.VectorExtract, retLReg, source, Const(0)));
-                nodes.AddBefore(node, Operation(Instruction.VectorExtract, retHReg, source, Const(1)));
-            }
-            else
-            {
-                Operand retReg = source.Type.IsInteger()
-                    ? Gpr(CallingConvention.GetIntReturnRegister(), source.Type)
-                    : Xmm(CallingConvention.GetVecReturnRegister(), source.Type);
-
-                Operation retCopyOp = Operation(Instruction.Copy, retReg, source);
-
-                nodes.AddBefore(node, retCopyOp);
-            }
-        }
-
-        private static Operation HandleLoadArgument(
-            CompilerContext cctx,
-            ref Span<Operation> buffer,
-            IntrusiveList<Operation> nodes,
-            Operand[] preservedArgs,
-            Operation node)
-        {
-            Operand source = node.GetSource(0);
-
-            Debug.Assert(source.Kind == OperandKind.Constant, "Non-constant LoadArgument source kind.");
-
-            int index = source.AsInt32();
-
-            int intCount = 0;
-            int vecCount = 0;
-
-            for (int cIndex = 0; cIndex < index; cIndex++)
-            {
-                OperandType argType = cctx.FuncArgTypes[cIndex];
-
-                if (argType.IsInteger())
-                {
-                    intCount++;
-                }
-                else if (argType == OperandType.V128)
-                {
-                    intCount += 2;
-                }
-                else
-                {
-                    vecCount++;
-                }
-            }
-
-            bool passOnReg;
-
-            if (source.Type.IsInteger())
-            {
-                passOnReg = intCount < CallingConvention.GetArgumentsOnRegsCount();
-            }
-            else if (source.Type == OperandType.V128)
-            {
-                passOnReg = intCount + 1 < CallingConvention.GetArgumentsOnRegsCount();
-            }
-            else
-            {
-                passOnReg = vecCount < CallingConvention.GetArgumentsOnRegsCount();
-            }
-
-            if (passOnReg)
-            {
-                Operand dest = node.Destination;
-
-                if (preservedArgs[index] == default)
-                {
-                    if (dest.Type == OperandType.V128)
-                    {
-                        // V128 is a struct, we pass each half on a GPR if possible.
-                        Operand pArg = Local(OperandType.V128);
-
-                        Operand argLReg = Gpr(CallingConvention.GetIntArgumentRegister(intCount), OperandType.I64);
-                        Operand argHReg = Gpr(CallingConvention.GetIntArgumentRegister(intCount + 1), OperandType.I64);
-
-                        Operation copyL = Operation(Instruction.VectorCreateScalar, pArg, argLReg);
-                        Operation copyH = Operation(Instruction.VectorInsert, pArg, pArg, argHReg, Const(1));
-
-                        cctx.Cfg.Entry.Operations.AddFirst(copyH);
-                        cctx.Cfg.Entry.Operations.AddFirst(copyL);
-
-                        preservedArgs[index] = pArg;
-                    }
-                    else
-                    {
-                        Operand pArg = Local(dest.Type);
-
-                        Operand argReg = dest.Type.IsInteger()
-                            ? Gpr(CallingConvention.GetIntArgumentRegister(intCount), dest.Type)
-                            : Xmm(CallingConvention.GetVecArgumentRegister(vecCount), dest.Type);
-
-                        Operation copyOp = Operation(Instruction.Copy, pArg, argReg);
-
-                        cctx.Cfg.Entry.Operations.AddFirst(copyOp);
-
-                        preservedArgs[index] = pArg;
-                    }
-                }
-
-                Operation nextNode;
-
-                if (dest.AssignmentsCount == 1)
-                {
-                    // Let's propagate the argument if we can to avoid copies.
-                    Propagate(ref buffer, dest, preservedArgs[index]);
-                    nextNode = node.ListNext;
-                }
-                else
-                {
-                    Operation argCopyOp = Operation(Instruction.Copy, dest, preservedArgs[index]);
-                    nextNode = nodes.AddBefore(node, argCopyOp);
-                }
-
-                Delete(nodes, node);
-                return nextNode;
-            }
-            else
-            {
-                // TODO: Pass on stack.
-                return node;
-            }
-        }
-
-        private static void Propagate(ref Span<Operation> buffer, Operand dest, Operand value)
-        {
-            ReadOnlySpan<Operation> uses = dest.GetUses(ref buffer);
-
-            foreach (Operation use in uses)
-            {
-                for (int srcIndex = 0; srcIndex < use.SourcesCount; srcIndex++)
-                {
-                    Operand useSrc = use.GetSource(srcIndex);
-
-                    if (useSrc == dest)
-                    {
-                        use.SetSource(srcIndex, value);
-                    }
-                    else if (useSrc.Kind == OperandKind.Memory)
-                    {
-                        MemoryOperand memoryOp = useSrc.GetMemory();
-
-                        Operand baseAddr = memoryOp.BaseAddress;
-                        Operand index = memoryOp.Index;
-                        bool changed = false;
-
-                        if (baseAddr == dest)
-                        {
-                            baseAddr = value;
-                            changed = true;
-                        }
-
-                        if (index == dest)
-                        {
-                            index = value;
-                            changed = true;
-                        }
-
-                        if (changed)
-                        {
-                            use.SetSource(srcIndex, MemoryOp(
-                                useSrc.Type,
-                                baseAddr,
-                                index,
-                                memoryOp.Scale,
-                                memoryOp.Displacement));
-                        }
-                    }
-                }
-            }
-        }
-
-        private static Operand AddFloatConstantCopy(
-            ConstantDict constants,
-            IntrusiveList<Operation> nodes,
-            Operation node,
-            Operand source)
-        {
-            Operand temp = Local(source.Type);
-
-            Operand intConst = AddIntConstantCopy(constants, nodes, node, GetIntConst(source));
-
-            Operation copyOp = Operation(Instruction.VectorCreateScalar, temp, intConst);
-
-            nodes.AddBefore(node, copyOp);
-
-            return temp;
-        }
-
-        private static Operand AddIntConstantCopy(
-            ConstantDict constants,
-            IntrusiveList<Operation> nodes,
-            Operation node,
-            Operand source)
-        {
-            if (constants.TryGetValue(source.Value, source.Type, out Operand temp))
-            {
-                return temp;
-            }
-
-            temp = Local(source.Type);
-
-            Operation copyOp = Operation(Instruction.Copy, temp, source);
-
-            nodes.AddBefore(node, copyOp);
-
-            constants.Add(source.Value, source.Type, temp);
-
-            return temp;
-        }
-
-        private static Operand GetIntConst(Operand value)
-        {
-            if (value.Type == OperandType.FP32)
-            {
-                return Const(value.AsInt32());
-            }
-            else if (value.Type == OperandType.FP64)
-            {
-                return Const(value.AsInt64());
-            }
-
-            return value;
-        }
-
-        private static void Delete(IntrusiveList<Operation> nodes, Operation node)
-        {
-            node.Destination = default;
-
-            for (int index = 0; index < node.SourcesCount; index++)
-            {
-                node.SetSource(index, default);
-            }
-
-            nodes.Remove(node);
-        }
-
-        private static Operand Gpr(int register, OperandType type)
-        {
-            return Register(register, RegisterType.Integer, type);
-        }
-
-        private static Operand Xmm(int register, OperandType type)
-        {
-            return Register(register, RegisterType.Vector, type);
-        }
-
-        private static bool IsSameOperandDestSrc1(Operation operation)
-        {
-            switch (operation.Instruction)
-            {
-                case Instruction.Extended:
-                    return IsSameOperandDestSrc1(operation.Intrinsic);
-                case Instruction.VectorInsert:
-                case Instruction.VectorInsert16:
-                case Instruction.VectorInsert8:
-                    return true;
-            }
-
-            return false;
-        }
-
-        private static bool IsSameOperandDestSrc1(Intrinsic intrinsic)
-        {
-            IntrinsicInfo info = IntrinsicTable.GetInfo(intrinsic & ~(Intrinsic.Arm64VTypeMask | Intrinsic.Arm64VSizeMask));
-
-            return info.Type == IntrinsicType.ScalarBinaryRd ||
-                   info.Type == IntrinsicType.ScalarTernaryFPRdByElem ||
-                   info.Type == IntrinsicType.ScalarTernaryShlRd ||
-                   info.Type == IntrinsicType.ScalarTernaryShrRd ||
-                   info.Type == IntrinsicType.VectorBinaryRd ||
-                   info.Type == IntrinsicType.VectorInsertByElem ||
-                   info.Type == IntrinsicType.VectorTernaryRd ||
-                   info.Type == IntrinsicType.VectorTernaryRdBitwise ||
-                   info.Type == IntrinsicType.VectorTernaryFPRdByElem ||
-                   info.Type == IntrinsicType.VectorTernaryRdByElem ||
-                   info.Type == IntrinsicType.VectorTernaryShlRd ||
-                   info.Type == IntrinsicType.VectorTernaryShrRd;
-        }
-
-        private static bool HasConstSrc1(Operation node, ulong value)
-        {
-            switch (node.Instruction)
-            {
-                case Instruction.Add:
-                case Instruction.BranchIf:
-                case Instruction.Compare:
-                case Instruction.Subtract:
-                    // The immediate encoding of those instructions does not allow Rn to be
-                    // XZR (it will be SP instead), so we can't allow a Rn constant in this case.
-                    return value == 0 && NotConstOrConst0(node.GetSource(1));
-                case Instruction.BitwiseAnd:
-                case Instruction.BitwiseExclusiveOr:
-                case Instruction.BitwiseNot:
-                case Instruction.BitwiseOr:
-                case Instruction.ByteSwap:
-                case Instruction.CountLeadingZeros:
-                case Instruction.Multiply:
-                case Instruction.Negate:
-                case Instruction.RotateRight:
-                case Instruction.ShiftLeft:
-                case Instruction.ShiftRightSI:
-                case Instruction.ShiftRightUI:
-                    return value == 0;
-                case Instruction.Copy:
-                case Instruction.LoadArgument:
-                case Instruction.Spill:
-                case Instruction.SpillArg:
-                    return true;
-                case Instruction.Extended:
-                    return value == 0;
-            }
-
-            return false;
-        }
-
-        private static bool NotConstOrConst0(Operand operand)
-        {
-            return operand.Kind != OperandKind.Constant || operand.Value == 0;
-        }
-
-        private static bool HasConstSrc2(Instruction inst, Operand operand)
-        {
-            ulong value = operand.Value;
-
-            switch (inst)
-            {
-                case Instruction.Add:
-                case Instruction.BranchIf:
-                case Instruction.Compare:
-                case Instruction.Subtract:
-                    return ConstFitsOnUImm12Sh(value);
-                case Instruction.BitwiseAnd:
-                case Instruction.BitwiseExclusiveOr:
-                case Instruction.BitwiseOr:
-                    return value == 0 || CodeGenCommon.TryEncodeBitMask(operand, out _, out _, out _);
-                case Instruction.Multiply:
-                case Instruction.Store:
-                case Instruction.Store16:
-                case Instruction.Store8:
-                    return value == 0;
-                case Instruction.RotateRight:
-                case Instruction.ShiftLeft:
-                case Instruction.ShiftRightSI:
-                case Instruction.ShiftRightUI:
-                case Instruction.VectorExtract:
-                case Instruction.VectorExtract16:
-                case Instruction.VectorExtract8:
-                    return true;
-                case Instruction.Extended:
-                    // TODO: Check if actual intrinsic is supposed to have consts here?
-                    // Right now we only hit this case for fixed-point int <-> FP conversion instructions.
-                    return true;
-            }
-
-            return false;
-        }
-
-        private static bool IsCommutative(Operation operation)
-        {
-            switch (operation.Instruction)
-            {
-                case Instruction.Add:
-                case Instruction.BitwiseAnd:
-                case Instruction.BitwiseExclusiveOr:
-                case Instruction.BitwiseOr:
-                case Instruction.Multiply:
-                    return true;
-
-                case Instruction.BranchIf:
-                case Instruction.Compare:
-                    {
-                        Operand comp = operation.GetSource(2);
-
-                        Debug.Assert(comp.Kind == OperandKind.Constant);
-
-                        var compType = (Comparison)comp.AsInt32();
-
-                        return compType == Comparison.Equal || compType == Comparison.NotEqual;
-                    }
-            }
-
-            return false;
-        }
-
-        private static bool ConstFitsOnUImm12Sh(ulong value)
-        {
-            return (value & ~0xfffUL) == 0 || (value & ~0xfff000UL) == 0;
-        }
-
-        private static bool IsIntrinsicWithConst(Operation operation)
-        {
-            bool isIntrinsic = IsIntrinsic(operation.Instruction);
-
-            if (isIntrinsic)
-            {
-                Intrinsic intrinsic = operation.Intrinsic;
-                IntrinsicInfo info = IntrinsicTable.GetInfo(intrinsic & ~(Intrinsic.Arm64VTypeMask | Intrinsic.Arm64VSizeMask));
-
-                // Those have integer inputs that don't support consts.
-                return info.Type != IntrinsicType.ScalarFPConvGpr &&
-                       info.Type != IntrinsicType.ScalarFPConvFixedGpr &&
-                       info.Type != IntrinsicType.SetRegister;
-            }
-
-            return false;
-        }
-
-        private static bool IsIntrinsic(Instruction inst)
-        {
-            return inst == Instruction.Extended;
-        }
-    }
-}

ARMeilleure/CodeGen/X86/AssemblerTable.cs

@@ -1,291 +0,0 @@
-using System;
-
-namespace ARMeilleure.CodeGen.X86
-{
-    partial class Assembler
-    {
-        public static bool SupportsVexPrefix(X86Instruction inst)
-        {
-            return _instTable[(int)inst].Flags.HasFlag(InstructionFlags.Vex);
-        }
-
-        private const int BadOp = 0;
-
-        [Flags]
-        private enum InstructionFlags
-        {
-            None     = 0,
-            RegOnly  = 1 << 0,
-            Reg8Src  = 1 << 1,
-            Reg8Dest = 1 << 2,
-            RexW     = 1 << 3,
-            Vex      = 1 << 4,
-
-            PrefixBit  = 16,
-            PrefixMask = 7 << PrefixBit,
-            Prefix66   = 1 << PrefixBit,
-            PrefixF3   = 2 << PrefixBit,
-            PrefixF2   = 4 << PrefixBit
-        }
-
-        private readonly struct InstructionInfo
-        {
-            public int OpRMR     { get; }
-            public int OpRMImm8  { get; }
-            public int OpRMImm32 { get; }
-            public int OpRImm64  { get; }
-            public int OpRRM     { get; }
-
-            public InstructionFlags Flags { get; }
-
-            public InstructionInfo(
-                int              opRMR,
-                int              opRMImm8,
-                int              opRMImm32,
-                int              opRImm64,
-                int              opRRM,
-                InstructionFlags flags)
-            {
-                OpRMR     = opRMR;
-                OpRMImm8  = opRMImm8;
-                OpRMImm32 = opRMImm32;
-                OpRImm64  = opRImm64;
-                OpRRM     = opRRM;
-                Flags     = flags;
-            }
-        }
-
-        private readonly static InstructionInfo[] _instTable;
-
-        static Assembler()
-        {
-            _instTable = new InstructionInfo[(int)X86Instruction.Count];
-
-            //  Name                                             RM/R        RM/I8       RM/I32      R/I64       R/RM        Flags
-            Add(X86Instruction.Add,           new InstructionInfo(0x00000001, 0x00000083, 0x00000081, BadOp,      0x00000003, InstructionFlags.None));
-            Add(X86Instruction.Addpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f58, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Addps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f58, InstructionFlags.Vex));
-            Add(X86Instruction.Addsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f58, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Addss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f58, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Aesdec,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38de, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Aesdeclast,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38df, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Aesenc,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38dc, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Aesenclast,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38dd, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Aesimc,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38db, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.And,           new InstructionInfo(0x00000021, 0x04000083, 0x04000081, BadOp,      0x00000023, InstructionFlags.None));
-            Add(X86Instruction.Andnpd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f55, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Andnps,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f55, InstructionFlags.Vex));
-            Add(X86Instruction.Andpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f54, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Andps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f54, InstructionFlags.Vex));
-            Add(X86Instruction.Blendvpd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3815, InstructionFlags.Prefix66));
-            Add(X86Instruction.Blendvps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3814, InstructionFlags.Prefix66));
-            Add(X86Instruction.Bsr,           new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fbd, InstructionFlags.None));
-            Add(X86Instruction.Bswap,         new InstructionInfo(0x00000fc8, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.RegOnly));
-            Add(X86Instruction.Call,          new InstructionInfo(0x020000ff, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Cmovcc,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f40, InstructionFlags.None));
-            Add(X86Instruction.Cmp,           new InstructionInfo(0x00000039, 0x07000083, 0x07000081, BadOp,      0x0000003b, InstructionFlags.None));
-            Add(X86Instruction.Cmppd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc2, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Cmpps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc2, InstructionFlags.Vex));
-            Add(X86Instruction.Cmpsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc2, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Cmpss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc2, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Cmpxchg,       new InstructionInfo(0x00000fb1, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Cmpxchg16b,    new InstructionInfo(0x01000fc7, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.RexW));
-            Add(X86Instruction.Cmpxchg8,      new InstructionInfo(0x00000fb0, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Reg8Src));
-            Add(X86Instruction.Comisd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2f, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Comiss,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2f, InstructionFlags.Vex));
-            Add(X86Instruction.Crc32,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38f1, InstructionFlags.PrefixF2));
-            Add(X86Instruction.Crc32_16,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38f1, InstructionFlags.PrefixF2 | InstructionFlags.Prefix66));
-            Add(X86Instruction.Crc32_8,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38f0, InstructionFlags.PrefixF2 | InstructionFlags.Reg8Src));
-            Add(X86Instruction.Cvtdq2pd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fe6, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Cvtdq2ps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5b, InstructionFlags.Vex));
-            Add(X86Instruction.Cvtpd2dq,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fe6, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Cvtpd2ps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5a, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Cvtps2dq,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5b, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Cvtps2pd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5a, InstructionFlags.Vex));
-            Add(X86Instruction.Cvtsd2si,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2d, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Cvtsd2ss,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5a, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Cvtsi2sd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2a, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Cvtsi2ss,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2a, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Cvtss2sd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5a, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Cvtss2si,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f2d, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Div,           new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x060000f7, InstructionFlags.None));
-            Add(X86Instruction.Divpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5e, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Divps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5e, InstructionFlags.Vex));
-            Add(X86Instruction.Divsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5e, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Divss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5e, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Gf2p8affineqb, new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3ace, InstructionFlags.Prefix66));
-            Add(X86Instruction.Haddpd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f7c, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Haddps,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f7c, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Idiv,          new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x070000f7, InstructionFlags.None));
-            Add(X86Instruction.Imul,          new InstructionInfo(BadOp,      0x0000006b, 0x00000069, BadOp,      0x00000faf, InstructionFlags.None));
-            Add(X86Instruction.Imul128,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x050000f7, InstructionFlags.None));
-            Add(X86Instruction.Insertps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a21, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Jmp,           new InstructionInfo(0x040000ff, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Ldmxcsr,       new InstructionInfo(0x02000fae, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex));
-            Add(X86Instruction.Lea,           new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x0000008d, InstructionFlags.None));
-            Add(X86Instruction.Maxpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5f, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Maxps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5f, InstructionFlags.Vex));
-            Add(X86Instruction.Maxsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5f, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Maxss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5f, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Minpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5d, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Minps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5d, InstructionFlags.Vex));
-            Add(X86Instruction.Minsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5d, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Minss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5d, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Mov,           new InstructionInfo(0x00000089, BadOp,      0x000000c7, 0x000000b8, 0x0000008b, InstructionFlags.None));
-            Add(X86Instruction.Mov16,         new InstructionInfo(0x00000089, BadOp,      0x000000c7, BadOp,      0x0000008b, InstructionFlags.Prefix66));
-            Add(X86Instruction.Mov8,          new InstructionInfo(0x00000088, 0x000000c6, BadOp,      BadOp,      0x0000008a, InstructionFlags.Reg8Src | InstructionFlags.Reg8Dest));
-            Add(X86Instruction.Movd,          new InstructionInfo(0x00000f7e, BadOp,      BadOp,      BadOp,      0x00000f6e, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Movdqu,        new InstructionInfo(0x00000f7f, BadOp,      BadOp,      BadOp,      0x00000f6f, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Movhlps,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f12, InstructionFlags.Vex));
-            Add(X86Instruction.Movlhps,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f16, InstructionFlags.Vex));
-            Add(X86Instruction.Movq,          new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f7e, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Movsd,         new InstructionInfo(0x00000f11, BadOp,      BadOp,      BadOp,      0x00000f10, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Movss,         new InstructionInfo(0x00000f11, BadOp,      BadOp,      BadOp,      0x00000f10, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Movsx16,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fbf, InstructionFlags.None));
-            Add(X86Instruction.Movsx32,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000063, InstructionFlags.None));
-            Add(X86Instruction.Movsx8,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fbe, InstructionFlags.Reg8Src));
-            Add(X86Instruction.Movzx16,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fb7, InstructionFlags.None));
-            Add(X86Instruction.Movzx8,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fb6, InstructionFlags.Reg8Src));
-            Add(X86Instruction.Mul128,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x040000f7, InstructionFlags.None));
-            Add(X86Instruction.Mulpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f59, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Mulps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f59, InstructionFlags.Vex));
-            Add(X86Instruction.Mulsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f59, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Mulss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f59, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Neg,           new InstructionInfo(0x030000f7, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Not,           new InstructionInfo(0x020000f7, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Or,            new InstructionInfo(0x00000009, 0x01000083, 0x01000081, BadOp,      0x0000000b, InstructionFlags.None));
-            Add(X86Instruction.Paddb,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ffc, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Paddd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ffe, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Paddq,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fd4, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Paddw,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ffd, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Palignr,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a0f, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pand,          new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fdb, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pandn,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fdf, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pavgb,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fe0, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pavgw,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fe3, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pblendvb,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3810, InstructionFlags.Prefix66));
-            Add(X86Instruction.Pclmulqdq,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a44, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpeqb,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f74, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpeqd,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f76, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpeqq,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3829, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpeqw,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f75, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpgtb,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f64, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpgtd,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f66, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpgtq,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3837, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pcmpgtw,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f65, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pextrb,        new InstructionInfo(0x000f3a14, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pextrd,        new InstructionInfo(0x000f3a16, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pextrq,        new InstructionInfo(0x000f3a16, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.RexW | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pextrw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc5, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pinsrb,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a20, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pinsrd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a22, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pinsrq,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a22, InstructionFlags.Vex | InstructionFlags.RexW | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pinsrw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc4, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxsb,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383c, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxsd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383d, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxsw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fee, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxub,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fde, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxud,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383f, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmaxuw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383e, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminsb,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3838, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminsd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3839, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminsw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fea, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminub,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fda, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminud,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383b, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pminuw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f383a, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovsxbw,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3820, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovsxdq,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3825, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovsxwd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3823, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovzxbw,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3830, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovzxdq,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3835, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmovzxwd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3833, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmulld,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3840, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pmullw,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fd5, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pop,           new InstructionInfo(0x0000008f, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Popcnt,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fb8, InstructionFlags.PrefixF3));
-            Add(X86Instruction.Por,           new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000feb, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pshufb,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3800, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pshufd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f70, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pslld,         new InstructionInfo(BadOp,      0x06000f72, BadOp,      BadOp,      0x00000ff2, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Pslldq,        new InstructionInfo(BadOp,      0x07000f73, BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psllq,         new InstructionInfo(BadOp,      0x06000f73, BadOp,      BadOp,      0x00000ff3, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psllw,         new InstructionInfo(BadOp,      0x06000f71, BadOp,      BadOp,      0x00000ff1, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psrad,         new InstructionInfo(BadOp,      0x04000f72, BadOp,      BadOp,      0x00000fe2, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psraw,         new InstructionInfo(BadOp,      0x04000f71, BadOp,      BadOp,      0x00000fe1, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psrld,         new InstructionInfo(BadOp,      0x02000f72, BadOp,      BadOp,      0x00000fd2, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psrlq,         new InstructionInfo(BadOp,      0x02000f73, BadOp,      BadOp,      0x00000fd3, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psrldq,        new InstructionInfo(BadOp,      0x03000f73, BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psrlw,         new InstructionInfo(BadOp,      0x02000f71, BadOp,      BadOp,      0x00000fd1, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psubb,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ff8, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psubd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ffa, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psubq,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ffb, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Psubw,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000ff9, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpckhbw,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f68, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpckhdq,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f6a, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpckhqdq,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f6d, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpckhwd,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f69, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpcklbw,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f60, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpckldq,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f62, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpcklqdq,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f6c, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Punpcklwd,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f61, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Push,          new InstructionInfo(BadOp,      0x0000006a, 0x00000068, BadOp,      0x060000ff, InstructionFlags.None));
-            Add(X86Instruction.Pxor,          new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fef, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Rcpps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f53, InstructionFlags.Vex));
-            Add(X86Instruction.Rcpss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f53, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Ror,           new InstructionInfo(0x010000d3, 0x010000c1, BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Roundpd,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a09, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Roundps,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a08, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Roundsd,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a0b, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Roundss,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a0a, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Rsqrtps,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f52, InstructionFlags.Vex));
-            Add(X86Instruction.Rsqrtss,       new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f52, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Sar,           new InstructionInfo(0x070000d3, 0x070000c1, BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Setcc,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f90, InstructionFlags.Reg8Dest));
-            Add(X86Instruction.Sha256Msg1,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38cc, InstructionFlags.None));
-            Add(X86Instruction.Sha256Msg2,    new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38cd, InstructionFlags.None));
-            Add(X86Instruction.Sha256Rnds2,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38cb, InstructionFlags.None));
-            Add(X86Instruction.Shl,           new InstructionInfo(0x040000d3, 0x040000c1, BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Shr,           new InstructionInfo(0x050000d3, 0x050000c1, BadOp,      BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Shufpd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc6, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Shufps,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000fc6, InstructionFlags.Vex));
-            Add(X86Instruction.Sqrtpd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f51, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Sqrtps,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f51, InstructionFlags.Vex));
-            Add(X86Instruction.Sqrtsd,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f51, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Sqrtss,        new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f51, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Stmxcsr,       new InstructionInfo(0x03000fae, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex));
-            Add(X86Instruction.Sub,           new InstructionInfo(0x00000029, 0x05000083, 0x05000081, BadOp,      0x0000002b, InstructionFlags.None));
-            Add(X86Instruction.Subpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5c, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Subps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5c, InstructionFlags.Vex));
-            Add(X86Instruction.Subsd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5c, InstructionFlags.Vex | InstructionFlags.PrefixF2));
-            Add(X86Instruction.Subss,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f5c, InstructionFlags.Vex | InstructionFlags.PrefixF3));
-            Add(X86Instruction.Test,          new InstructionInfo(0x00000085, BadOp,      0x000000f7, BadOp,      BadOp,      InstructionFlags.None));
-            Add(X86Instruction.Unpckhpd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f15, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Unpckhps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f15, InstructionFlags.Vex));
-            Add(X86Instruction.Unpcklpd,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f14, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Unpcklps,      new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f14, InstructionFlags.Vex));
-            Add(X86Instruction.Vblendvpd,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a4b, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vblendvps,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a4a, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vcvtph2ps,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3813, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vcvtps2ph,     new InstructionInfo(0x000f3a1d, BadOp,      BadOp,      BadOp,      BadOp,      InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfmadd231ps,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38b8, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfmadd231sd,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38b9, InstructionFlags.Vex | InstructionFlags.Prefix66 | InstructionFlags.RexW));
-            Add(X86Instruction.Vfmadd231ss,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38b9, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfmsub231sd,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bb, InstructionFlags.Vex | InstructionFlags.Prefix66 | InstructionFlags.RexW));
-            Add(X86Instruction.Vfmsub231ss,   new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bb, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfnmadd231ps,  new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bc, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfnmadd231sd,  new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bd, InstructionFlags.Vex | InstructionFlags.Prefix66 | InstructionFlags.RexW));
-            Add(X86Instruction.Vfnmadd231ss,  new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bd, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vfnmsub231sd,  new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bf, InstructionFlags.Vex | InstructionFlags.Prefix66 | InstructionFlags.RexW));
-            Add(X86Instruction.Vfnmsub231ss,  new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f38bf, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Vpblendvb,     new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x000f3a4c, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Xor,           new InstructionInfo(0x00000031, 0x06000083, 0x06000081, BadOp,      0x00000033, InstructionFlags.None));
-            Add(X86Instruction.Xorpd,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f57, InstructionFlags.Vex | InstructionFlags.Prefix66));
-            Add(X86Instruction.Xorps,         new InstructionInfo(BadOp,      BadOp,      BadOp,      BadOp,      0x00000f57, InstructionFlags.Vex));
-
-            static void Add(X86Instruction inst, in InstructionInfo info)
-            {
-                _instTable[(int)inst] = info;
-            }
-        }
-    }
-}

ARMeilleure/CodeGen/X86/CodeGenContext.cs

@@ -1,104 +0,0 @@
-using ARMeilleure.CodeGen.RegisterAllocators;
-using ARMeilleure.IntermediateRepresentation;
-using System.IO;
-using System.Numerics;
-
-namespace ARMeilleure.CodeGen.X86
-{
-    class CodeGenContext
-    {
-        private readonly Stream _stream;
-        private readonly Operand[] _blockLabels;
-
-        public int StreamOffset => (int)_stream.Length;
-
-        public AllocationResult AllocResult { get; }
-
-        public Assembler Assembler { get; }
-        public BasicBlock CurrBlock { get; private set; }
-
-        public int CallArgsRegionSize { get; }
-        public int XmmSaveRegionSize { get; }
-
-        public CodeGenContext(AllocationResult allocResult, int maxCallArgs, int blocksCount, bool relocatable)
-        {
-            _stream = new MemoryStream();
-            _blockLabels = new Operand[blocksCount];
-
-            AllocResult = allocResult;
-            Assembler = new Assembler(_stream, relocatable);
-
-            CallArgsRegionSize = GetCallArgsRegionSize(allocResult, maxCallArgs, out int xmmSaveRegionSize);
-            XmmSaveRegionSize  = xmmSaveRegionSize;
-        }
-
-        private static int GetCallArgsRegionSize(AllocationResult allocResult, int maxCallArgs, out int xmmSaveRegionSize)
-        {
-            // We need to add 8 bytes to the total size, as the call to this function already pushed 8 bytes (the
-            // return address).
-            int intMask = CallingConvention.GetIntCalleeSavedRegisters() & allocResult.IntUsedRegisters;
-            int vecMask = CallingConvention.GetVecCalleeSavedRegisters() & allocResult.VecUsedRegisters;
-
-            xmmSaveRegionSize = BitOperations.PopCount((uint)vecMask) * 16;
-
-            int calleeSaveRegionSize = BitOperations.PopCount((uint)intMask) * 8 + xmmSaveRegionSize + 8;
-
-            int argsCount = maxCallArgs;
-
-            if (argsCount < 0)
-            {
-                // When the function has no calls, argsCount is -1. In this case, we don't need to allocate the shadow
-                // space.
-                argsCount = 0;
-            }
-            else if (argsCount < 4)
-            {
-                // The ABI mandates that the space for at least 4 arguments is reserved on the stack (this is called
-                // shadow space).
-                argsCount = 4;
-            }
-
-            // TODO: Align XMM save region to 16 bytes because unwinding on Windows requires it.
-            int frameSize = calleeSaveRegionSize + allocResult.SpillRegionSize;
-
-            // TODO: Instead of always multiplying by 16 (the largest possible size of a variable, since a V128 has 16
-            // bytes), we should calculate the exact size consumed by the arguments passed to the called functions on
-            // the stack.
-            int callArgsAndFrameSize = frameSize + argsCount * 16;
-
-            // Ensure that the Stack Pointer will be aligned to 16 bytes.
-            callArgsAndFrameSize = (callArgsAndFrameSize + 0xf) & ~0xf;
-
-            return callArgsAndFrameSize - frameSize;
-        }
-
-        public void EnterBlock(BasicBlock block)
-        {
-            Assembler.MarkLabel(GetLabel(block));
-
-            CurrBlock = block;
-        }
-
-        public void JumpTo(BasicBlock target)
-        {
-            Assembler.Jmp(GetLabel(target));
-        }
-
-        public void JumpTo(X86Condition condition, BasicBlock target)
-        {
-            Assembler.Jcc(condition, GetLabel(target));
-        }
-
-        private Operand GetLabel(BasicBlock block)
-        {
-            ref Operand label = ref _blockLabels[block.Index];
-
-            if (label == default)
-            {
-                label = Operand.Factory.Label();
-            }
-
-            return label;
-        }
-    }
-}

ARMeilleure/CodeGen/X86/HardwareCapabilities.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Runtime.Intrinsics.X86;
-
-namespace ARMeilleure.CodeGen.X86
-{
-    static class HardwareCapabilities
-    {
-        static HardwareCapabilities()
-        {
-            if (!X86Base.IsSupported)
-            {
-                return;
-            }
-
-            (int maxNum, _, _, _) = X86Base.CpuId(0x00000000, 0x00000000);
-
-            (_, _, int ecx1, int edx1) = X86Base.CpuId(0x00000001, 0x00000000);
-            FeatureInfo1Edx = (FeatureFlags1Edx)edx1;
-            FeatureInfo1Ecx = (FeatureFlags1Ecx)ecx1;
-
-            if (maxNum >= 7)
-            {
-                (_, int ebx7, int ecx7, _) = X86Base.CpuId(0x00000007, 0x00000000);
-                FeatureInfo7Ebx = (FeatureFlags7Ebx)ebx7;
-                FeatureInfo7Ecx = (FeatureFlags7Ecx)ecx7;
-            }
-        }
-
-        [Flags]
-        public enum FeatureFlags1Edx
-        {
-            Sse = 1 << 25,
-            Sse2 = 1 << 26
-        }
-
-        [Flags]
-        public enum FeatureFlags1Ecx
-        {
-            Sse3 = 1 << 0,
-            Pclmulqdq = 1 << 1,
-            Ssse3 = 1 << 9,
-            Fma = 1 << 12,
-            Sse41 = 1 << 19,
-            Sse42 = 1 << 20,
-            Popcnt = 1 << 23,
-            Aes = 1 << 25,
-            Avx = 1 << 28,
-            F16c = 1 << 29
-        }
-
-        [Flags]
-        public enum FeatureFlags7Ebx
-        {
-            Avx2 = 1 << 5,
-            Sha = 1 << 29
-        }
-
-        [Flags]
-        public enum FeatureFlags7Ecx
-        {
-            Gfni = 1 << 8,
-        }
-
-        public static FeatureFlags1Edx FeatureInfo1Edx { get; }
-        public static FeatureFlags1Ecx FeatureInfo1Ecx { get; }
-        public static FeatureFlags7Ebx FeatureInfo7Ebx { get; } = 0;
-        public static FeatureFlags7Ecx FeatureInfo7Ecx { get; } = 0;
-
-        public static bool SupportsSse => FeatureInfo1Edx.HasFlag(FeatureFlags1Edx.Sse);
-        public static bool SupportsSse2 => FeatureInfo1Edx.HasFlag(FeatureFlags1Edx.Sse2);
-        public static bool SupportsSse3 => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Sse3);
-        public static bool SupportsPclmulqdq => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Pclmulqdq);
-        public static bool SupportsSsse3 => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Ssse3);
-        public static bool SupportsFma => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Fma);
-        public static bool SupportsSse41 => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Sse41);
-        public static bool SupportsSse42 => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Sse42);
-        public static bool SupportsPopcnt => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Popcnt);
-        public static bool SupportsAesni => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Aes);
-        public static bool SupportsAvx => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.Avx);
-        public static bool SupportsAvx2 => FeatureInfo7Ebx.HasFlag(FeatureFlags7Ebx.Avx2) && SupportsAvx;
-        public static bool SupportsF16c => FeatureInfo1Ecx.HasFlag(FeatureFlags1Ecx.F16c);
-        public static bool SupportsSha => FeatureInfo7Ebx.HasFlag(FeatureFlags7Ebx.Sha);
-        public static bool SupportsGfni => FeatureInfo7Ecx.HasFlag(FeatureFlags7Ecx.Gfni);
-
-        public static bool ForceLegacySse { get; set; }
-
-        public static bool SupportsVexEncoding => SupportsAvx && !ForceLegacySse;
-    }
-}

ARMeilleure/CodeGen/X86/IntrinsicTable.cs

@@ -1,197 +0,0 @@
-using ARMeilleure.Common;
-using ARMeilleure.IntermediateRepresentation;
-
-namespace ARMeilleure.CodeGen.X86
-{
-    static class IntrinsicTable
-    {
-        private static IntrinsicInfo[] _intrinTable;
-
-        static IntrinsicTable()
-        {
-            _intrinTable = new IntrinsicInfo[EnumUtils.GetCount(typeof(Intrinsic))];
-
-            Add(Intrinsic.X86Addpd,         new IntrinsicInfo(X86Instruction.Addpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Addps,         new IntrinsicInfo(X86Instruction.Addps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Addsd,         new IntrinsicInfo(X86Instruction.Addsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Addss,         new IntrinsicInfo(X86Instruction.Addss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Aesdec,        new IntrinsicInfo(X86Instruction.Aesdec,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Aesdeclast,    new IntrinsicInfo(X86Instruction.Aesdeclast,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Aesenc,        new IntrinsicInfo(X86Instruction.Aesenc,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Aesenclast,    new IntrinsicInfo(X86Instruction.Aesenclast,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Aesimc,        new IntrinsicInfo(X86Instruction.Aesimc,        IntrinsicType.Unary));
-            Add(Intrinsic.X86Andnpd,        new IntrinsicInfo(X86Instruction.Andnpd,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Andnps,        new IntrinsicInfo(X86Instruction.Andnps,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Andpd,         new IntrinsicInfo(X86Instruction.Andpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Andps,         new IntrinsicInfo(X86Instruction.Andps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Blendvpd,      new IntrinsicInfo(X86Instruction.Blendvpd,      IntrinsicType.Ternary));
-            Add(Intrinsic.X86Blendvps,      new IntrinsicInfo(X86Instruction.Blendvps,      IntrinsicType.Ternary));
-            Add(Intrinsic.X86Cmppd,         new IntrinsicInfo(X86Instruction.Cmppd,         IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Cmpps,         new IntrinsicInfo(X86Instruction.Cmpps,         IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Cmpsd,         new IntrinsicInfo(X86Instruction.Cmpsd,         IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Cmpss,         new IntrinsicInfo(X86Instruction.Cmpss,         IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Comisdeq,      new IntrinsicInfo(X86Instruction.Comisd,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Comisdge,      new IntrinsicInfo(X86Instruction.Comisd,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Comisdlt,      new IntrinsicInfo(X86Instruction.Comisd,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Comisseq,      new IntrinsicInfo(X86Instruction.Comiss,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Comissge,      new IntrinsicInfo(X86Instruction.Comiss,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Comisslt,      new IntrinsicInfo(X86Instruction.Comiss,        IntrinsicType.Comis_));
-            Add(Intrinsic.X86Crc32,         new IntrinsicInfo(X86Instruction.Crc32,         IntrinsicType.Crc32));
-            Add(Intrinsic.X86Crc32_16,      new IntrinsicInfo(X86Instruction.Crc32_16,      IntrinsicType.Crc32));
-            Add(Intrinsic.X86Crc32_8,       new IntrinsicInfo(X86Instruction.Crc32_8,       IntrinsicType.Crc32));
-            Add(Intrinsic.X86Cvtdq2pd,      new IntrinsicInfo(X86Instruction.Cvtdq2pd,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtdq2ps,      new IntrinsicInfo(X86Instruction.Cvtdq2ps,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtpd2dq,      new IntrinsicInfo(X86Instruction.Cvtpd2dq,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtpd2ps,      new IntrinsicInfo(X86Instruction.Cvtpd2ps,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtps2dq,      new IntrinsicInfo(X86Instruction.Cvtps2dq,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtps2pd,      new IntrinsicInfo(X86Instruction.Cvtps2pd,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Cvtsd2si,      new IntrinsicInfo(X86Instruction.Cvtsd2si,      IntrinsicType.UnaryToGpr));
-            Add(Intrinsic.X86Cvtsd2ss,      new IntrinsicInfo(X86Instruction.Cvtsd2ss,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Cvtsi2sd,      new IntrinsicInfo(X86Instruction.Cvtsi2sd,      IntrinsicType.BinaryGpr));
-            Add(Intrinsic.X86Cvtsi2si,      new IntrinsicInfo(X86Instruction.Movd,          IntrinsicType.UnaryToGpr));
-            Add(Intrinsic.X86Cvtsi2ss,      new IntrinsicInfo(X86Instruction.Cvtsi2ss,      IntrinsicType.BinaryGpr));
-            Add(Intrinsic.X86Cvtss2sd,      new IntrinsicInfo(X86Instruction.Cvtss2sd,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Cvtss2si,      new IntrinsicInfo(X86Instruction.Cvtss2si,      IntrinsicType.UnaryToGpr));
-            Add(Intrinsic.X86Divpd,         new IntrinsicInfo(X86Instruction.Divpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Divps,         new IntrinsicInfo(X86Instruction.Divps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Divsd,         new IntrinsicInfo(X86Instruction.Divsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Divss,         new IntrinsicInfo(X86Instruction.Divss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Gf2p8affineqb, new IntrinsicInfo(X86Instruction.Gf2p8affineqb, IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Haddpd,        new IntrinsicInfo(X86Instruction.Haddpd,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Haddps,        new IntrinsicInfo(X86Instruction.Haddps,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Insertps,      new IntrinsicInfo(X86Instruction.Insertps,      IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Maxpd,         new IntrinsicInfo(X86Instruction.Maxpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Maxps,         new IntrinsicInfo(X86Instruction.Maxps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Maxsd,         new IntrinsicInfo(X86Instruction.Maxsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Maxss,         new IntrinsicInfo(X86Instruction.Maxss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Minpd,         new IntrinsicInfo(X86Instruction.Minpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Minps,         new IntrinsicInfo(X86Instruction.Minps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Minsd,         new IntrinsicInfo(X86Instruction.Minsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Minss,         new IntrinsicInfo(X86Instruction.Minss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Movhlps,       new IntrinsicInfo(X86Instruction.Movhlps,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Movlhps,       new IntrinsicInfo(X86Instruction.Movlhps,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Movss,         new IntrinsicInfo(X86Instruction.Movss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Mulpd,         new IntrinsicInfo(X86Instruction.Mulpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Mulps,         new IntrinsicInfo(X86Instruction.Mulps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Mulsd,         new IntrinsicInfo(X86Instruction.Mulsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Mulss,         new IntrinsicInfo(X86Instruction.Mulss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Mxcsrmb,       new IntrinsicInfo(X86Instruction.None,          IntrinsicType.Mxcsr)); // Mask bits.
-            Add(Intrinsic.X86Mxcsrub,       new IntrinsicInfo(X86Instruction.None,          IntrinsicType.Mxcsr)); // Unmask bits.
-            Add(Intrinsic.X86Paddb,         new IntrinsicInfo(X86Instruction.Paddb,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Paddd,         new IntrinsicInfo(X86Instruction.Paddd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Paddq,         new IntrinsicInfo(X86Instruction.Paddq,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Paddw,         new IntrinsicInfo(X86Instruction.Paddw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Palignr,       new IntrinsicInfo(X86Instruction.Palignr,       IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Pand,          new IntrinsicInfo(X86Instruction.Pand,          IntrinsicType.Binary));
-            Add(Intrinsic.X86Pandn,         new IntrinsicInfo(X86Instruction.Pandn,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Pavgb,         new IntrinsicInfo(X86Instruction.Pavgb,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Pavgw,         new IntrinsicInfo(X86Instruction.Pavgw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Pblendvb,      new IntrinsicInfo(X86Instruction.Pblendvb,      IntrinsicType.Ternary));
-            Add(Intrinsic.X86Pclmulqdq,     new IntrinsicInfo(X86Instruction.Pclmulqdq,     IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Pcmpeqb,       new IntrinsicInfo(X86Instruction.Pcmpeqb,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpeqd,       new IntrinsicInfo(X86Instruction.Pcmpeqd,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpeqq,       new IntrinsicInfo(X86Instruction.Pcmpeqq,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpeqw,       new IntrinsicInfo(X86Instruction.Pcmpeqw,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpgtb,       new IntrinsicInfo(X86Instruction.Pcmpgtb,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpgtd,       new IntrinsicInfo(X86Instruction.Pcmpgtd,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpgtq,       new IntrinsicInfo(X86Instruction.Pcmpgtq,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pcmpgtw,       new IntrinsicInfo(X86Instruction.Pcmpgtw,       IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxsb,        new IntrinsicInfo(X86Instruction.Pmaxsb,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxsd,        new IntrinsicInfo(X86Instruction.Pmaxsd,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxsw,        new IntrinsicInfo(X86Instruction.Pmaxsw,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxub,        new IntrinsicInfo(X86Instruction.Pmaxub,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxud,        new IntrinsicInfo(X86Instruction.Pmaxud,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmaxuw,        new IntrinsicInfo(X86Instruction.Pmaxuw,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminsb,        new IntrinsicInfo(X86Instruction.Pminsb,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminsd,        new IntrinsicInfo(X86Instruction.Pminsd,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminsw,        new IntrinsicInfo(X86Instruction.Pminsw,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminub,        new IntrinsicInfo(X86Instruction.Pminub,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminud,        new IntrinsicInfo(X86Instruction.Pminud,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pminuw,        new IntrinsicInfo(X86Instruction.Pminuw,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmovsxbw,      new IntrinsicInfo(X86Instruction.Pmovsxbw,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmovsxdq,      new IntrinsicInfo(X86Instruction.Pmovsxdq,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmovsxwd,      new IntrinsicInfo(X86Instruction.Pmovsxwd,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmovzxbw,      new IntrinsicInfo(X86Instruction.Pmovzxbw,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmovzxdq,      new IntrinsicInfo(X86Instruction.Pmovzxdq,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmovzxwd,      new IntrinsicInfo(X86Instruction.Pmovzxwd,      IntrinsicType.Unary));
-            Add(Intrinsic.X86Pmulld,        new IntrinsicInfo(X86Instruction.Pmulld,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pmullw,        new IntrinsicInfo(X86Instruction.Pmullw,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Popcnt,        new IntrinsicInfo(X86Instruction.Popcnt,        IntrinsicType.PopCount));
-            Add(Intrinsic.X86Por,           new IntrinsicInfo(X86Instruction.Por,           IntrinsicType.Binary));
-            Add(Intrinsic.X86Pshufb,        new IntrinsicInfo(X86Instruction.Pshufb,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Pshufd,        new IntrinsicInfo(X86Instruction.Pshufd,        IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Pslld,         new IntrinsicInfo(X86Instruction.Pslld,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Pslldq,        new IntrinsicInfo(X86Instruction.Pslldq,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Psllq,         new IntrinsicInfo(X86Instruction.Psllq,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psllw,         new IntrinsicInfo(X86Instruction.Psllw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psrad,         new IntrinsicInfo(X86Instruction.Psrad,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psraw,         new IntrinsicInfo(X86Instruction.Psraw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psrld,         new IntrinsicInfo(X86Instruction.Psrld,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psrlq,         new IntrinsicInfo(X86Instruction.Psrlq,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psrldq,        new IntrinsicInfo(X86Instruction.Psrldq,        IntrinsicType.Binary));
-            Add(Intrinsic.X86Psrlw,         new IntrinsicInfo(X86Instruction.Psrlw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psubb,         new IntrinsicInfo(X86Instruction.Psubb,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psubd,         new IntrinsicInfo(X86Instruction.Psubd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psubq,         new IntrinsicInfo(X86Instruction.Psubq,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Psubw,         new IntrinsicInfo(X86Instruction.Psubw,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpckhbw,     new IntrinsicInfo(X86Instruction.Punpckhbw,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpckhdq,     new IntrinsicInfo(X86Instruction.Punpckhdq,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpckhqdq,    new IntrinsicInfo(X86Instruction.Punpckhqdq,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpckhwd,     new IntrinsicInfo(X86Instruction.Punpckhwd,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpcklbw,     new IntrinsicInfo(X86Instruction.Punpcklbw,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpckldq,     new IntrinsicInfo(X86Instruction.Punpckldq,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpcklqdq,    new IntrinsicInfo(X86Instruction.Punpcklqdq,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Punpcklwd,     new IntrinsicInfo(X86Instruction.Punpcklwd,     IntrinsicType.Binary));
-            Add(Intrinsic.X86Pxor,          new IntrinsicInfo(X86Instruction.Pxor,          IntrinsicType.Binary));
-            Add(Intrinsic.X86Rcpps,         new IntrinsicInfo(X86Instruction.Rcpps,         IntrinsicType.Unary));
-            Add(Intrinsic.X86Rcpss,         new IntrinsicInfo(X86Instruction.Rcpss,         IntrinsicType.Unary));
-            Add(Intrinsic.X86Roundpd,       new IntrinsicInfo(X86Instruction.Roundpd,       IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Roundps,       new IntrinsicInfo(X86Instruction.Roundps,       IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Roundsd,       new IntrinsicInfo(X86Instruction.Roundsd,       IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Roundss,       new IntrinsicInfo(X86Instruction.Roundss,       IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Rsqrtps,       new IntrinsicInfo(X86Instruction.Rsqrtps,       IntrinsicType.Unary));
-            Add(Intrinsic.X86Rsqrtss,       new IntrinsicInfo(X86Instruction.Rsqrtss,       IntrinsicType.Unary));
-            Add(Intrinsic.X86Sha256Msg1,    new IntrinsicInfo(X86Instruction.Sha256Msg1,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Sha256Msg2,    new IntrinsicInfo(X86Instruction.Sha256Msg2,    IntrinsicType.Binary));
-            Add(Intrinsic.X86Sha256Rnds2,   new IntrinsicInfo(X86Instruction.Sha256Rnds2,   IntrinsicType.Ternary));
-            Add(Intrinsic.X86Shufpd,        new IntrinsicInfo(X86Instruction.Shufpd,        IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Shufps,        new IntrinsicInfo(X86Instruction.Shufps,        IntrinsicType.TernaryImm));
-            Add(Intrinsic.X86Sqrtpd,        new IntrinsicInfo(X86Instruction.Sqrtpd,        IntrinsicType.Unary));
-            Add(Intrinsic.X86Sqrtps,        new IntrinsicInfo(X86Instruction.Sqrtps,        IntrinsicType.Unary));
-            Add(Intrinsic.X86Sqrtsd,        new IntrinsicInfo(X86Instruction.Sqrtsd,        IntrinsicType.Unary));
-            Add(Intrinsic.X86Sqrtss,        new IntrinsicInfo(X86Instruction.Sqrtss,        IntrinsicType.Unary));
-            Add(Intrinsic.X86Subpd,         new IntrinsicInfo(X86Instruction.Subpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Subps,         new IntrinsicInfo(X86Instruction.Subps,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Subsd,         new IntrinsicInfo(X86Instruction.Subsd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Subss,         new IntrinsicInfo(X86Instruction.Subss,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Unpckhpd,      new IntrinsicInfo(X86Instruction.Unpckhpd,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Unpckhps,      new IntrinsicInfo(X86Instruction.Unpckhps,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Unpcklpd,      new IntrinsicInfo(X86Instruction.Unpcklpd,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Unpcklps,      new IntrinsicInfo(X86Instruction.Unpcklps,      IntrinsicType.Binary));
-            Add(Intrinsic.X86Vcvtph2ps,     new IntrinsicInfo(X86Instruction.Vcvtph2ps,     IntrinsicType.Unary));
-            Add(Intrinsic.X86Vcvtps2ph,     new IntrinsicInfo(X86Instruction.Vcvtps2ph,     IntrinsicType.BinaryImm));
-            Add(Intrinsic.X86Vfmadd231ps,   new IntrinsicInfo(X86Instruction.Vfmadd231ps,   IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfmadd231sd,   new IntrinsicInfo(X86Instruction.Vfmadd231sd,   IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfmadd231ss,   new IntrinsicInfo(X86Instruction.Vfmadd231ss,   IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfmsub231sd,   new IntrinsicInfo(X86Instruction.Vfmsub231sd,   IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfmsub231ss,   new IntrinsicInfo(X86Instruction.Vfmsub231ss,   IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfnmadd231ps,  new IntrinsicInfo(X86Instruction.Vfnmadd231ps,  IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfnmadd231sd,  new IntrinsicInfo(X86Instruction.Vfnmadd231sd,  IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfnmadd231ss,  new IntrinsicInfo(X86Instruction.Vfnmadd231ss,  IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfnmsub231sd,  new IntrinsicInfo(X86Instruction.Vfnmsub231sd,  IntrinsicType.Fma));
-            Add(Intrinsic.X86Vfnmsub231ss,  new IntrinsicInfo(X86Instruction.Vfnmsub231ss,  IntrinsicType.Fma));
-            Add(Intrinsic.X86Xorpd,         new IntrinsicInfo(X86Instruction.Xorpd,         IntrinsicType.Binary));
-            Add(Intrinsic.X86Xorps,         new IntrinsicInfo(X86Instruction.Xorps,         IntrinsicType.Binary));
-        }
-
-        private static void Add(Intrinsic intrin, IntrinsicInfo info)
-        {
-            _intrinTable[(int)intrin] = info;
-        }
-
-        public static IntrinsicInfo GetInfo(Intrinsic intrin)
-        {
-            return _intrinTable[(int)intrin];
-        }
-    }
-}

ARMeilleure/CodeGen/X86/X86Instruction.cs

@@ -1,228 +0,0 @@
-namespace ARMeilleure.CodeGen.X86
-{
-    enum X86Instruction
-    {
-        None,
-        Add,
-        Addpd,
-        Addps,
-        Addsd,
-        Addss,
-        Aesdec,
-        Aesdeclast,
-        Aesenc,
-        Aesenclast,
-        Aesimc,
-        And,
-        Andnpd,
-        Andnps,
-        Andpd,
-        Andps,
-        Blendvpd,
-        Blendvps,
-        Bsr,
-        Bswap,
-        Call,
-        Cmovcc,
-        Cmp,
-        Cmppd,
-        Cmpps,
-        Cmpsd,
-        Cmpss,
-        Cmpxchg,
-        Cmpxchg16b,
-        Cmpxchg8,
-        Comisd,
-        Comiss,
-        Crc32,
-        Crc32_16,
-        Crc32_8,
-        Cvtdq2pd,
-        Cvtdq2ps,
-        Cvtpd2dq,
-        Cvtpd2ps,
-        Cvtps2dq,
-        Cvtps2pd,
-        Cvtsd2si,
-        Cvtsd2ss,
-        Cvtsi2sd,
-        Cvtsi2ss,
-        Cvtss2sd,
-        Cvtss2si,
-        Div,
-        Divpd,
-        Divps,
-        Divsd,
-        Divss,
-        Gf2p8affineqb,
-        Haddpd,
-        Haddps,
-        Idiv,
-        Imul,
-        Imul128,
-        Insertps,
-        Jmp,
-        Ldmxcsr,
-        Lea,
-        Maxpd,
-        Maxps,
-        Maxsd,
-        Maxss,
-        Minpd,
-        Minps,
-        Minsd,
-        Minss,
-        Mov,
-        Mov16,
-        Mov8,
-        Movd,
-        Movdqu,
-        Movhlps,
-        Movlhps,
-        Movq,
-        Movsd,
-        Movss,
-        Movsx16,
-        Movsx32,
-        Movsx8,
-        Movzx16,
-        Movzx8,
-        Mul128,
-        Mulpd,
-        Mulps,
-        Mulsd,
-        Mulss,
-        Neg,
-        Not,
-        Or,
-        Paddb,
-        Paddd,
-        Paddq,
-        Paddw,
-        Palignr,
-        Pand,
-        Pandn,
-        Pavgb,
-        Pavgw,
-        Pblendvb,
-        Pclmulqdq,
-        Pcmpeqb,
-        Pcmpeqd,
-        Pcmpeqq,
-        Pcmpeqw,
-        Pcmpgtb,
-        Pcmpgtd,
-        Pcmpgtq,
-        Pcmpgtw,
-        Pextrb,
-        Pextrd,
-        Pextrq,
-        Pextrw,
-        Pinsrb,
-        Pinsrd,
-        Pinsrq,
-        Pinsrw,
-        Pmaxsb,
-        Pmaxsd,
-        Pmaxsw,
-        Pmaxub,
-        Pmaxud,
-        Pmaxuw,
-        Pminsb,
-        Pminsd,
-        Pminsw,
-        Pminub,
-        Pminud,
-        Pminuw,
-        Pmovsxbw,
-        Pmovsxdq,
-        Pmovsxwd,
-        Pmovzxbw,
-        Pmovzxdq,
-        Pmovzxwd,
-        Pmulld,
-        Pmullw,
-        Pop,
-        Popcnt,
-        Por,
-        Pshufb,
-        Pshufd,
-        Pslld,
-        Pslldq,
-        Psllq,
-        Psllw,
-        Psrad,
-        Psraw,
-        Psrld,
-        Psrlq,
-        Psrldq,
-        Psrlw,
-        Psubb,
-        Psubd,
-        Psubq,
-        Psubw,
-        Punpckhbw,
-        Punpckhdq,
-        Punpckhqdq,
-        Punpckhwd,
-        Punpcklbw,
-        Punpckldq,
-        Punpcklqdq,
-        Punpcklwd,
-        Push,
-        Pxor,
-        Rcpps,
-        Rcpss,
-        Ror,
-        Roundpd,
-        Roundps,
-        Roundsd,
-        Roundss,
-        Rsqrtps,
-        Rsqrtss,
-        Sar,
-        Setcc,
-        Sha256Msg1,
-        Sha256Msg2,
-        Sha256Rnds2,
-        Shl,
-        Shr,
-        Shufpd,
-        Shufps,
-        Sqrtpd,
-        Sqrtps,
-        Sqrtsd,
-        Sqrtss,
-        Stmxcsr,
-        Sub,
-        Subpd,
-        Subps,
-        Subsd,
-        Subss,
-        Test,
-        Unpckhpd,
-        Unpckhps,
-        Unpcklpd,
-        Unpcklps,
-        Vblendvpd,
-        Vblendvps,
-        Vcvtph2ps,
-        Vcvtps2ph,
-        Vfmadd231ps,
-        Vfmadd231sd,
-        Vfmadd231ss,
-        Vfmsub231sd,
-        Vfmsub231ss,
-        Vfnmadd231ps,
-        Vfnmadd231sd,
-        Vfnmadd231ss,
-        Vfnmsub231sd,
-        Vfnmsub231ss,
-        Vpblendvb,
-        Xor,
-        Xorpd,
-        Xorps,
-
-        Count
-    }
-}

ARMeilleure/Decoders/DecoderHelper.cs

@@ -1,167 +0,0 @@
-using ARMeilleure.Common;
-
-namespace ARMeilleure.Decoders
-{
-    static class DecoderHelper
-    {
-        static DecoderHelper()
-        {
-            Imm8ToFP32Table = BuildImm8ToFP32Table();
-            Imm8ToFP64Table = BuildImm8ToFP64Table();
-        }
-
-        public static readonly uint[]  Imm8ToFP32Table;
-        public static readonly ulong[] Imm8ToFP64Table;
-
-        private static uint[] BuildImm8ToFP32Table()
-        {
-            uint[] tbl = new uint[256];
-
-            for (int idx = 0; idx < 256; idx++)
-            {
-                tbl[idx] = ExpandImm8ToFP32((uint)idx);
-            }
-
-            return tbl;
-        }
-
-        private static ulong[] BuildImm8ToFP64Table()
-        {
-            ulong[] tbl = new ulong[256];
-
-            for (int idx = 0; idx < 256; idx++)
-            {
-                tbl[idx] = ExpandImm8ToFP64((ulong)idx);
-            }
-
-            return tbl;
-        }
-
-        // abcdefgh -> aBbbbbbc defgh000 00000000 00000000 (B = ~b)
-        private static uint ExpandImm8ToFP32(uint imm)
-        {
-            uint MoveBit(uint bits, int from, int to)
-            {
-                return ((bits >> from) & 1U) << to;
-            }
-
-            return MoveBit(imm, 7, 31) | MoveBit(~imm, 6, 30) |
-                   MoveBit(imm, 6, 29) | MoveBit( imm, 6, 28) |
-                   MoveBit(imm, 6, 27) | MoveBit( imm, 6, 26) |
-                   MoveBit(imm, 6, 25) | MoveBit( imm, 5, 24) |
-                   MoveBit(imm, 4, 23) | MoveBit( imm, 3, 22) |
-                   MoveBit(imm, 2, 21) | MoveBit( imm, 1, 20) |
-                   MoveBit(imm, 0, 19);
-        }
-
-        // abcdefgh -> aBbbbbbb bbcdefgh 00000000 00000000 00000000 00000000 00000000 00000000 (B = ~b)
-        private static ulong ExpandImm8ToFP64(ulong imm)
-        {
-            ulong MoveBit(ulong bits, int from, int to)
-            {
-                return ((bits >> from) & 1UL) << to;
-            }
-
-            return MoveBit(imm, 7, 63) | MoveBit(~imm, 6, 62) |
-                   MoveBit(imm, 6, 61) | MoveBit( imm, 6, 60) |
-                   MoveBit(imm, 6, 59) | MoveBit( imm, 6, 58) |
-                   MoveBit(imm, 6, 57) | MoveBit( imm, 6, 56) |
-                   MoveBit(imm, 6, 55) | MoveBit( imm, 6, 54) |
-                   MoveBit(imm, 5, 53) | MoveBit( imm, 4, 52) |
-                   MoveBit(imm, 3, 51) | MoveBit( imm, 2, 50) |
-                   MoveBit(imm, 1, 49) | MoveBit( imm, 0, 48);
-        }
-
-        public struct BitMask
-        {
-            public long WMask;
-            public long TMask;
-            public int  Pos;
-            public int  Shift;
-            public bool IsUndefined;
-
-            public static BitMask Invalid => new BitMask { IsUndefined = true };
-        }
-
-        public static BitMask DecodeBitMask(int opCode, bool immediate)
-        {
-            int immS = (opCode >> 10) & 0x3f;
-            int immR = (opCode >> 16) & 0x3f;
-
-            int n  = (opCode >> 22) & 1;
-            int sf = (opCode >> 31) & 1;
-
-            int length = BitUtils.HighestBitSet((~immS & 0x3f) | (n << 6));
-
-            if (length < 1 || (sf == 0 && n != 0))
-            {
-                return BitMask.Invalid;
-            }
-
-            int size = 1 << length;
-
-            int levels = size - 1;
-
-            int s = immS & levels;
-            int r = immR & levels;
-
-            if (immediate && s == levels)
-            {
-                return BitMask.Invalid;
-            }
-
-            long wMask = BitUtils.FillWithOnes(s + 1);
-            long tMask = BitUtils.FillWithOnes(((s - r) & levels) + 1);
-
-            if (r > 0)
-            {
-                wMask  = BitUtils.RotateRight(wMask, r, size);
-                wMask &= BitUtils.FillWithOnes(size);
-            }
-
-            return new BitMask()
-            {
-                WMask = BitUtils.Replicate(wMask, size),
-                TMask = BitUtils.Replicate(tMask, size),
-
-                Pos   = immS,
-                Shift = immR
-            };
-        }
-
-        public static long DecodeImm24_2(int opCode)
-        {
-            return ((long)opCode << 40) >> 38;
-        }
-
-        public static long DecodeImm26_2(int opCode)
-        {
-            return ((long)opCode << 38) >> 36;
-        }
-
-        public static long DecodeImmS19_2(int opCode)
-        {
-            return (((long)opCode << 40) >> 43) & ~3;
-        }
-
-        public static long DecodeImmS14_2(int opCode)
-        {
-            return (((long)opCode << 45) >> 48) & ~3;
-        }
-
-        public static bool VectorArgumentsInvalid(bool q, params int[] args)
-        {
-            if (q)
-            {
-                for (int i = 0; i < args.Length; i++)
-                {
-                    if ((args[i] & 1) == 1)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-    }
-}

ARMeilleure/Decoders/IOpCode32Exception.cs

@@ -1,6 +0,0 @@
-namespace ARMeilleure.Decoders;
-
-interface IOpCode32Exception
-{
-    int Id { get; }
-}

ARMeilleure/Instructions/InstEmitHash32.cs

@@ -1,54 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.Instructions.InstEmitHashHelper;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit32
-    {
-        public static void Crc32b(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, ByteSizeLog2, false);
-        }
-
-        public static void Crc32h(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, HWordSizeLog2, false);
-        }
-
-        public static void Crc32w(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, WordSizeLog2, false);
-        }
-
-        public static void Crc32cb(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, ByteSizeLog2, true);
-        }
-
-        public static void Crc32ch(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, HWordSizeLog2, true);
-        }
-
-        public static void Crc32cw(ArmEmitterContext context)
-        {
-            EmitCrc32Call(context, WordSizeLog2, true);
-        }
-
-        private static void EmitCrc32Call(ArmEmitterContext context, int size, bool c)
-        {
-            IOpCode32AluReg op = (IOpCode32AluReg)context.CurrOp;
-
-            Operand n = GetIntA32(context, op.Rn);
-            Operand m = GetIntA32(context, op.Rm);
-
-            Operand d = EmitCrc32(context, n, m, size, c);
-
-            EmitAluStore(context, d);
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitHashHelper.cs

@@ -1,119 +0,0 @@
-// https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
-
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-using System;
-using System.Diagnostics;
-
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-using static ARMeilleure.Instructions.InstEmitSimdHelper;
-
-namespace ARMeilleure.Instructions
-{
-    static class InstEmitHashHelper
-    {
-        public const uint Crc32RevPoly = 0xedb88320;
-        public const uint Crc32cRevPoly = 0x82f63b78;
-
-        public static Operand EmitCrc32(ArmEmitterContext context, Operand crc, Operand value, int size, bool castagnoli)
-        {
-            Debug.Assert(crc.Type.IsInteger() && value.Type.IsInteger());
-            Debug.Assert(size >= 0 && size < 4);
-            Debug.Assert((size < 3) || (value.Type == OperandType.I64));
-
-            if (castagnoli && Optimizations.UseSse42)
-            {
-                // The CRC32 instruction does not have an immediate variant, so ensure both inputs are in registers.
-                value = (value.Kind == OperandKind.Constant) ? context.Copy(value) : value;
-                crc = (crc.Kind == OperandKind.Constant) ? context.Copy(crc) : crc;
-
-                Intrinsic op = size switch
-                {
-                    0 => Intrinsic.X86Crc32_8,
-                    1 => Intrinsic.X86Crc32_16,
-                    _ => Intrinsic.X86Crc32,
-                };
-
-                return (size == 3) ? context.ConvertI64ToI32(context.AddIntrinsicLong(op, crc, value)) : context.AddIntrinsicInt(op, crc, value);
-            }
-            else if (Optimizations.UsePclmulqdq)
-            {
-                return size switch
-                {
-                    3 => EmitCrc32Optimized64(context, crc, value, castagnoli),
-                    _ => EmitCrc32Optimized(context, crc, value, castagnoli, size),
-                };
-            }
-            else
-            {
-                string name = (size, castagnoli) switch 
-                {
-                    (0, false) => nameof(SoftFallback.Crc32b),
-                    (1, false) => nameof(SoftFallback.Crc32h),
-                    (2, false) => nameof(SoftFallback.Crc32w),
-                    (3, false) => nameof(SoftFallback.Crc32x),
-                    (0, true) => nameof(SoftFallback.Crc32cb),
-                    (1, true) => nameof(SoftFallback.Crc32ch),
-                    (2, true) => nameof(SoftFallback.Crc32cw),
-                    (3, true) => nameof(SoftFallback.Crc32cx),
-                    _ => throw new ArgumentOutOfRangeException(nameof(size))
-                };
-
-                return context.Call(typeof(SoftFallback).GetMethod(name), crc, value);
-            }
-        }
-
-        private static Operand EmitCrc32Optimized(ArmEmitterContext context, Operand crc, Operand data, bool castagnoli, int size)
-        {
-            long mu = castagnoli ? 0x0DEA713F1 : 0x1F7011641; // mu' = floor(x^64/P(x))'
-            long polynomial = castagnoli ? 0x105EC76F0 : 0x1DB710641; // P'(x) << 1
-
-            crc = context.VectorInsert(context.VectorZero(), crc, 0);
-
-            switch (size)
-            {
-                case 0: data = context.VectorInsert8(context.VectorZero(), data, 0); break;
-                case 1: data = context.VectorInsert16(context.VectorZero(), data, 0); break;
-                case 2: data = context.VectorInsert(context.VectorZero(), data, 0); break;
-            }
-
-            int bitsize = 8 << size;
-
-            Operand tmp = context.AddIntrinsic(Intrinsic.X86Pxor, crc, data);
-            tmp = context.AddIntrinsic(Intrinsic.X86Psllq, tmp, Const(64 - bitsize));
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, tmp, X86GetScalar(context, mu), Const(0));
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, tmp, X86GetScalar(context, polynomial), Const(0));
-
-            if (bitsize < 32)
-            {
-                crc = context.AddIntrinsic(Intrinsic.X86Pslldq, crc, Const((64 - bitsize) / 8));
-                tmp = context.AddIntrinsic(Intrinsic.X86Pxor, tmp, crc);
-            }
-
-            return context.VectorExtract(OperandType.I32, tmp, 2);
-        }
-
-        private static Operand EmitCrc32Optimized64(ArmEmitterContext context, Operand crc, Operand data, bool castagnoli)
-        {
-            long mu = castagnoli ? 0x0DEA713F1 : 0x1F7011641; // mu' = floor(x^64/P(x))'
-            long polynomial = castagnoli ? 0x105EC76F0 : 0x1DB710641; // P'(x) << 1
-
-            crc = context.VectorInsert(context.VectorZero(), crc, 0);
-            data = context.VectorInsert(context.VectorZero(), data, 0);
-
-            Operand tmp = context.AddIntrinsic(Intrinsic.X86Pxor, crc, data);
-            Operand res = context.AddIntrinsic(Intrinsic.X86Pslldq, tmp, Const(4));
-
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, res, X86GetScalar(context, mu), Const(0));
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, tmp, X86GetScalar(context, polynomial), Const(0));
-
-            tmp = context.AddIntrinsic(Intrinsic.X86Pxor, tmp, res);
-            tmp = context.AddIntrinsic(Intrinsic.X86Psllq, tmp, Const(32));
-
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, tmp, X86GetScalar(context, mu), Const(1));
-            tmp = context.AddIntrinsic(Intrinsic.X86Pclmulqdq, tmp, X86GetScalar(context, polynomial), Const(0));
-
-            return context.VectorExtract(OperandType.I32, tmp, 2);
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSimdCvt32.cs

@@ -1,789 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.State;
-using ARMeilleure.Translation;
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper32;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit32
-    {
-        private static int FlipVdBits(int vd, bool lowBit)
-        {
-            if (lowBit)
-            {
-                // Move the low bit to the top.
-                return ((vd & 0x1) << 4) | (vd >> 1);
-            }
-            else
-            {
-                // Move the high bit to the bottom.
-                return ((vd & 0xf) << 1) | (vd >> 4);
-            }
-        }
-
-        private static Operand EmitSaturateFloatToInt(ArmEmitterContext context, Operand op1, bool unsigned)
-        {
-            MethodInfo info;
-
-            if (op1.Type == OperandType.FP64)
-            {
-                info = unsigned
-                    ? typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU32))
-                    : typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS32));
-            }
-            else
-            {
-                info = unsigned
-                    ? typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32))
-                    : typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32));
-            }
-
-            return context.Call(info, op1);
-        }
-
-        public static void Vcvt_V(ArmEmitterContext context)
-        {
-            OpCode32Simd op = (OpCode32Simd)context.CurrOp;
-
-            bool unsigned = (op.Opc & 1) != 0;
-            bool toInteger = (op.Opc & 2) != 0;
-            OperandType floatSize = (op.Size == 2) ? OperandType.FP32 : OperandType.FP64;
-
-            if (toInteger)
-            {
-                if (Optimizations.UseAdvSimd)
-                {
-                    InstEmitSimdHelper32Arm64.EmitVectorUnaryOpF32(context, unsigned ? Intrinsic.Arm64FcvtzuV : Intrinsic.Arm64FcvtzsV);
-                }
-                else if (Optimizations.UseSse41)
-                {
-                    EmitSse41ConvertVector32(context, FPRoundingMode.TowardsZero, !unsigned);
-                }
-                else
-                {
-                    EmitVectorUnaryOpF32(context, (op1) =>
-                    {
-                        return EmitSaturateFloatToInt(context, op1, unsigned);
-                    });
-                }
-            }
-            else
-            {
-                if (Optimizations.UseSse2)
-                {
-                    EmitVectorUnaryOpSimd32(context, (n) =>
-                    {
-                        if (unsigned)
-                        {
-                            Operand mask = X86GetAllElements(context, 0x47800000);
-
-                            Operand res = context.AddIntrinsic(Intrinsic.X86Psrld, n, Const(16));
-                            res = context.AddIntrinsic(Intrinsic.X86Cvtdq2ps, res);
-                            res = context.AddIntrinsic(Intrinsic.X86Mulps, res, mask);
-
-                            Operand res2 = context.AddIntrinsic(Intrinsic.X86Pslld, n, Const(16));
-                            res2 = context.AddIntrinsic(Intrinsic.X86Psrld, res2, Const(16));
-                            res2 = context.AddIntrinsic(Intrinsic.X86Cvtdq2ps, res2);
-
-                            return context.AddIntrinsic(Intrinsic.X86Addps, res, res2);
-                        }
-                        else
-                        {
-                            return context.AddIntrinsic(Intrinsic.X86Cvtdq2ps, n);
-                        }
-                    });
-                }
-                else
-                {
-                    if (unsigned)
-                    {
-                        EmitVectorUnaryOpZx32(context, (op1) => EmitFPConvert(context, op1, floatSize, false));
-                    }
-                    else
-                    {
-                        EmitVectorUnaryOpSx32(context, (op1) => EmitFPConvert(context, op1, floatSize, true));
-                    }
-                }
-            }
-        }
-
-        public static void Vcvt_FD(ArmEmitterContext context)
-        {
-            OpCode32SimdS op = (OpCode32SimdS)context.CurrOp;
-
-            int vm = op.Vm;
-            int vd;
-            if (op.Size == 3)
-            {
-                vd = FlipVdBits(op.Vd, false);
-                // Double to single.
-                Operand fp = ExtractScalar(context, OperandType.FP64, vm);
-
-                Operand res = context.ConvertToFP(OperandType.FP32, fp);
-
-                InsertScalar(context, vd, res);
-            }
-            else
-            {
-                vd = FlipVdBits(op.Vd, true);
-                // Single to double.
-                Operand fp = ExtractScalar(context, OperandType.FP32, vm);
-
-                Operand res = context.ConvertToFP(OperandType.FP64, fp);
-
-                InsertScalar(context, vd, res);
-            }
-        }
-
-        // VCVT (floating-point to integer, floating-point) | VCVT (integer to floating-point, floating-point).
-        public static void Vcvt_FI(ArmEmitterContext context)
-        {
-            OpCode32SimdCvtFI op = (OpCode32SimdCvtFI)context.CurrOp;
-
-            bool toInteger = (op.Opc2 & 0b100) != 0;
-
-            OperandType floatSize = op.RegisterSize == RegisterSize.Int64 ? OperandType.FP64 : OperandType.FP32;
-
-            if (toInteger)
-            {
-                bool unsigned = (op.Opc2 & 1) == 0;
-                bool roundWithFpscr = op.Opc != 1;
-
-                if (!roundWithFpscr && Optimizations.UseAdvSimd)
-                {
-                    bool doubleSize = floatSize == OperandType.FP64;
-
-                    if (doubleSize)
-                    {
-                        Operand m = GetVecA32(op.Vm >> 1);
-
-                        Operand toConvert = InstEmitSimdHelper32Arm64.EmitExtractScalar(context, m, op.Vm, doubleSize);
-
-                        Intrinsic inst = (unsigned ? Intrinsic.Arm64FcvtzuGp : Intrinsic.Arm64FcvtzsGp) | Intrinsic.Arm64VDouble;
-
-                        Operand asInteger = context.AddIntrinsicInt(inst, toConvert);
-
-                        InsertScalar(context, op.Vd, asInteger);
-                    }
-                    else
-                    {
-                        InstEmitSimdHelper32Arm64.EmitScalarUnaryOpF32(context, unsigned ? Intrinsic.Arm64FcvtzuS : Intrinsic.Arm64FcvtzsS);
-                    }
-                }
-                else if (!roundWithFpscr && Optimizations.UseSse41)
-                {
-                    EmitSse41ConvertInt32(context, FPRoundingMode.TowardsZero, !unsigned);
-                }
-                else
-                {
-                    Operand toConvert = ExtractScalar(context, floatSize, op.Vm);
-
-                    // TODO: Fast Path.
-                    if (roundWithFpscr)
-                    {
-                        toConvert = EmitRoundByRMode(context, toConvert);
-                    }
-
-                    // Round towards zero.
-                    Operand asInteger = EmitSaturateFloatToInt(context, toConvert, unsigned);
-
-                    InsertScalar(context, op.Vd, asInteger);
-                }
-            }
-            else
-            {
-                bool unsigned = op.Opc == 0;
-
-                Operand toConvert = ExtractScalar(context, OperandType.I32, op.Vm);
-
-                Operand asFloat = EmitFPConvert(context, toConvert, floatSize, !unsigned);
-
-                InsertScalar(context, op.Vd, asFloat);
-            }
-        }
-
-        private static Operand EmitRoundMathCall(ArmEmitterContext context, MidpointRounding roundMode, Operand n)
-        {
-            IOpCode32Simd op = (IOpCode32Simd)context.CurrOp;
-
-            string name = nameof(Math.Round);
-
-            MethodInfo info = (op.Size & 1) == 0
-                ? typeof(MathF).GetMethod(name, new Type[] { typeof(float),  typeof(MidpointRounding) })
-                : typeof(Math). GetMethod(name, new Type[] { typeof(double), typeof(MidpointRounding) });
-
-            return context.Call(info, n, Const((int)roundMode));
-        }
-
-        private static FPRoundingMode RMToRoundMode(int rm)
-        {
-            FPRoundingMode roundMode;
-            switch (rm)
-            {
-                case 0b00:
-                    roundMode = FPRoundingMode.ToNearestAway;
-                    break;
-                case 0b01:
-                    roundMode = FPRoundingMode.ToNearest;
-                    break;
-                case 0b10:
-                    roundMode = FPRoundingMode.TowardsPlusInfinity;
-                    break;
-                case 0b11:
-                    roundMode = FPRoundingMode.TowardsMinusInfinity;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(rm));
-            }
-            return roundMode;
-        }
-
-        // VCVTA/M/N/P (floating-point).
-        public static void Vcvt_RM(ArmEmitterContext context)
-        {
-            OpCode32SimdCvtFI op = (OpCode32SimdCvtFI)context.CurrOp; // toInteger == true (opCode<18> == 1 => Opc2<2> == 1).
-
-            OperandType floatSize = op.RegisterSize == RegisterSize.Int64 ? OperandType.FP64 : OperandType.FP32;
-
-            bool unsigned = op.Opc == 0;
-            int rm = op.Opc2 & 3;
-
-            Intrinsic inst;
-
-            if (Optimizations.UseAdvSimd)
-            {
-                if (unsigned)
-                {
-                    inst = rm switch {
-                        0b00 => Intrinsic.Arm64FcvtauS,
-                        0b01 => Intrinsic.Arm64FcvtnuS,
-                        0b10 => Intrinsic.Arm64FcvtpuS,
-                        0b11 => Intrinsic.Arm64FcvtmuS,
-                        _ => throw new ArgumentOutOfRangeException(nameof(rm))
-                    };
-                }
-                else
-                {
-                    inst = rm switch {
-                        0b00 => Intrinsic.Arm64FcvtasS,
-                        0b01 => Intrinsic.Arm64FcvtnsS,
-                        0b10 => Intrinsic.Arm64FcvtpsS,
-                        0b11 => Intrinsic.Arm64FcvtmsS,
-                        _ => throw new ArgumentOutOfRangeException(nameof(rm))
-                    };
-                }
-
-                InstEmitSimdHelper32Arm64.EmitScalarUnaryOpF32(context, inst);
-            }
-            else if (Optimizations.UseSse41)
-            {
-                EmitSse41ConvertInt32(context, RMToRoundMode(rm), !unsigned);
-            }
-            else
-            {
-                Operand toConvert = ExtractScalar(context, floatSize, op.Vm);
-
-                switch (rm)
-                {
-                    case 0b00: // Away
-                        toConvert = EmitRoundMathCall(context, MidpointRounding.AwayFromZero, toConvert);
-                        break;
-                    case 0b01: // Nearest
-                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
-                        break;
-                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
-                        break;
-                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
-                        break;
-                }
-
-                Operand asInteger = EmitSaturateFloatToInt(context, toConvert, unsigned);
-
-                InsertScalar(context, op.Vd, asInteger);
-            }
-        }
-
-        public static void Vcvt_TB(ArmEmitterContext context)
-        {
-            OpCode32SimdCvtTB op = (OpCode32SimdCvtTB)context.CurrOp;
-
-            if (Optimizations.UseF16c)
-            {
-                Debug.Assert(!Optimizations.ForceLegacySse);
-
-                if (op.Op)
-                {
-                    Operand res = ExtractScalar(context, op.Size == 1 ? OperandType.FP64 : OperandType.FP32, op.Vm);
-                    if (op.Size == 1)
-                    {
-                        res = context.AddIntrinsic(Intrinsic.X86Cvtsd2ss, context.VectorZero(), res);
-                    }
-                    res = context.AddIntrinsic(Intrinsic.X86Vcvtps2ph, res, Const(X86GetRoundControl(FPRoundingMode.ToNearest)));
-                    res = context.VectorExtract16(res, 0);
-                    InsertScalar16(context, op.Vd, op.T, res);
-                }
-                else
-                {
-                    Operand res = context.VectorCreateScalar(ExtractScalar16(context, op.Vm, op.T));
-                    res = context.AddIntrinsic(Intrinsic.X86Vcvtph2ps, res);
-                    if (op.Size == 1)
-                    {
-                        res = context.AddIntrinsic(Intrinsic.X86Cvtss2sd, context.VectorZero(), res);
-                    }
-                    res = context.VectorExtract(op.Size == 1 ? OperandType.I64 : OperandType.I32, res, 0);
-                    InsertScalar(context, op.Vd, res);
-                }
-            }
-            else
-            {
-                if (op.Op)
-                {
-                    // Convert to half.
-
-                    Operand src = ExtractScalar(context, op.Size == 1 ? OperandType.FP64 : OperandType.FP32, op.Vm);
-
-                    MethodInfo method = op.Size == 1
-                        ? typeof(SoftFloat64_16).GetMethod(nameof(SoftFloat64_16.FPConvert))
-                        : typeof(SoftFloat32_16).GetMethod(nameof(SoftFloat32_16.FPConvert));
-
-                    context.StoreToContext();
-                    Operand res = context.Call(method, src);
-                    context.LoadFromContext();
-
-                    InsertScalar16(context, op.Vd, op.T, res);
-                }
-                else
-                {
-                    // Convert from half.
-
-                    Operand src = ExtractScalar16(context, op.Vm, op.T);
-
-                    MethodInfo method = op.Size == 1
-                        ? typeof(SoftFloat16_64).GetMethod(nameof(SoftFloat16_64.FPConvert))
-                        : typeof(SoftFloat16_32).GetMethod(nameof(SoftFloat16_32.FPConvert));
-
-                    context.StoreToContext();
-                    Operand res = context.Call(method, src);
-                    context.LoadFromContext();
-
-                    InsertScalar(context, op.Vd, res);
-                }
-            }
-        }
-
-        // VRINTA/M/N/P (floating-point).
-        public static void Vrint_RM(ArmEmitterContext context)
-        {
-            OpCode32SimdS op = (OpCode32SimdS)context.CurrOp;
-
-            OperandType floatSize = op.RegisterSize == RegisterSize.Int64 ? OperandType.FP64 : OperandType.FP32;
-
-            int rm = op.Opc2 & 3;
-
-            if (Optimizations.UseAdvSimd)
-            {
-                Intrinsic inst = rm switch {
-                    0b00 => Intrinsic.Arm64FrintaS,
-                    0b01 => Intrinsic.Arm64FrintnS,
-                    0b10 => Intrinsic.Arm64FrintpS,
-                    0b11 => Intrinsic.Arm64FrintmS,
-                    _ => throw new ArgumentOutOfRangeException(nameof(rm))
-                };
-
-                InstEmitSimdHelper32Arm64.EmitScalarUnaryOpF32(context, inst);
-            }
-            else if (Optimizations.UseSse41)
-            {
-                EmitScalarUnaryOpSimd32(context, (m) =>
-                {
-                    FPRoundingMode roundMode = RMToRoundMode(rm);
-
-                    if (roundMode != FPRoundingMode.ToNearestAway)
-                    {
-                        Intrinsic inst = (op.Size & 1) == 0 ? Intrinsic.X86Roundss : Intrinsic.X86Roundsd;
-                        return context.AddIntrinsic(inst, m, Const(X86GetRoundControl(roundMode)));
-                    }
-                    else
-                    {
-                        return EmitSse41RoundToNearestWithTiesToAwayOpF(context, m, scalar: true);
-                    }
-                });
-            }
-            else
-            {
-                Operand toConvert = ExtractScalar(context, floatSize, op.Vm);
-
-                switch (rm)
-                {
-                    case 0b00: // Away
-                        toConvert = EmitRoundMathCall(context, MidpointRounding.AwayFromZero, toConvert);
-                        break;
-                    case 0b01: // Nearest
-                        toConvert = EmitRoundMathCall(context, MidpointRounding.ToEven, toConvert);
-                        break;
-                    case 0b10: // Towards positive infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Ceiling), toConvert);
-                        break;
-                    case 0b11: // Towards negative infinity
-                        toConvert = EmitUnaryMathCall(context, nameof(Math.Floor), toConvert);
-                        break;
-                }
-
-                InsertScalar(context, op.Vd, toConvert);
-            }
-        }
-
-        // VRINTA (vector).
-        public static void Vrinta_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorUnaryOpF32(context, Intrinsic.Arm64FrintaS);
-            }
-            else
-            {
-                EmitVectorUnaryOpF32(context, (m) => EmitRoundMathCall(context, MidpointRounding.AwayFromZero, m));
-            }
-        }
-
-        // VRINTM (vector).
-        public static void Vrintm_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorUnaryOpF32(context, Intrinsic.Arm64FrintmS);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorUnaryOpSimd32(context, (m) =>
-                {
-                    return context.AddIntrinsic(Intrinsic.X86Roundps, m, Const(X86GetRoundControl(FPRoundingMode.TowardsMinusInfinity)));
-                });
-            }
-            else
-            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Floor), m));
-            }
-        }
-
-        // VRINTN (vector).
-        public static void Vrintn_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorUnaryOpF32(context, Intrinsic.Arm64FrintnS);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorUnaryOpSimd32(context, (m) =>
-                {
-                    return context.AddIntrinsic(Intrinsic.X86Roundps, m, Const(X86GetRoundControl(FPRoundingMode.ToNearest)));
-                });
-            }
-            else
-            {
-                EmitVectorUnaryOpF32(context, (m) => EmitRoundMathCall(context, MidpointRounding.ToEven, m));
-            }
-        }
-
-        // VRINTP (vector).
-        public static void Vrintp_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorUnaryOpF32(context, Intrinsic.Arm64FrintpS);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorUnaryOpSimd32(context, (m) =>
-                {
-                    return context.AddIntrinsic(Intrinsic.X86Roundps, m, Const(X86GetRoundControl(FPRoundingMode.TowardsPlusInfinity)));
-                });
-            }
-            else
-            {
-                EmitVectorUnaryOpF32(context, (m) => EmitUnaryMathCall(context, nameof(Math.Ceiling), m));
-            }
-        }
-
-        // VRINTZ (floating-point).
-        public static void Vrint_Z(ArmEmitterContext context)
-        {
-            OpCode32SimdS op = (OpCode32SimdS)context.CurrOp;
-
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitScalarUnaryOpF32(context, Intrinsic.Arm64FrintzS);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitScalarUnaryOpSimd32(context, (m) =>
-                {
-                    Intrinsic inst = (op.Size & 1) == 0 ? Intrinsic.X86Roundss : Intrinsic.X86Roundsd;
-                    return context.AddIntrinsic(inst, m, Const(X86GetRoundControl(FPRoundingMode.TowardsZero)));
-                });
-            }
-            else
-            {
-                EmitScalarUnaryOpF32(context, (op1) => EmitUnaryMathCall(context, nameof(Math.Truncate), op1));
-            }
-        }
-
-        // VRINTX (floating-point).
-        public static void Vrintx_S(ArmEmitterContext context)
-        {
-            EmitScalarUnaryOpF32(context, (op1) =>
-            {
-                return EmitRoundByRMode(context, op1);
-            });
-        }
-
-        private static Operand EmitFPConvert(ArmEmitterContext context, Operand value, OperandType type, bool signed)
-        {
-            Debug.Assert(value.Type == OperandType.I32 || value.Type == OperandType.I64);
-
-            if (signed)
-            {
-                return context.ConvertToFP(type, value);
-            }
-            else
-            {
-                return context.ConvertToFPUI(type, value);
-            }
-        }
-
-        private static void EmitSse41ConvertInt32(ArmEmitterContext context, FPRoundingMode roundMode, bool signed)
-        {
-            // A port of the similar round function in InstEmitSimdCvt.
-            OpCode32SimdCvtFI op = (OpCode32SimdCvtFI)context.CurrOp;
-
-            bool doubleSize = (op.Size & 1) != 0;
-            int shift = doubleSize ? 1 : 2;
-            Operand n = GetVecA32(op.Vm >> shift);
-            n = EmitSwapScalar(context, n, op.Vm, doubleSize);
-
-            if (!doubleSize)
-            {
-                Operand nRes = context.AddIntrinsic(Intrinsic.X86Cmpss, n, n, Const((int)CmpCondition.OrderedQ));
-                nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, n);
-
-                if (roundMode != FPRoundingMode.ToNearestAway)
-                {
-                    nRes = context.AddIntrinsic(Intrinsic.X86Roundss, nRes, Const(X86GetRoundControl(roundMode)));
-                }
-                else
-                {
-                    nRes = EmitSse41RoundToNearestWithTiesToAwayOpF(context, nRes, scalar: true);
-                }
-
-                Operand zero = context.VectorZero();
-
-                Operand nCmp;
-                Operand nIntOrLong2 = default;
-
-                if (!signed)
-                {
-                    nCmp = context.AddIntrinsic(Intrinsic.X86Cmpss, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-                }
-
-                int fpMaxVal = 0x4F000000; // 2.14748365E9f (2147483648)
-
-                Operand fpMaxValMask = X86GetScalar(context, fpMaxVal);
-
-                Operand nIntOrLong = context.AddIntrinsicInt(Intrinsic.X86Cvtss2si, nRes);
-
-                if (!signed)
-                {
-                    nRes = context.AddIntrinsic(Intrinsic.X86Subss, nRes, fpMaxValMask);
-
-                    nCmp = context.AddIntrinsic(Intrinsic.X86Cmpss, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-
-                    nIntOrLong2 = context.AddIntrinsicInt(Intrinsic.X86Cvtss2si, nRes);
-                }
-
-                nRes = context.AddIntrinsic(Intrinsic.X86Cmpss, nRes, fpMaxValMask, Const((int)CmpCondition.NotLessThan));
-
-                Operand nInt = context.AddIntrinsicInt(Intrinsic.X86Cvtsi2si, nRes);
-
-                Operand dRes;
-                if (signed)
-                {
-                    dRes = context.BitwiseExclusiveOr(nIntOrLong, nInt);
-                }
-                else
-                {
-                    dRes = context.BitwiseExclusiveOr(nIntOrLong2, nInt);
-                    dRes = context.Add(dRes, nIntOrLong);
-                }
-
-                InsertScalar(context, op.Vd, dRes);
-            }
-            else
-            {
-                Operand nRes = context.AddIntrinsic(Intrinsic.X86Cmpsd, n, n, Const((int)CmpCondition.OrderedQ));
-                nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, n);
-
-                if (roundMode != FPRoundingMode.ToNearestAway)
-                {
-                    nRes = context.AddIntrinsic(Intrinsic.X86Roundsd, nRes, Const(X86GetRoundControl(roundMode)));
-                }
-                else
-                {
-                    nRes = EmitSse41RoundToNearestWithTiesToAwayOpF(context, nRes, scalar: true);
-                }
-
-                Operand zero = context.VectorZero();
-
-                Operand nCmp;
-                Operand nIntOrLong2 = default;
-
-                if (!signed)
-                {
-                    nCmp = context.AddIntrinsic(Intrinsic.X86Cmpsd, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-                }
-
-                long fpMaxVal = 0x41E0000000000000L; // 2147483648.0000000d (2147483648)
-
-                Operand fpMaxValMask = X86GetScalar(context, fpMaxVal);
-
-                Operand nIntOrLong = context.AddIntrinsicInt(Intrinsic.X86Cvtsd2si, nRes);
-
-                if (!signed)
-                {
-                    nRes = context.AddIntrinsic(Intrinsic.X86Subsd, nRes, fpMaxValMask);
-
-                    nCmp = context.AddIntrinsic(Intrinsic.X86Cmpsd, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-
-                    nIntOrLong2 = context.AddIntrinsicInt(Intrinsic.X86Cvtsd2si, nRes);
-                }
-
-                nRes = context.AddIntrinsic(Intrinsic.X86Cmpsd, nRes, fpMaxValMask, Const((int)CmpCondition.NotLessThan));
-
-                Operand nLong = context.AddIntrinsicLong(Intrinsic.X86Cvtsi2si, nRes);
-                nLong = context.ConvertI64ToI32(nLong);
-
-                Operand dRes;
-                if (signed)
-                {
-                    dRes = context.BitwiseExclusiveOr(nIntOrLong, nLong);
-                }
-                else
-                {
-                    dRes = context.BitwiseExclusiveOr(nIntOrLong2, nLong);
-                    dRes = context.Add(dRes, nIntOrLong);
-                }
-
-                InsertScalar(context, op.Vd, dRes);
-            }
-        }
-
-        private static void EmitSse41ConvertVector32(ArmEmitterContext context, FPRoundingMode roundMode, bool signed)
-        {
-            OpCode32Simd op = (OpCode32Simd)context.CurrOp;
-
-            EmitVectorUnaryOpSimd32(context, (n) =>
-            {
-                int sizeF = op.Size & 1;
-
-                if (sizeF == 0)
-                {
-                    Operand nRes = context.AddIntrinsic(Intrinsic.X86Cmpps, n, n, Const((int)CmpCondition.OrderedQ));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, n);
-
-                    nRes = context.AddIntrinsic(Intrinsic.X86Roundps, nRes, Const(X86GetRoundControl(roundMode)));
-
-                    Operand zero = context.VectorZero();
-                    Operand nCmp;
-                    if (!signed)
-                    {
-                        nCmp = context.AddIntrinsic(Intrinsic.X86Cmpps, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                        nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-                    }
-
-                    Operand fpMaxValMask = X86GetAllElements(context, 0x4F000000); // 2.14748365E9f (2147483648)
-
-                    Operand nInt = context.AddIntrinsic(Intrinsic.X86Cvtps2dq, nRes);
-                    Operand nInt2 = default;
-
-                    if (!signed)
-                    {
-                        nRes = context.AddIntrinsic(Intrinsic.X86Subps, nRes, fpMaxValMask);
-
-                        nCmp = context.AddIntrinsic(Intrinsic.X86Cmpps, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                        nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-
-                        nInt2 = context.AddIntrinsic(Intrinsic.X86Cvtps2dq, nRes);
-                    }
-
-                    nRes = context.AddIntrinsic(Intrinsic.X86Cmpps, nRes, fpMaxValMask, Const((int)CmpCondition.NotLessThan));
-
-                    if (signed)
-                    {
-                        return context.AddIntrinsic(Intrinsic.X86Pxor, nInt, nRes);
-                    }
-                    else
-                    {
-                        Operand dRes = context.AddIntrinsic(Intrinsic.X86Pxor, nInt2, nRes);
-                        return context.AddIntrinsic(Intrinsic.X86Paddd, dRes, nInt);
-                    }
-                }
-                else /* if (sizeF == 1) */
-                {
-                    Operand nRes = context.AddIntrinsic(Intrinsic.X86Cmppd, n, n, Const((int)CmpCondition.OrderedQ));
-                    nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, n);
-
-                    nRes = context.AddIntrinsic(Intrinsic.X86Roundpd, nRes, Const(X86GetRoundControl(roundMode)));
-
-                    Operand zero = context.VectorZero();
-                    Operand nCmp;
-                    if (!signed)
-                    {
-                        nCmp = context.AddIntrinsic(Intrinsic.X86Cmppd, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                        nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-                    }
-
-                    Operand fpMaxValMask = X86GetAllElements(context, 0x43E0000000000000L); // 9.2233720368547760E18d (9223372036854775808)
-
-                    Operand nLong = InstEmit.EmitSse2CvtDoubleToInt64OpF(context, nRes, false);
-                    Operand nLong2 = default;
-
-                    if (!signed)
-                    {
-                        nRes = context.AddIntrinsic(Intrinsic.X86Subpd, nRes, fpMaxValMask);
-
-                        nCmp = context.AddIntrinsic(Intrinsic.X86Cmppd, nRes, zero, Const((int)CmpCondition.NotLessThanOrEqual));
-                        nRes = context.AddIntrinsic(Intrinsic.X86Pand, nRes, nCmp);
-
-                        nLong2 = InstEmit.EmitSse2CvtDoubleToInt64OpF(context, nRes, false);
-                    }
-
-                    nRes = context.AddIntrinsic(Intrinsic.X86Cmppd, nRes, fpMaxValMask, Const((int)CmpCondition.NotLessThan));
-
-                    if (signed)
-                    {
-                        return context.AddIntrinsic(Intrinsic.X86Pxor, nLong, nRes);
-                    }
-                    else
-                    {
-                        Operand dRes = context.AddIntrinsic(Intrinsic.X86Pxor, nLong2, nRes);
-                        return context.AddIntrinsic(Intrinsic.X86Paddq, dRes, nLong);
-                    }
-                }
-            });
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSimdLogical.cs

@@ -1,581 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-using System;
-using System.Diagnostics;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit
-    {
-        public static void And_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorBinaryOp(context, Intrinsic.Arm64AndV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pand, n, m);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorBinaryOpZx(context, (op1, op2) => context.BitwiseAnd(op1, op2));
-            }
-        }
-
-        public static void Bic_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorBinaryOp(context, Intrinsic.Arm64BicV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pandn, m, n);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorBinaryOpZx(context, (op1, op2) =>
-                {
-                    return context.BitwiseAnd(op1, context.BitwiseNot(op2));
-                });
-            }
-        }
-
-        public static void Bic_Vi(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSse2)
-            {
-                OpCodeSimdImm op = (OpCodeSimdImm)context.CurrOp;
-
-                int eSize = 8 << op.Size;
-
-                Operand d = GetVec(op.Rd);
-                Operand imm = eSize switch {
-                    16 => X86GetAllElements(context, (short)~op.Immediate),
-                    32 => X86GetAllElements(context, (int)~op.Immediate),
-                    _ => throw new InvalidOperationException($"Invalid element size {eSize}.")
-                };
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pand, d, imm);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorImmBinaryOp(context, (op1, op2) =>
-                {
-                    return context.BitwiseAnd(op1, context.BitwiseNot(op2));
-                });
-            }
-        }
-
-        public static void Bif_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorTernaryOpRd(context, Intrinsic.Arm64BifV);
-            }
-            else
-            {
-                EmitBifBit(context, notRm: true);
-            }
-        }
-
-        public static void Bit_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorTernaryOpRd(context, Intrinsic.Arm64BitV);
-            }
-            else
-            {
-                EmitBifBit(context, notRm: false);
-            }
-        }
-
-        private static void EmitBifBit(ArmEmitterContext context, bool notRm)
-        {
-            OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-            if (Optimizations.UseSse2)
-            {
-                Operand d = GetVec(op.Rd);
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pxor, n, d);
-
-                if (notRm)
-                {
-                    res = context.AddIntrinsic(Intrinsic.X86Pandn, m, res);
-                }
-                else
-                {
-                    res = context.AddIntrinsic(Intrinsic.X86Pand, m, res);
-                }
-
-                res = context.AddIntrinsic(Intrinsic.X86Pxor, d, res);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(d, res);
-            }
-            else
-            {
-                Operand res = context.VectorZero();
-
-                int elems = op.RegisterSize == RegisterSize.Simd128 ? 2 : 1;
-
-                for (int index = 0; index < elems; index++)
-                {
-                    Operand d = EmitVectorExtractZx(context, op.Rd, index, 3);
-                    Operand n = EmitVectorExtractZx(context, op.Rn, index, 3);
-                    Operand m = EmitVectorExtractZx(context, op.Rm, index, 3);
-
-                    if (notRm)
-                    {
-                        m = context.BitwiseNot(m);
-                    }
-
-                    Operand e = context.BitwiseExclusiveOr(d, n);
-
-                    e = context.BitwiseAnd(e, m);
-                    e = context.BitwiseExclusiveOr(e, d);
-
-                    res = EmitVectorInsert(context, res, e, index, 3);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-        }
-
-        public static void Bsl_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorTernaryOpRd(context, Intrinsic.Arm64BslV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand d = GetVec(op.Rd);
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pxor, n, m);
-
-                res = context.AddIntrinsic(Intrinsic.X86Pand, res, d);
-                res = context.AddIntrinsic(Intrinsic.X86Pxor, res, m);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(d, res);
-            }
-            else
-            {
-                EmitVectorTernaryOpZx(context, (op1, op2, op3) =>
-                {
-                    return context.BitwiseExclusiveOr(
-                        context.BitwiseAnd(op1,
-                        context.BitwiseExclusiveOr(op2, op3)), op3);
-                });
-            }
-        }
-
-        public static void Eor_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorBinaryOp(context, Intrinsic.Arm64EorV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pxor, n, m);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorBinaryOpZx(context, (op1, op2) => context.BitwiseExclusiveOr(op1, op2));
-            }
-        }
-
-        public static void Not_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSse2)
-            {
-                OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-
-                Operand mask = X86GetAllElements(context, -1L);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pandn, n, mask);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorUnaryOpZx(context, (op1) => context.BitwiseNot(op1));
-            }
-        }
-
-        public static void Orn_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorBinaryOp(context, Intrinsic.Arm64OrnV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand mask = X86GetAllElements(context, -1L);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pandn, m, mask);
-
-                res = context.AddIntrinsic(Intrinsic.X86Por, res, n);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorBinaryOpZx(context, (op1, op2) =>
-                {
-                    return context.BitwiseOr(op1, context.BitwiseNot(op2));
-                });
-            }
-        }
-
-        public static void Orr_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelperArm64.EmitVectorBinaryOp(context, Intrinsic.Arm64OrrV);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                OpCodeSimdReg op = (OpCodeSimdReg)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-                Operand m = GetVec(op.Rm);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Por, n, m);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorBinaryOpZx(context, (op1, op2) => context.BitwiseOr(op1, op2));
-            }
-        }
-
-        public static void Orr_Vi(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSse2)
-            {
-                OpCodeSimdImm op = (OpCodeSimdImm)context.CurrOp;
-
-                int eSize = 8 << op.Size;
-
-                Operand d = GetVec(op.Rd);
-                Operand imm = eSize switch {
-                    16 => X86GetAllElements(context, (short)op.Immediate),
-                    32 => X86GetAllElements(context, (int)op.Immediate),
-                    _ => throw new InvalidOperationException($"Invalid element size {eSize}.")
-                };
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Por, d, imm);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitVectorImmBinaryOp(context, (op1, op2) => context.BitwiseOr(op1, op2));
-            }
-        }
-
-        public static void Rbit_V(ArmEmitterContext context)
-        {
-            OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-            if (Optimizations.UseGfni)
-            {
-                const long bitMatrix =
-                    (0b10000000L << 56) |
-                    (0b01000000L << 48) |
-                    (0b00100000L << 40) |
-                    (0b00010000L << 32) |
-                    (0b00001000L << 24) |
-                    (0b00000100L << 16) |
-                    (0b00000010L <<  8) |
-                    (0b00000001L <<  0);
-
-                Operand vBitMatrix = X86GetAllElements(context, bitMatrix);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Gf2p8affineqb, GetVec(op.Rn), vBitMatrix, Const(0));
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                Operand res = context.VectorZero();
-                int elems = op.RegisterSize == RegisterSize.Simd128 ? 16 : 8;
-
-                for (int index = 0; index < elems; index++)
-                {
-                    Operand ne = EmitVectorExtractZx(context, op.Rn, index, 0);
-
-                    Operand de = EmitReverseBits8Op(context, ne);
-
-                    res = EmitVectorInsert(context, res, de, index, 0);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-        }
-
-        private static Operand EmitReverseBits8Op(ArmEmitterContext context, Operand op)
-        {
-            Debug.Assert(op.Type == OperandType.I64);
-
-            Operand val = context.BitwiseOr(context.ShiftRightUI(context.BitwiseAnd(op, Const(0xaaul)), Const(1)),
-                                            context.ShiftLeft   (context.BitwiseAnd(op, Const(0x55ul)), Const(1)));
-
-            val = context.BitwiseOr(context.ShiftRightUI(context.BitwiseAnd(val, Const(0xccul)), Const(2)),
-                                    context.ShiftLeft   (context.BitwiseAnd(val, Const(0x33ul)), Const(2)));
-
-            return context.BitwiseOr(context.ShiftRightUI(val, Const(4)),
-                                     context.ShiftLeft   (context.BitwiseAnd(val, Const(0x0ful)), Const(4)));
-        }
-
-        public static void Rev16_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSsse3)
-            {
-                OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-
-                const long maskE0 = 06L << 56 | 07L << 48 | 04L << 40 | 05L << 32 | 02L << 24 | 03L << 16 | 00L << 8 | 01L << 0;
-                const long maskE1 = 14L << 56 | 15L << 48 | 12L << 40 | 13L << 32 | 10L << 24 | 11L << 16 | 08L << 8 | 09L << 0;
-
-                Operand mask = X86GetScalar(context, maskE0);
-
-                mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitRev_V(context, containerSize: 1);
-            }
-        }
-
-        public static void Rev32_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSsse3)
-            {
-                OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-
-                Operand mask;
-
-                if (op.Size == 0)
-                {
-                    const long maskE0 = 04L << 56 | 05L << 48 | 06L << 40 | 07L << 32 | 00L << 24 | 01L << 16 | 02L << 8 | 03L << 0;
-                    const long maskE1 = 12L << 56 | 13L << 48 | 14L << 40 | 15L << 32 | 08L << 24 | 09L << 16 | 10L << 8 | 11L << 0;
-
-                    mask = X86GetScalar(context, maskE0);
-
-                    mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                }
-                else /* if (op.Size == 1) */
-                {
-                    const long maskE0 = 05L << 56 | 04L << 48 | 07L << 40 | 06L << 32 | 01L << 24 | 00L << 16 | 03L << 8 | 02L << 0;
-                    const long maskE1 = 13L << 56 | 12L << 48 | 15L << 40 | 14L << 32 | 09L << 24 | 08L << 16 | 11L << 8 | 10L << 0;
-
-                    mask = X86GetScalar(context, maskE0);
-
-                    mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                }
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitRev_V(context, containerSize: 2);
-            }
-        }
-
-        public static void Rev64_V(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSsse3)
-            {
-                OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-                Operand n = GetVec(op.Rn);
-
-                Operand mask;
-
-                if (op.Size == 0)
-                {
-                    const long maskE0 = 00L << 56 | 01L << 48 | 02L << 40 | 03L << 32 | 04L << 24 | 05L << 16 | 06L << 8 | 07L << 0;
-                    const long maskE1 = 08L << 56 | 09L << 48 | 10L << 40 | 11L << 32 | 12L << 24 | 13L << 16 | 14L << 8 | 15L << 0;
-
-                    mask = X86GetScalar(context, maskE0);
-
-                    mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                }
-                else if (op.Size == 1)
-                {
-                    const long maskE0 = 01L << 56 | 00L << 48 | 03L << 40 | 02L << 32 | 05L << 24 | 04L << 16 | 07L << 8 | 06L << 0;
-                    const long maskE1 = 09L << 56 | 08L << 48 | 11L << 40 | 10L << 32 | 13L << 24 | 12L << 16 | 15L << 8 | 14L << 0;
-
-                    mask = X86GetScalar(context, maskE0);
-
-                    mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                }
-                else /* if (op.Size == 2) */
-                {
-                    const long maskE0 = 03L << 56 | 02L << 48 | 01L << 40 | 00L << 32 | 07L << 24 | 06L << 16 | 05L << 8 | 04L << 0;
-                    const long maskE1 = 11L << 56 | 10L << 48 | 09L << 40 | 08L << 32 | 15L << 24 | 14L << 16 | 13L << 8 | 12L << 0;
-
-                    mask = X86GetScalar(context, maskE0);
-
-                    mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                }
-
-                Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
-
-                if (op.RegisterSize == RegisterSize.Simd64)
-                {
-                    res = context.VectorZeroUpper64(res);
-                }
-
-                context.Copy(GetVec(op.Rd), res);
-            }
-            else
-            {
-                EmitRev_V(context, containerSize: 3);
-            }
-        }
-
-        private static void EmitRev_V(ArmEmitterContext context, int containerSize)
-        {
-            OpCodeSimd op = (OpCodeSimd)context.CurrOp;
-
-            Operand res = context.VectorZero();
-
-            int elems = op.GetBytesCount() >> op.Size;
-
-            int containerMask = (1 << (containerSize - op.Size)) - 1;
-
-            for (int index = 0; index < elems; index++)
-            {
-                int revIndex = index ^ containerMask;
-
-                Operand ne = EmitVectorExtractZx(context, op.Rn, revIndex, op.Size);
-
-                res = EmitVectorInsert(context, res, ne, index, op.Size);
-            }
-
-            context.Copy(GetVec(op.Rd), res);
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSimdLogical32.cs

@@ -1,259 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper32;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit32
-    {
-        public static void Vand_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.Arm64AndV | Intrinsic.Arm64V128, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.X86Pand, n, m));
-            }
-            else
-            {
-                EmitVectorBinaryOpZx32(context, (op1, op2) => context.BitwiseAnd(op1, op2));
-            }
-        }
-
-        public static void Vbic_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.Arm64BicV | Intrinsic.Arm64V128, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.X86Pandn, m, n));
-            }
-            else
-            {
-                EmitVectorBinaryOpZx32(context, (op1, op2) => context.BitwiseAnd(op1, context.BitwiseNot(op2)));
-            }
-        }
-
-        public static void Vbic_II(ArmEmitterContext context)
-        {
-            OpCode32SimdImm op = (OpCode32SimdImm)context.CurrOp;
-
-            long immediate = op.Immediate;
-
-            // Replicate fields to fill the 64-bits, if size is < 64-bits.
-            switch (op.Size)
-            {
-                case 0: immediate *= 0x0101010101010101L; break;
-                case 1: immediate *= 0x0001000100010001L; break;
-                case 2: immediate *= 0x0000000100000001L; break;
-            }
-
-            Operand imm = Const(immediate);
-            Operand res = GetVecA32(op.Qd);
-
-            if (op.Q)
-            {
-                for (int elem = 0; elem < 2; elem++)
-                {
-                    Operand de = EmitVectorExtractZx(context, op.Qd, elem, 3);
-
-                    res = EmitVectorInsert(context, res, context.BitwiseAnd(de, context.BitwiseNot(imm)), elem, 3);
-                }
-            }
-            else
-            {
-                Operand de = EmitVectorExtractZx(context, op.Qd, op.Vd & 1, 3);
-
-                res = EmitVectorInsert(context, res, context.BitwiseAnd(de, context.BitwiseNot(imm)), op.Vd & 1, 3);
-            }
-
-            context.Copy(GetVecA32(op.Qd), res);
-        }
-
-        public static void Vbif(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorTernaryOpSimd32(context, (d, n, m) => context.AddIntrinsic(Intrinsic.Arm64BifV | Intrinsic.Arm64V128, d, n, m));
-            }
-            else
-            {
-                EmitBifBit(context, true);
-            }
-        }
-
-        public static void Vbit(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorTernaryOpSimd32(context, (d, n, m) => context.AddIntrinsic(Intrinsic.Arm64BitV | Intrinsic.Arm64V128, d, n, m));
-            }
-            else
-            {
-                EmitBifBit(context, false);
-            }
-        }
-
-        public static void Vbsl(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorTernaryOpSimd32(context, (d, n, m) => context.AddIntrinsic(Intrinsic.Arm64BslV | Intrinsic.Arm64V128, d, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorTernaryOpSimd32(context, (d, n, m) =>
-                {
-                    Operand res = context.AddIntrinsic(Intrinsic.X86Pxor, n, m);
-                    res = context.AddIntrinsic(Intrinsic.X86Pand, res, d);
-                    return context.AddIntrinsic(Intrinsic.X86Pxor, res, m);
-                });
-            }
-            else
-            {
-                EmitVectorTernaryOpZx32(context, (op1, op2, op3) =>
-                {
-                    return context.BitwiseExclusiveOr(
-                        context.BitwiseAnd(op1,
-                        context.BitwiseExclusiveOr(op2, op3)), op3);
-                });
-            }
-        }
-
-        public static void Veor_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.Arm64EorV | Intrinsic.Arm64V128, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.X86Pxor, n, m));
-            }
-            else
-            {
-                EmitVectorBinaryOpZx32(context, (op1, op2) => context.BitwiseExclusiveOr(op1, op2));
-            }
-        }
-
-        public static void Vorn_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.Arm64OrnV | Intrinsic.Arm64V128, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                Operand mask = context.VectorOne();
-
-                EmitVectorBinaryOpSimd32(context, (n, m) =>
-                {
-                    m = context.AddIntrinsic(Intrinsic.X86Pandn, m, mask);
-                    return context.AddIntrinsic(Intrinsic.X86Por, n, m);
-                });
-            }
-            else
-            {
-                EmitVectorBinaryOpZx32(context, (op1, op2) => context.BitwiseOr(op1, context.BitwiseNot(op2)));
-            }
-        }
-
-        public static void Vorr_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                InstEmitSimdHelper32Arm64.EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.Arm64OrrV | Intrinsic.Arm64V128, n, m));
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorBinaryOpSimd32(context, (n, m) => context.AddIntrinsic(Intrinsic.X86Por, n, m));
-            }
-            else
-            {
-                EmitVectorBinaryOpZx32(context, (op1, op2) => context.BitwiseOr(op1, op2));
-            }
-        }
-
-        public static void Vorr_II(ArmEmitterContext context)
-        {
-            OpCode32SimdImm op = (OpCode32SimdImm)context.CurrOp;
-
-            long immediate = op.Immediate;
-
-            // Replicate fields to fill the 64-bits, if size is < 64-bits.
-            switch (op.Size)
-            {
-                case 0: immediate *= 0x0101010101010101L; break;
-                case 1: immediate *= 0x0001000100010001L; break;
-                case 2: immediate *= 0x0000000100000001L; break;
-            }
-
-            Operand imm = Const(immediate);
-            Operand res = GetVecA32(op.Qd);
-
-            if (op.Q)
-            {
-                for (int elem = 0; elem < 2; elem++)
-                {
-                    Operand de = EmitVectorExtractZx(context, op.Qd, elem, 3);
-
-                    res = EmitVectorInsert(context, res, context.BitwiseOr(de, imm), elem, 3);
-                }
-            }
-            else
-            {
-                Operand de = EmitVectorExtractZx(context, op.Qd, op.Vd & 1, 3);
-
-                res = EmitVectorInsert(context, res, context.BitwiseOr(de, imm), op.Vd & 1, 3);
-            }
-
-            context.Copy(GetVecA32(op.Qd), res);
-        }
-
-        public static void Vtst(ArmEmitterContext context)
-        {
-            EmitVectorBinaryOpZx32(context, (op1, op2) =>
-            {
-                Operand isZero = context.ICompareEqual(context.BitwiseAnd(op1, op2), Const(0));
-                return context.ConditionalSelect(isZero, Const(0), Const(-1));
-            });
-        }
-
-        private static void EmitBifBit(ArmEmitterContext context, bool notRm)
-        {
-            OpCode32SimdReg op = (OpCode32SimdReg)context.CurrOp;
-
-            if (Optimizations.UseSse2)
-            {
-                EmitVectorTernaryOpSimd32(context, (d, n, m) =>
-                {
-                    Operand res = context.AddIntrinsic(Intrinsic.X86Pxor, n, d);
-                    res = context.AddIntrinsic((notRm) ? Intrinsic.X86Pandn : Intrinsic.X86Pand, m, res);
-                    return context.AddIntrinsic(Intrinsic.X86Pxor, d, res);
-                });
-            }
-            else
-            {
-                EmitVectorTernaryOpZx32(context, (d, n, m) =>
-                {
-                    if (notRm)
-                    {
-                        m = context.BitwiseNot(m);
-                    }
-                    return context.BitwiseExclusiveOr(
-                        context.BitwiseAnd(m,
-                        context.BitwiseExclusiveOr(d, n)), d);
-                });
-            }
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSimdMove32.cs

@@ -1,649 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Translation;
-using System;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper;
-using static ARMeilleure.Instructions.InstEmitSimdHelper32;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit32
-    {
-        #region "Masks"
-        // Same as InstEmitSimdMove, as the instructions do the same thing.
-        private static readonly long[] _masksE0_Uzp = new long[]
-        {
-            13L << 56 | 09L << 48 | 05L << 40 | 01L << 32 | 12L << 24 | 08L << 16 | 04L << 8 | 00L << 0,
-            11L << 56 | 10L << 48 | 03L << 40 | 02L << 32 | 09L << 24 | 08L << 16 | 01L << 8 | 00L << 0
-        };
-
-        private static readonly long[] _masksE1_Uzp = new long[]
-        {
-            15L << 56 | 11L << 48 | 07L << 40 | 03L << 32 | 14L << 24 | 10L << 16 | 06L << 8 | 02L << 0,
-            15L << 56 | 14L << 48 | 07L << 40 | 06L << 32 | 13L << 24 | 12L << 16 | 05L << 8 | 04L << 0
-        };
-        #endregion
-
-        public static void Vmov_I(ArmEmitterContext context)
-        {
-            EmitVectorImmUnaryOp32(context, (op1) => op1);
-        }
-
-        public static void Vmvn_I(ArmEmitterContext context)
-        {
-            if (Optimizations.UseSse2)
-            {
-                EmitVectorUnaryOpSimd32(context, (op1) =>
-                {
-                    Operand mask = X86GetAllElements(context, -1L);
-                    return context.AddIntrinsic(Intrinsic.X86Pandn, op1, mask);
-                });
-            }
-            else
-            {
-                EmitVectorUnaryOpZx32(context, (op1) => context.BitwiseNot(op1));
-            }
-        }
-
-        public static void Vmvn_II(ArmEmitterContext context)
-        {
-            EmitVectorImmUnaryOp32(context, (op1) => context.BitwiseNot(op1));
-        }
-
-        public static void Vmov_GS(ArmEmitterContext context)
-        {
-            OpCode32SimdMovGp op = (OpCode32SimdMovGp)context.CurrOp;
-
-            Operand vec = GetVecA32(op.Vn >> 2);
-            if (op.Op == 1)
-            {
-                // To general purpose.
-                Operand value = context.VectorExtract(OperandType.I32, vec, op.Vn & 0x3);
-                SetIntA32(context, op.Rt, value);
-            }
-            else
-            {
-                // From general purpose.
-                Operand value = GetIntA32(context, op.Rt);
-                context.Copy(vec, context.VectorInsert(vec, value, op.Vn & 0x3));
-            }
-        }
-
-        public static void Vmov_G1(ArmEmitterContext context)
-        {
-            OpCode32SimdMovGpElem op = (OpCode32SimdMovGpElem)context.CurrOp;
-
-            int index = op.Index + ((op.Vd & 1) << (3 - op.Size));
-            if (op.Op == 1)
-            {
-                // To general purpose.
-                Operand value = EmitVectorExtract32(context, op.Vd >> 1, index, op.Size, !op.U);
-                SetIntA32(context, op.Rt, value);
-            }
-            else
-            {
-                // From general purpose.
-                Operand vec = GetVecA32(op.Vd >> 1);
-                Operand value = GetIntA32(context, op.Rt);
-                context.Copy(vec, EmitVectorInsert(context, vec, value, index, op.Size));
-            }
-        }
-
-        public static void Vmov_G2(ArmEmitterContext context)
-        {
-            OpCode32SimdMovGpDouble op = (OpCode32SimdMovGpDouble)context.CurrOp;
-
-            Operand vec = GetVecA32(op.Vm >> 2);
-            int vm1 = op.Vm + 1;
-            bool sameOwnerVec = (op.Vm >> 2) == (vm1 >> 2);
-            Operand vec2 = sameOwnerVec ? vec : GetVecA32(vm1 >> 2);
-            if (op.Op == 1)
-            {
-                // To general purpose.
-                Operand lowValue = context.VectorExtract(OperandType.I32, vec, op.Vm & 3);
-                SetIntA32(context, op.Rt, lowValue);
-
-                Operand highValue = context.VectorExtract(OperandType.I32, vec2, vm1 & 3);
-                SetIntA32(context, op.Rt2, highValue);
-            }
-            else
-            {
-                // From general purpose.
-                Operand lowValue = GetIntA32(context, op.Rt);
-                Operand resultVec = context.VectorInsert(vec, lowValue, op.Vm & 3);
-
-                Operand highValue = GetIntA32(context, op.Rt2);
-
-                if (sameOwnerVec)
-                {
-                    context.Copy(vec, context.VectorInsert(resultVec, highValue, vm1 & 3));
-                }
-                else
-                {
-                    context.Copy(vec, resultVec);
-                    context.Copy(vec2, context.VectorInsert(vec2, highValue, vm1 & 3));
-                }
-            }
-        }
-
-        public static void Vmov_GD(ArmEmitterContext context)
-        {
-            OpCode32SimdMovGpDouble op = (OpCode32SimdMovGpDouble)context.CurrOp;
-
-            Operand vec = GetVecA32(op.Vm >> 1);
-            if (op.Op == 1)
-            {
-                // To general purpose.
-                Operand value = context.VectorExtract(OperandType.I64, vec, op.Vm & 1);
-                SetIntA32(context, op.Rt, context.ConvertI64ToI32(value));
-                SetIntA32(context, op.Rt2, context.ConvertI64ToI32(context.ShiftRightUI(value, Const(32))));
-            }
-            else
-            {
-                // From general purpose.
-                Operand lowValue = GetIntA32(context, op.Rt);
-                Operand highValue = GetIntA32(context, op.Rt2);
-
-                Operand value = context.BitwiseOr(
-                    context.ZeroExtend32(OperandType.I64, lowValue),
-                    context.ShiftLeft(context.ZeroExtend32(OperandType.I64, highValue), Const(32)));
-
-                context.Copy(vec, context.VectorInsert(vec, value, op.Vm & 1));
-            }
-        }
-
-        public static void Vmovl(ArmEmitterContext context)
-        {
-            OpCode32SimdLong op = (OpCode32SimdLong)context.CurrOp;
-
-            Operand res = context.VectorZero();
-
-            int elems = op.GetBytesCount() >> op.Size;
-
-            for (int index = 0; index < elems; index++)
-            {
-                Operand me = EmitVectorExtract32(context, op.Qm, op.Im + index, op.Size, !op.U);
-
-                if (op.Size == 2)
-                {
-                    if (op.U)
-                    {
-                        me = context.ZeroExtend32(OperandType.I64, me);
-                    }
-                    else
-                    {
-                        me = context.SignExtend32(OperandType.I64, me);
-                    }
-                }
-
-                res = EmitVectorInsert(context, res, me, index, op.Size + 1);
-            }
-
-            context.Copy(GetVecA32(op.Qd), res);
-        }
-
-        public static void Vtbl(ArmEmitterContext context)
-        {
-            OpCode32SimdTbl op = (OpCode32SimdTbl)context.CurrOp;
-
-            bool extension = op.Opc == 1;
-            int length = op.Length + 1;
-
-            if (Optimizations.UseSsse3)
-            {
-                Operand d = GetVecA32(op.Qd);
-                Operand m = EmitMoveDoubleWordToSide(context, GetVecA32(op.Qm), op.Vm, 0);
-
-                Operand res;
-                Operand mask = X86GetAllElements(context, 0x0707070707070707L);
-
-                // Fast path for single register table.
-                {
-                    Operand n = EmitMoveDoubleWordToSide(context, GetVecA32(op.Qn), op.Vn, 0);
-
-                    Operand mMask = context.AddIntrinsic(Intrinsic.X86Pcmpgtb, m, mask);
-                    mMask = context.AddIntrinsic(Intrinsic.X86Por, mMask, m);
-
-                    res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mMask);
-                }
-
-                for (int index = 1; index < length; index++)
-                {
-                    int newVn = (op.Vn + index) & 0x1F;
-                    (int qn, int ind) = GetQuadwordAndSubindex(newVn, op.RegisterSize);
-                    Operand ni = EmitMoveDoubleWordToSide(context, GetVecA32(qn), newVn, 0);
-
-                    Operand idxMask = X86GetAllElements(context, 0x0808080808080808L * index);
-
-                    Operand mSubMask = context.AddIntrinsic(Intrinsic.X86Psubb, m, idxMask);
-
-                    Operand mMask = context.AddIntrinsic(Intrinsic.X86Pcmpgtb, mSubMask, mask);
-                    mMask = context.AddIntrinsic(Intrinsic.X86Por, mMask, mSubMask);
-
-                    Operand res2 = context.AddIntrinsic(Intrinsic.X86Pshufb, ni, mMask);
-
-                    res = context.AddIntrinsic(Intrinsic.X86Por, res, res2);
-                }
-
-                if (extension)
-                {
-                    Operand idxMask = X86GetAllElements(context, (0x0808080808080808L * length) - 0x0101010101010101L);
-                    Operand zeroMask = context.VectorZero();
-
-                    Operand mPosMask = context.AddIntrinsic(Intrinsic.X86Pcmpgtb, m, idxMask);
-                    Operand mNegMask = context.AddIntrinsic(Intrinsic.X86Pcmpgtb, zeroMask, m);
-
-                    Operand mMask = context.AddIntrinsic(Intrinsic.X86Por, mPosMask, mNegMask);
-
-                    Operand dMask = context.AddIntrinsic(Intrinsic.X86Pand, EmitMoveDoubleWordToSide(context, d, op.Vd, 0), mMask);
-
-                    res = context.AddIntrinsic(Intrinsic.X86Por, res, dMask);
-                }
-
-                res = EmitMoveDoubleWordToSide(context, res, 0, op.Vd);
-
-                context.Copy(d, EmitDoubleWordInsert(context, d, res, op.Vd));
-            }
-            else
-            {
-                int elems = op.GetBytesCount() >> op.Size;
-
-                (int Qx, int Ix)[] tableTuples = new (int, int)[length];
-                for (int i = 0; i < length; i++)
-                {
-                    tableTuples[i] = GetQuadwordAndSubindex(op.Vn + i, op.RegisterSize);
-                }
-
-                int byteLength = length * 8;
-
-                Operand res = GetVecA32(op.Qd);
-                Operand m = GetVecA32(op.Qm);
-
-                for (int index = 0; index < elems; index++)
-                {
-                    Operand selectedIndex = context.ZeroExtend8(OperandType.I32, context.VectorExtract8(m, index + op.Im));
-
-                    Operand inRange = context.ICompareLess(selectedIndex, Const(byteLength));
-                    Operand elemRes = default; // Note: This is I64 for ease of calculation.
-
-                    // TODO: Branching rather than conditional select.
-
-                    // Get indexed byte.
-                    // To simplify (ha) the il, we get bytes from every vector and use a nested conditional select to choose the right result.
-                    // This does have to extract `length` times for every element but certainly not as bad as it could be.
-
-                    // Which vector number is the index on.
-                    Operand vecIndex = context.ShiftRightUI(selectedIndex, Const(3));
-                    // What should we shift by to extract it.
-                    Operand subVecIndexShift = context.ShiftLeft(context.BitwiseAnd(selectedIndex, Const(7)), Const(3));
-
-                    for (int i = 0; i < length; i++)
-                    {
-                        (int qx, int ix) = tableTuples[i];
-                        // Get the whole vector, we'll get a byte out of it.
-                        Operand lookupResult;
-                        if (qx == op.Qd)
-                        {
-                            // Result contains the current state of the vector.
-                            lookupResult = context.VectorExtract(OperandType.I64, res, ix);
-                        }
-                        else
-                        {
-                            lookupResult = EmitVectorExtract32(context, qx, ix, 3, false); // I64
-                        }
-
-                        lookupResult = context.ShiftRightUI(lookupResult, subVecIndexShift); // Get the relevant byte from this vector.
-
-                        if (i == 0)
-                        {
-                            elemRes = lookupResult; // First result is always default.
-                        }
-                        else
-                        {
-                            Operand isThisElem = context.ICompareEqual(vecIndex, Const(i));
-                            elemRes = context.ConditionalSelect(isThisElem, lookupResult, elemRes);
-                        }
-                    }
-
-                    Operand fallback = (extension) ? context.ZeroExtend32(OperandType.I64, EmitVectorExtract32(context, op.Qd, index + op.Id, 0, false)) : Const(0L);
-
-                    res = EmitVectorInsert(context, res, context.ConditionalSelect(inRange, elemRes, fallback), index + op.Id, 0);
-                }
-
-                context.Copy(GetVecA32(op.Qd), res);
-            }
-        }
-
-        public static void Vtrn(ArmEmitterContext context)
-        {
-            OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
-
-            if (Optimizations.UseSsse3)
-            {
-                EmitVectorShuffleOpSimd32(context, (m, d) =>
-                {
-                    Operand mask = default;
-
-                    if (op.Size < 3)
-                    {
-                        long maskE0 = EvenMasks[op.Size];
-                        long maskE1 = OddMasks[op.Size];
-
-                        mask = X86GetScalar(context, maskE0);
-
-                        mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-                    }
-
-                    if (op.Size < 3)
-                    {
-                        d = context.AddIntrinsic(Intrinsic.X86Pshufb, d, mask);
-                        m = context.AddIntrinsic(Intrinsic.X86Pshufb, m, mask);
-                    }
-
-                    Operand resD = context.AddIntrinsic(X86PunpcklInstruction[op.Size], d, m);
-                    Operand resM = context.AddIntrinsic(X86PunpckhInstruction[op.Size], d, m);
-
-                    return (resM, resD);
-                });
-            }
-            else
-            {
-                int elems = op.GetBytesCount() >> op.Size;
-                int pairs = elems >> 1;
-
-                bool overlap = op.Qm == op.Qd;
-
-                Operand resD = GetVecA32(op.Qd);
-                Operand resM = GetVecA32(op.Qm);
-
-                for (int index = 0; index < pairs; index++)
-                {
-                    int pairIndex = index << 1;
-                    Operand d2 = EmitVectorExtract32(context, op.Qd, pairIndex + 1 + op.Id, op.Size, false);
-                    Operand m1 = EmitVectorExtract32(context, op.Qm, pairIndex + op.Im, op.Size, false);
-
-                    resD = EmitVectorInsert(context, resD, m1, pairIndex + 1 + op.Id, op.Size);
-
-                    if (overlap)
-                    {
-                        resM = resD;
-                    }
-
-                    resM = EmitVectorInsert(context, resM, d2, pairIndex + op.Im, op.Size);
-
-                    if (overlap)
-                    {
-                        resD = resM;
-                    }
-                }
-
-                context.Copy(GetVecA32(op.Qd), resD);
-                if (!overlap)
-                {
-                    context.Copy(GetVecA32(op.Qm), resM);
-                }
-            }
-        }
-
-        public static void Vzip(ArmEmitterContext context)
-        {
-            OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
-
-            if (Optimizations.UseAdvSimd)
-            {
-                EmitVectorZipUzpOpSimd32(context, Intrinsic.Arm64Zip1V, Intrinsic.Arm64Zip2V);
-            }
-            else if (Optimizations.UseSse2)
-            {
-                EmitVectorShuffleOpSimd32(context, (m, d) =>
-                {
-                    if (op.RegisterSize == RegisterSize.Simd128)
-                    {
-                        Operand resD = context.AddIntrinsic(X86PunpcklInstruction[op.Size], d, m);
-                        Operand resM = context.AddIntrinsic(X86PunpckhInstruction[op.Size], d, m);
-
-                        return (resM, resD);
-                    }
-                    else
-                    {
-                        Operand res = context.AddIntrinsic(X86PunpcklInstruction[op.Size], d, m);
-
-                        Operand resD = context.AddIntrinsic(Intrinsic.X86Punpcklqdq, res, context.VectorZero());
-                        Operand resM = context.AddIntrinsic(Intrinsic.X86Punpckhqdq, res, context.VectorZero());
-                        return (resM, resD);
-                    }
-                });
-            }
-            else
-            {
-                int elems = op.GetBytesCount() >> op.Size;
-                int pairs = elems >> 1;
-
-                bool overlap = op.Qm == op.Qd;
-
-                Operand resD = GetVecA32(op.Qd);
-                Operand resM = GetVecA32(op.Qm);
-
-                for (int index = 0; index < pairs; index++)
-                {
-                    int pairIndex = index << 1;
-                    Operand dRowD = EmitVectorExtract32(context, op.Qd, index + op.Id, op.Size, false);
-                    Operand mRowD = EmitVectorExtract32(context, op.Qm, index + op.Im, op.Size, false);
-
-                    Operand dRowM = EmitVectorExtract32(context, op.Qd, index + op.Id + pairs, op.Size, false);
-                    Operand mRowM = EmitVectorExtract32(context, op.Qm, index + op.Im + pairs, op.Size, false);
-
-                    resD = EmitVectorInsert(context, resD, dRowD, pairIndex + op.Id, op.Size);
-                    resD = EmitVectorInsert(context, resD, mRowD, pairIndex + 1 + op.Id, op.Size);
-
-                    if (overlap)
-                    {
-                        resM = resD;
-                    }
-
-                    resM = EmitVectorInsert(context, resM, dRowM, pairIndex + op.Im, op.Size);
-                    resM = EmitVectorInsert(context, resM, mRowM, pairIndex + 1 + op.Im, op.Size);
-
-                    if (overlap)
-                    {
-                        resD = resM;
-                    }
-                }
-
-                context.Copy(GetVecA32(op.Qd), resD);
-                if (!overlap)
-                {
-                    context.Copy(GetVecA32(op.Qm), resM);
-                }
-            }
-        }
-
-        public static void Vuzp(ArmEmitterContext context)
-        {
-            OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
-
-            if (Optimizations.UseAdvSimd)
-            {
-                EmitVectorZipUzpOpSimd32(context, Intrinsic.Arm64Uzp1V, Intrinsic.Arm64Uzp2V);
-            }
-            else if (Optimizations.UseSsse3)
-            {
-                EmitVectorShuffleOpSimd32(context, (m, d) =>
-                {
-                    if (op.RegisterSize == RegisterSize.Simd128)
-                    {
-                        Operand mask = default;
-
-                        if (op.Size < 3)
-                        {
-                            long maskE0 = EvenMasks[op.Size];
-                            long maskE1 = OddMasks[op.Size];
-
-                            mask = X86GetScalar(context, maskE0);
-                            mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-
-                            d = context.AddIntrinsic(Intrinsic.X86Pshufb, d, mask);
-                            m = context.AddIntrinsic(Intrinsic.X86Pshufb, m, mask);
-                        }
-
-                        Operand resD = context.AddIntrinsic(Intrinsic.X86Punpcklqdq, d, m);
-                        Operand resM = context.AddIntrinsic(Intrinsic.X86Punpckhqdq, d, m);
-
-                        return (resM, resD);
-                    }
-                    else
-                    {
-                        Intrinsic punpcklInst = X86PunpcklInstruction[op.Size];
-
-                        Operand res = context.AddIntrinsic(punpcklInst, d, m);
-
-                        if (op.Size < 2)
-                        {
-                            long maskE0 = _masksE0_Uzp[op.Size];
-                            long maskE1 = _masksE1_Uzp[op.Size];
-
-                            Operand mask = X86GetScalar(context, maskE0);
-
-                            mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
-
-                            res = context.AddIntrinsic(Intrinsic.X86Pshufb, res, mask);
-                        }
-
-                        Operand resD = context.AddIntrinsic(Intrinsic.X86Punpcklqdq, res, context.VectorZero());
-                        Operand resM = context.AddIntrinsic(Intrinsic.X86Punpckhqdq, res, context.VectorZero());
-
-                        return (resM, resD);
-                    }
-                });
-            }
-            else
-            {
-                int elems = op.GetBytesCount() >> op.Size;
-                int pairs = elems >> 1;
-
-                bool overlap = op.Qm == op.Qd;
-
-                Operand resD = GetVecA32(op.Qd);
-                Operand resM = GetVecA32(op.Qm);
-
-                for (int index = 0; index < elems; index++)
-                {
-                    Operand dIns, mIns;
-                    if (index >= pairs)
-                    {
-                        int pairIndex = index - pairs;
-                        dIns = EmitVectorExtract32(context, op.Qm, (pairIndex << 1) + op.Im, op.Size, false);
-                        mIns = EmitVectorExtract32(context, op.Qm, ((pairIndex << 1) | 1) + op.Im, op.Size, false);
-                    }
-                    else
-                    {
-                        dIns = EmitVectorExtract32(context, op.Qd, (index << 1) + op.Id, op.Size, false);
-                        mIns = EmitVectorExtract32(context, op.Qd, ((index << 1) | 1) + op.Id, op.Size, false);
-                    }
-
-                    resD = EmitVectorInsert(context, resD, dIns, index + op.Id, op.Size);
-
-                    if (overlap)
-                    {
-                        resM = resD;
-                    }
-
-                    resM = EmitVectorInsert(context, resM, mIns, index + op.Im, op.Size);
-
-                    if (overlap)
-                    {
-                        resD = resM;
-                    }
-                }
-
-                context.Copy(GetVecA32(op.Qd), resD);
-                if (!overlap)
-                {
-                    context.Copy(GetVecA32(op.Qm), resM);
-                }
-            }
-        }
-
-        private static void EmitVectorZipUzpOpSimd32(ArmEmitterContext context, Intrinsic inst1, Intrinsic inst2)
-        {
-            OpCode32SimdCmpZ op = (OpCode32SimdCmpZ)context.CurrOp;
-
-            bool overlap = op.Qm == op.Qd;
-
-            Operand d = GetVecA32(op.Qd);
-            Operand m = GetVecA32(op.Qm);
-
-            Operand dPart = d;
-            Operand mPart = m;
-
-            if (!op.Q) // Register swap: move relevant doubleword to destination side.
-            {
-                dPart = InstEmitSimdHelper32Arm64.EmitMoveDoubleWordToSide(context, d, op.Vd, 0);
-                mPart = InstEmitSimdHelper32Arm64.EmitMoveDoubleWordToSide(context, m, op.Vm, 0);
-            }
-
-            Intrinsic vSize = op.Q ? Intrinsic.Arm64V128 : Intrinsic.Arm64V64;
-
-            vSize |= (Intrinsic)(op.Size << (int)Intrinsic.Arm64VSizeShift);
-
-            Operand resD = context.AddIntrinsic(inst1 | vSize, dPart, mPart);
-            Operand resM = context.AddIntrinsic(inst2 | vSize, dPart, mPart);
-
-            if (!op.Q) // Register insert.
-            {
-                resD = context.AddIntrinsic(Intrinsic.Arm64InsVe | Intrinsic.Arm64VDWord, d, Const(op.Vd & 1), resD, Const(0));
-
-                if (overlap)
-                {
-                    resD = context.AddIntrinsic(Intrinsic.Arm64InsVe | Intrinsic.Arm64VDWord, resD, Const(op.Vm & 1), resM, Const(0));
-                }
-                else
-                {
-                    resM = context.AddIntrinsic(Intrinsic.Arm64InsVe | Intrinsic.Arm64VDWord, m, Const(op.Vm & 1), resM, Const(0));
-                }
-            }
-
-            context.Copy(d, resD);
-            if (!overlap)
-            {
-                context.Copy(m, resM);
-            }
-        }
-
-        private static void EmitVectorShuffleOpSimd32(ArmEmitterContext context, Func<Operand, Operand, (Operand, Operand)> shuffleFunc)
-        {
-            OpCode32Simd op = (OpCode32Simd)context.CurrOp;
-
-            Operand m = GetVecA32(op.Qm);
-            Operand d = GetVecA32(op.Qd);
-            Operand initialM = m;
-            Operand initialD = d;
-
-            if (!op.Q) // Register swap: move relevant doubleword to side 0, for consistency.
-            {
-                m = EmitMoveDoubleWordToSide(context, m, op.Vm, 0);
-                d = EmitMoveDoubleWordToSide(context, d, op.Vd, 0);
-            }
-
-            (Operand resM, Operand resD) = shuffleFunc(m, d);
-
-            bool overlap = op.Qm == op.Qd;
-
-            if (!op.Q) // Register insert.
-            {
-                resM = EmitDoubleWordInsert(context, initialM, EmitMoveDoubleWordToSide(context, resM, 0, op.Vm), op.Vm);
-                resD = EmitDoubleWordInsert(context, overlap ? resM : initialD, EmitMoveDoubleWordToSide(context, resD, 0, op.Vd), op.Vd);
-            }
-
-            if (!overlap)
-            {
-                context.Copy(initialM, resM);
-            }
-
-            context.Copy(initialD, resD);
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSystem.cs

@@ -1,215 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.State;
-using ARMeilleure.Translation;
-using System;
-using System.Reflection;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit
-    {
-        private const int DczSizeLog2 = 4; // Log2 size in words
-        public const int DczSizeInBytes = 4 << DczSizeLog2;
-
-        public static void Isb(ArmEmitterContext context)
-        {
-            // Execute as no-op.
-        }
-
-        public static void Mrs(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            MethodInfo info;
-
-            switch (GetPackedId(op))
-            {
-                case 0b11_011_0000_0000_001: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCtrEl0)); break;
-                case 0b11_011_0000_0000_111: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetDczidEl0)); break;
-                case 0b11_011_0100_0010_000: EmitGetNzcv(context); return;
-                case 0b11_011_0100_0100_000: EmitGetFpcr(context); return;
-                case 0b11_011_0100_0100_001: EmitGetFpsr(context); return;
-                case 0b11_011_1101_0000_010: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrEl0)); break;
-                case 0b11_011_1101_0000_011: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrroEl0)); break;
-                case 0b11_011_1110_0000_000: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntfrqEl0)); break;
-                case 0b11_011_1110_0000_001: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)); break;
-                case 0b11_011_1110_0000_010: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntvctEl0)); break;
-
-                default: throw new NotImplementedException($"Unknown MRS 0x{op.RawOpCode:X8} at 0x{op.Address:X16}.");
-            }
-
-            SetIntOrZR(context, op.Rt, context.Call(info));
-        }
-
-        public static void Msr(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            MethodInfo info;
-
-            switch (GetPackedId(op))
-            {
-                case 0b11_011_0100_0010_000: EmitSetNzcv(context); return;
-                case 0b11_011_0100_0100_000: EmitSetFpcr(context); return;
-                case 0b11_011_0100_0100_001: EmitSetFpsr(context); return;
-                case 0b11_011_1101_0000_010: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.SetTpidrEl0)); break;
-
-                default: throw new NotImplementedException($"Unknown MSR 0x{op.RawOpCode:X8} at 0x{op.Address:X16}.");
-            }
-
-            context.Call(info, GetIntOrZR(context, op.Rt));
-        }
-
-        public static void Nop(ArmEmitterContext context)
-        {
-            // Do nothing.
-        }
-
-        public static void Sys(ArmEmitterContext context)
-        {
-            // This instruction is used to do some operations on the CPU like cache invalidation,
-            // address translation and the like.
-            // We treat it as no-op here since we don't have any cache being emulated anyway.
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            switch (GetPackedId(op))
-            {
-                case 0b11_011_0111_0100_001:
-                {
-                    // DC ZVA
-                    Operand t = GetIntOrZR(context, op.Rt);
-
-                    for (long offset = 0; offset < DczSizeInBytes; offset += 8)
-                    {
-                        Operand address = context.Add(t, Const(offset));
-
-                        InstEmitMemoryHelper.EmitStore(context, address, RegisterConsts.ZeroIndex, 3);
-                    }
-
-                    break;
-                }
-
-                // No-op
-                case 0b11_011_0111_1110_001: // DC CIVAC
-                    break;
-
-                case 0b11_011_0111_0101_001: // IC IVAU
-                    Operand target = Register(op.Rt, RegisterType.Integer, OperandType.I64);
-                    context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.InvalidateCacheLine)), target);
-                    break;
-            }
-        }
-
-        private static int GetPackedId(OpCodeSystem op)
-        {
-            int id;
-
-            id  = op.Op2 << 0;
-            id |= op.CRm << 3;
-            id |= op.CRn << 7;
-            id |= op.Op1 << 11;
-            id |= op.Op0 << 14;
-
-            return id;
-        }
-
-        private static void EmitGetNzcv(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            Operand nzcv = context.ShiftLeft(GetFlag(PState.VFlag), Const((int)PState.VFlag));
-            nzcv = context.BitwiseOr(nzcv, context.ShiftLeft(GetFlag(PState.CFlag), Const((int)PState.CFlag)));
-            nzcv = context.BitwiseOr(nzcv, context.ShiftLeft(GetFlag(PState.ZFlag), Const((int)PState.ZFlag)));
-            nzcv = context.BitwiseOr(nzcv, context.ShiftLeft(GetFlag(PState.NFlag), Const((int)PState.NFlag)));
-
-            SetIntOrZR(context, op.Rt, nzcv);
-        }
-
-        private static void EmitGetFpcr(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            Operand fpcr = Const(0);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPCR.Mask.HasFlag((FPCR)(1u << flag)))
-                {
-                    fpcr = context.BitwiseOr(fpcr, context.ShiftLeft(GetFpFlag((FPState)flag), Const(flag)));
-                }
-            }
-
-            SetIntOrZR(context, op.Rt, fpcr);
-        }
-
-        private static void EmitGetFpsr(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            context.SyncQcFlag();
-
-            Operand fpsr = Const(0);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPSR.Mask.HasFlag((FPSR)(1u << flag)))
-                {
-                    fpsr = context.BitwiseOr(fpsr, context.ShiftLeft(GetFpFlag((FPState)flag), Const(flag)));
-                }
-            }
-
-            SetIntOrZR(context, op.Rt, fpsr);
-        }
-
-        private static void EmitSetNzcv(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            Operand nzcv = GetIntOrZR(context, op.Rt);
-                    nzcv = context.ConvertI64ToI32(nzcv);
-
-            SetFlag(context, PState.VFlag, context.BitwiseAnd(context.ShiftRightUI(nzcv, Const((int)PState.VFlag)), Const(1)));
-            SetFlag(context, PState.CFlag, context.BitwiseAnd(context.ShiftRightUI(nzcv, Const((int)PState.CFlag)), Const(1)));
-            SetFlag(context, PState.ZFlag, context.BitwiseAnd(context.ShiftRightUI(nzcv, Const((int)PState.ZFlag)), Const(1)));
-            SetFlag(context, PState.NFlag, context.BitwiseAnd(context.ShiftRightUI(nzcv, Const((int)PState.NFlag)), Const(1)));
-        }
-
-        private static void EmitSetFpcr(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            Operand fpcr = GetIntOrZR(context, op.Rt);
-                    fpcr = context.ConvertI64ToI32(fpcr);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPCR.Mask.HasFlag((FPCR)(1u << flag)))
-                {
-                    SetFpFlag(context, (FPState)flag, context.BitwiseAnd(context.ShiftRightUI(fpcr, Const(flag)), Const(1)));
-                }
-            }
-        }
-
-        private static void EmitSetFpsr(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            context.ClearQcFlagIfModified();
-
-            Operand fpsr = GetIntOrZR(context, op.Rt);
-                    fpsr = context.ConvertI64ToI32(fpsr);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPSR.Mask.HasFlag((FPSR)(1u << flag)))
-                {
-                    SetFpFlag(context, (FPState)flag, context.BitwiseAnd(context.ShiftRightUI(fpsr, Const(flag)), Const(1)));
-                }
-            }
-        }
-    }
-}

ARMeilleure/Instructions/InstEmitSystem32.cs

@@ -1,326 +0,0 @@
-using ARMeilleure.Decoders;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.State;
-using ARMeilleure.Translation;
-using System;
-using System.Reflection;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Instructions
-{
-    static partial class InstEmit32
-    {
-        public static void Mcr(ArmEmitterContext context)
-        {
-            OpCode32System op = (OpCode32System)context.CurrOp;
-
-            if (op.Coproc != 15 || op.Opc1 != 0)
-            {
-                InstEmit.Und(context);
-
-                return;
-            }
-
-            MethodInfo info;
-
-            switch (op.CRn)
-            {
-                case 13: // Process and Thread Info.
-                    if (op.CRm != 0)
-                    {
-                        throw new NotImplementedException($"Unknown MRC CRm 0x{op.CRm:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    switch (op.Opc2)
-                    {
-                        case 2:
-                            info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.SetTpidrEl032)); break;
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRC Opc2 0x{op.Opc2:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    break;
-
-                case 7:
-                    switch (op.CRm) // Cache and Memory barrier.
-                    {
-                        case 10:
-                            switch (op.Opc2)
-                            {
-                                case 5: // Data Memory Barrier Register.
-                                    return; // No-op.
-
-                                default:
-                                    throw new NotImplementedException($"Unknown MRC Opc2 0x{op.Opc2:X16} at 0x{op.Address:X16} (0x{op.RawOpCode:X}).");
-                            }
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRC CRm 0x{op.CRm:X16} at 0x{op.Address:X16} (0x{op.RawOpCode:X}).");
-                    }
-
-                default:
-                    throw new NotImplementedException($"Unknown MRC 0x{op.RawOpCode:X8} at 0x{op.Address:X16}.");
-            }
-
-            context.Call(info, GetIntA32(context, op.Rt));
-        }
-
-        public static void Mrc(ArmEmitterContext context)
-        {
-            OpCode32System op = (OpCode32System)context.CurrOp;
-
-            if (op.Coproc != 15 || op.Opc1 != 0)
-            {
-                InstEmit.Und(context);
-
-                return;
-            }
-
-            MethodInfo info;
-
-            switch (op.CRn)
-            {
-                case 13: // Process and Thread Info.
-                    if (op.CRm != 0)
-                    {
-                        throw new NotImplementedException($"Unknown MRC CRm 0x{op.CRm:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    switch (op.Opc2)
-                    {
-                        case 2:
-                            info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrEl032)); break;
-
-                        case 3:
-                            info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidr32)); break;
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRC Opc2 0x{op.Opc2:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    break;
-
-                default:
-                    throw new NotImplementedException($"Unknown MRC 0x{op.RawOpCode:X} at 0x{op.Address:X}.");
-            }
-
-            if (op.Rt == RegisterAlias.Aarch32Pc)
-            {
-                // Special behavior: copy NZCV flags into APSR.
-                EmitSetNzcv(context, context.Call(info));
-
-                return;
-            }
-            else
-            {
-                SetIntA32(context, op.Rt, context.Call(info));
-            }
-        }
-
-        public static void Mrrc(ArmEmitterContext context)
-        {
-            OpCode32System op = (OpCode32System)context.CurrOp;
-
-            if (op.Coproc != 15)
-            {
-                InstEmit.Und(context);
-
-                return;
-            }
-
-            int opc = op.MrrcOp;
-
-            MethodInfo info;
-
-            switch (op.CRm)
-            {
-                case 14: // Timer.
-                    switch (opc)
-                    {
-                        case 0:
-                            info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)); break;
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRRC Opc1 0x{opc:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    break;
-
-                default:
-                    throw new NotImplementedException($"Unknown MRRC 0x{op.RawOpCode:X} at 0x{op.Address:X}.");
-            }
-
-            Operand result = context.Call(info);
-
-            SetIntA32(context, op.Rt, context.ConvertI64ToI32(result));
-            SetIntA32(context, op.CRn, context.ConvertI64ToI32(context.ShiftRightUI(result, Const(32))));
-        }
-
-        public static void Mrs(ArmEmitterContext context)
-        {
-            OpCode32Mrs op = (OpCode32Mrs)context.CurrOp;
-
-            if (op.R)
-            {
-                throw new NotImplementedException("SPSR");
-            }
-            else
-            {
-                Operand spsr = context.ShiftLeft(GetFlag(PState.VFlag), Const((int)PState.VFlag));
-                spsr = context.BitwiseOr(spsr, context.ShiftLeft(GetFlag(PState.CFlag), Const((int)PState.CFlag)));
-                spsr = context.BitwiseOr(spsr, context.ShiftLeft(GetFlag(PState.ZFlag), Const((int)PState.ZFlag)));
-                spsr = context.BitwiseOr(spsr, context.ShiftLeft(GetFlag(PState.NFlag), Const((int)PState.NFlag)));
-                spsr = context.BitwiseOr(spsr, context.ShiftLeft(GetFlag(PState.QFlag), Const((int)PState.QFlag)));
-
-                // TODO: Remaining flags.
-
-                SetIntA32(context, op.Rd, spsr);
-            }
-        }
-
-        public static void Msr(ArmEmitterContext context)
-        {
-            OpCode32MsrReg op = (OpCode32MsrReg)context.CurrOp;
-
-            if (op.R)
-            {
-                throw new NotImplementedException("SPSR");
-            }
-            else
-            {
-                if ((op.Mask & 8) != 0)
-                {
-                    Operand value = GetIntA32(context, op.Rn);
-
-                    EmitSetNzcv(context, value);
-
-                    Operand q = context.BitwiseAnd(context.ShiftRightUI(value, Const((int)PState.QFlag)), Const(1));
-
-                    SetFlag(context, PState.QFlag, q);
-                }
-
-                if ((op.Mask & 4) != 0)
-                {
-                    throw new NotImplementedException("APSR_g");
-                }
-
-                if ((op.Mask & 2) != 0)
-                {
-                    throw new NotImplementedException("CPSR_x");
-                }
-
-                if ((op.Mask & 1) != 0)
-                {
-                    throw new NotImplementedException("CPSR_c");
-                }
-            }
-        }
-
-        public static void Nop(ArmEmitterContext context) { }
-
-        public static void Vmrs(ArmEmitterContext context)
-        {
-            OpCode32SimdSpecial op = (OpCode32SimdSpecial)context.CurrOp;
-
-            if (op.Rt == RegisterAlias.Aarch32Pc && op.Sreg == 0b0001)
-            {
-                // Special behavior: copy NZCV flags into APSR.
-                SetFlag(context, PState.VFlag, GetFpFlag(FPState.VFlag));
-                SetFlag(context, PState.CFlag, GetFpFlag(FPState.CFlag));
-                SetFlag(context, PState.ZFlag, GetFpFlag(FPState.ZFlag));
-                SetFlag(context, PState.NFlag, GetFpFlag(FPState.NFlag));
-
-                return;
-            }
-
-            switch (op.Sreg)
-            {
-                case 0b0000: // FPSID
-                    throw new NotImplementedException("Supervisor Only");
-                case 0b0001: // FPSCR
-                    EmitGetFpscr(context); return;
-                case 0b0101: // MVFR2
-                    throw new NotImplementedException("MVFR2");
-                case 0b0110: // MVFR1
-                    throw new NotImplementedException("MVFR1");
-                case 0b0111: // MVFR0
-                    throw new NotImplementedException("MVFR0");
-                case 0b1000: // FPEXC
-                    throw new NotImplementedException("Supervisor Only");
-                default:
-                    throw new NotImplementedException($"Unknown VMRS 0x{op.RawOpCode:X} at 0x{op.Address:X}.");
-            }
-        }
-
-        public static void Vmsr(ArmEmitterContext context)
-        {
-            OpCode32SimdSpecial op = (OpCode32SimdSpecial)context.CurrOp;
-
-            switch (op.Sreg)
-            {
-                case 0b0000: // FPSID
-                    throw new NotImplementedException("Supervisor Only");
-                case 0b0001: // FPSCR
-                    EmitSetFpscr(context); return;
-                case 0b0101: // MVFR2
-                    throw new NotImplementedException("MVFR2");
-                case 0b0110: // MVFR1
-                    throw new NotImplementedException("MVFR1");
-                case 0b0111: // MVFR0
-                    throw new NotImplementedException("MVFR0");
-                case 0b1000: // FPEXC
-                    throw new NotImplementedException("Supervisor Only");
-                default:
-                    throw new NotImplementedException($"Unknown VMSR 0x{op.RawOpCode:X} at 0x{op.Address:X}.");
-            }
-        }
-
-        private static void EmitSetNzcv(ArmEmitterContext context, Operand t)
-        {
-            Operand v = context.BitwiseAnd(context.ShiftRightUI(t, Const((int)PState.VFlag)), Const(1));
-            Operand c = context.BitwiseAnd(context.ShiftRightUI(t, Const((int)PState.CFlag)), Const(1));
-            Operand z = context.BitwiseAnd(context.ShiftRightUI(t, Const((int)PState.ZFlag)), Const(1));
-            Operand n = context.BitwiseAnd(context.ShiftRightUI(t, Const((int)PState.NFlag)), Const(1));
-
-            SetFlag(context, PState.VFlag, v);
-            SetFlag(context, PState.CFlag, c);
-            SetFlag(context, PState.ZFlag, z);
-            SetFlag(context, PState.NFlag, n);
-        }
-
-        private static void EmitGetFpscr(ArmEmitterContext context)
-        {
-            OpCode32SimdSpecial op = (OpCode32SimdSpecial)context.CurrOp;
-
-            Operand fpscr = Const(0);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPSCR.Mask.HasFlag((FPSCR)(1u << flag)))
-                {
-                    fpscr = context.BitwiseOr(fpscr, context.ShiftLeft(GetFpFlag((FPState)flag), Const(flag)));
-                }
-            }
-
-            SetIntA32(context, op.Rt, fpscr);
-        }
-
-        private static void EmitSetFpscr(ArmEmitterContext context)
-        {
-            OpCode32SimdSpecial op = (OpCode32SimdSpecial)context.CurrOp;
-
-            Operand fpscr = GetIntA32(context, op.Rt);
-
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                if (FPSCR.Mask.HasFlag((FPSCR)(1u << flag)))
-                {
-                    SetFpFlag(context, (FPState)flag, context.BitwiseAnd(context.ShiftRightUI(fpscr, Const(flag)), Const(1)));
-                }
-            }
-        }
-    }
-}

ARMeilleure/Instructions/NativeInterface.cs

@@ -1,225 +0,0 @@
-using ARMeilleure.Memory;
-using ARMeilleure.State;
-using ARMeilleure.Translation;
-using System;
-
-namespace ARMeilleure.Instructions
-{
-    static class NativeInterface
-    {
-        private class ThreadContext
-        {
-            public ExecutionContext Context { get; }
-            public IMemoryManager Memory { get; }
-            public Translator Translator { get; }
-
-            public ThreadContext(ExecutionContext context, IMemoryManager memory, Translator translator)
-            {
-                Context = context;
-                Memory = memory;
-                Translator = translator;
-            }
-        }
-
-        [ThreadStatic]
-        private static ThreadContext Context;
-
-        public static void RegisterThread(ExecutionContext context, IMemoryManager memory, Translator translator)
-        {
-            Context = new ThreadContext(context, memory, translator);
-        }
-
-        public static void UnregisterThread()
-        {
-            Context = null;
-        }
-
-        public static void Break(ulong address, int imm)
-        {
-            Statistics.PauseTimer();
-
-            GetContext().OnBreak(address, imm);
-
-            Statistics.ResumeTimer();
-        }
-
-        public static void SupervisorCall(ulong address, int imm)
-        {
-            Statistics.PauseTimer();
-
-            GetContext().OnSupervisorCall(address, imm);
-
-            Statistics.ResumeTimer();
-        }
-
-        public static void Undefined(ulong address, int opCode)
-        {
-            Statistics.PauseTimer();
-
-            GetContext().OnUndefined(address, opCode);
-
-            Statistics.ResumeTimer();
-        }
-
-        #region "System registers"
-        public static ulong GetCtrEl0()
-        {
-            return (ulong)GetContext().CtrEl0;
-        }
-
-        public static ulong GetDczidEl0()
-        {
-            return (ulong)GetContext().DczidEl0;
-        }
-
-        public static ulong GetTpidrEl0()
-        {
-            return (ulong)GetContext().TpidrEl0;
-        }
-
-        public static uint GetTpidrEl032()
-        {
-            return (uint)GetContext().TpidrEl0;
-        }
-
-        public static ulong GetTpidrroEl0()
-        {
-            return (ulong)GetContext().TpidrroEl0;
-        }
-
-        public static uint GetTpidr32()
-        {
-            return (uint)GetContext().TpidrroEl0;
-        }
-
-        public static ulong GetCntfrqEl0()
-        {
-            return GetContext().CntfrqEl0;
-        }
-
-        public static ulong GetCntpctEl0()
-        {
-            return GetContext().CntpctEl0;
-        }
-
-        public static ulong GetCntvctEl0()
-        {
-            return GetContext().CntvctEl0;
-        }
-
-        public static void SetTpidrEl0(ulong value)
-        {
-            GetContext().TpidrEl0 = (long)value;
-        }
-
-        public static void SetTpidrEl032(uint value)
-        {
-            GetContext().TpidrEl0 = (long)value;
-        }
-        #endregion
-
-        #region "Read"
-        public static byte ReadByte(ulong address)
-        {
-            return GetMemoryManager().ReadTracked<byte>(address);
-        }
-
-        public static ushort ReadUInt16(ulong address)
-        {
-            return GetMemoryManager().ReadTracked<ushort>(address);
-        }
-
-        public static uint ReadUInt32(ulong address)
-        {
-            return GetMemoryManager().ReadTracked<uint>(address);
-        }
-
-        public static ulong ReadUInt64(ulong address)
-        {
-            return GetMemoryManager().ReadTracked<ulong>(address);
-        }
-
-        public static V128 ReadVector128(ulong address)
-        {
-            return GetMemoryManager().ReadTracked<V128>(address);
-        }
-        #endregion
-
-        #region "Write"
-        public static void WriteByte(ulong address, byte value)
-        {
-            GetMemoryManager().Write(address, value);
-        }
-
-        public static void WriteUInt16(ulong address, ushort value)
-        {
-            GetMemoryManager().Write(address, value);
-        }
-
-        public static void WriteUInt32(ulong address, uint value)
-        {
-            GetMemoryManager().Write(address, value);
-        }
-
-        public static void WriteUInt64(ulong address, ulong value)
-        {
-            GetMemoryManager().Write(address, value);
-        }
-
-        public static void WriteVector128(ulong address, V128 value)
-        {
-            GetMemoryManager().Write(address, value);
-        }
-        #endregion
-
-        public static void EnqueueForRejit(ulong address)
-        {
-            Context.Translator.EnqueueForRejit(address, GetContext().ExecutionMode);
-        }
-
-        public static void SignalMemoryTracking(ulong address, ulong size, bool write)
-        {
-            GetMemoryManager().SignalMemoryTracking(address, size, write);
-        }
-
-        public static void ThrowInvalidMemoryAccess(ulong address)
-        {
-            throw new InvalidAccessException(address);
-        }
-
-        public static ulong GetFunctionAddress(ulong address)
-        {
-            TranslatedFunction function = Context.Translator.GetOrTranslate(address, GetContext().ExecutionMode);
-
-            return (ulong)function.FuncPointer.ToInt64();
-        }
-
-        public static void InvalidateCacheLine(ulong address)
-        {
-            Context.Translator.InvalidateJitCacheRegion(address, InstEmit.DczSizeInBytes);
-        }
-
-        public static bool CheckSynchronization()
-        {
-            Statistics.PauseTimer();
-
-            ExecutionContext context = GetContext();
-
-            context.CheckInterrupt();
-
-            Statistics.ResumeTimer();
-
-            return context.Running;
-        }
-
-        public static ExecutionContext GetContext()
-        {
-            return Context.Context;
-        }
-
-        public static IMemoryManager GetMemoryManager()
-        {
-            return Context.Memory;
-        }
-    }
-}

ARMeilleure/IntermediateRepresentation/Intrinsic.cs

@@ -1,631 +0,0 @@
-namespace ARMeilleure.IntermediateRepresentation
-{
-    enum Intrinsic : ushort
-    {
-        // X86 (SSE and AVX)
-
-        X86Addpd,
-        X86Addps,
-        X86Addsd,
-        X86Addss,
-        X86Aesdec,
-        X86Aesdeclast,
-        X86Aesenc,
-        X86Aesenclast,
-        X86Aesimc,
-        X86Andnpd,
-        X86Andnps,
-        X86Andpd,
-        X86Andps,
-        X86Blendvpd,
-        X86Blendvps,
-        X86Cmppd,
-        X86Cmpps,
-        X86Cmpsd,
-        X86Cmpss,
-        X86Comisdeq,
-        X86Comisdge,
-        X86Comisdlt,
-        X86Comisseq,
-        X86Comissge,
-        X86Comisslt,
-        X86Crc32,
-        X86Crc32_16,
-        X86Crc32_8,
-        X86Cvtdq2pd,
-        X86Cvtdq2ps,
-        X86Cvtpd2dq,
-        X86Cvtpd2ps,
-        X86Cvtps2dq,
-        X86Cvtps2pd,
-        X86Cvtsd2si,
-        X86Cvtsd2ss,
-        X86Cvtsi2sd,
-        X86Cvtsi2si,
-        X86Cvtsi2ss,
-        X86Cvtss2sd,
-        X86Cvtss2si,
-        X86Divpd,
-        X86Divps,
-        X86Divsd,
-        X86Divss,
-        X86Gf2p8affineqb,
-        X86Haddpd,
-        X86Haddps,
-        X86Insertps,
-        X86Maxpd,
-        X86Maxps,
-        X86Maxsd,
-        X86Maxss,
-        X86Minpd,
-        X86Minps,
-        X86Minsd,
-        X86Minss,
-        X86Movhlps,
-        X86Movlhps,
-        X86Movss,
-        X86Mulpd,
-        X86Mulps,
-        X86Mulsd,
-        X86Mulss,
-        X86Mxcsrmb,
-        X86Mxcsrub,
-        X86Paddb,
-        X86Paddd,
-        X86Paddq,
-        X86Paddw,
-        X86Palignr,
-        X86Pand,
-        X86Pandn,
-        X86Pavgb,
-        X86Pavgw,
-        X86Pblendvb,
-        X86Pclmulqdq,
-        X86Pcmpeqb,
-        X86Pcmpeqd,
-        X86Pcmpeqq,
-        X86Pcmpeqw,
-        X86Pcmpgtb,
-        X86Pcmpgtd,
-        X86Pcmpgtq,
-        X86Pcmpgtw,
-        X86Pmaxsb,
-        X86Pmaxsd,
-        X86Pmaxsw,
-        X86Pmaxub,
-        X86Pmaxud,
-        X86Pmaxuw,
-        X86Pminsb,
-        X86Pminsd,
-        X86Pminsw,
-        X86Pminub,
-        X86Pminud,
-        X86Pminuw,
-        X86Pmovsxbw,
-        X86Pmovsxdq,
-        X86Pmovsxwd,
-        X86Pmovzxbw,
-        X86Pmovzxdq,
-        X86Pmovzxwd,
-        X86Pmulld,
-        X86Pmullw,
-        X86Popcnt,
-        X86Por,
-        X86Pshufb,
-        X86Pshufd,
-        X86Pslld,
-        X86Pslldq,
-        X86Psllq,
-        X86Psllw,
-        X86Psrad,
-        X86Psraw,
-        X86Psrld,
-        X86Psrlq,
-        X86Psrldq,
-        X86Psrlw,
-        X86Psubb,
-        X86Psubd,
-        X86Psubq,
-        X86Psubw,
-        X86Punpckhbw,
-        X86Punpckhdq,
-        X86Punpckhqdq,
-        X86Punpckhwd,
-        X86Punpcklbw,
-        X86Punpckldq,
-        X86Punpcklqdq,
-        X86Punpcklwd,
-        X86Pxor,
-        X86Rcpps,
-        X86Rcpss,
-        X86Roundpd,
-        X86Roundps,
-        X86Roundsd,
-        X86Roundss,
-        X86Rsqrtps,
-        X86Rsqrtss,
-        X86Sha256Msg1,
-        X86Sha256Msg2,
-        X86Sha256Rnds2,
-        X86Shufpd,
-        X86Shufps,
-        X86Sqrtpd,
-        X86Sqrtps,
-        X86Sqrtsd,
-        X86Sqrtss,
-        X86Subpd,
-        X86Subps,
-        X86Subsd,
-        X86Subss,
-        X86Unpckhpd,
-        X86Unpckhps,
-        X86Unpcklpd,
-        X86Unpcklps,
-        X86Vcvtph2ps,
-        X86Vcvtps2ph,
-        X86Vfmadd231ps,
-        X86Vfmadd231sd,
-        X86Vfmadd231ss,
-        X86Vfmsub231sd,
-        X86Vfmsub231ss,
-        X86Vfnmadd231ps,
-        X86Vfnmadd231sd,
-        X86Vfnmadd231ss,
-        X86Vfnmsub231sd,
-        X86Vfnmsub231ss,
-        X86Xorpd,
-        X86Xorps,
-
-        // Arm64 (FP and Advanced SIMD)
-
-        Arm64AbsS,
-        Arm64AbsV,
-        Arm64AddhnV,
-        Arm64AddpS,
-        Arm64AddpV,
-        Arm64AddvV,
-        Arm64AddS,
-        Arm64AddV,
-        Arm64AesdV,
-        Arm64AeseV,
-        Arm64AesimcV,
-        Arm64AesmcV,
-        Arm64AndV,
-        Arm64BicVi,
-        Arm64BicV,
-        Arm64BifV,
-        Arm64BitV,
-        Arm64BslV,
-        Arm64ClsV,
-        Arm64ClzV,
-        Arm64CmeqS,
-        Arm64CmeqV,
-        Arm64CmeqSz,
-        Arm64CmeqVz,
-        Arm64CmgeS,
-        Arm64CmgeV,
-        Arm64CmgeSz,
-        Arm64CmgeVz,
-        Arm64CmgtS,
-        Arm64CmgtV,
-        Arm64CmgtSz,
-        Arm64CmgtVz,
-        Arm64CmhiS,
-        Arm64CmhiV,
-        Arm64CmhsS,
-        Arm64CmhsV,
-        Arm64CmleSz,
-        Arm64CmleVz,
-        Arm64CmltSz,
-        Arm64CmltVz,
-        Arm64CmtstS,
-        Arm64CmtstV,
-        Arm64CntV,
-        Arm64DupSe,
-        Arm64DupVe,
-        Arm64DupGp,
-        Arm64EorV,
-        Arm64ExtV,
-        Arm64FabdS,
-        Arm64FabdV,
-        Arm64FabsV,
-        Arm64FabsS,
-        Arm64FacgeS,
-        Arm64FacgeV,
-        Arm64FacgtS,
-        Arm64FacgtV,
-        Arm64FaddpS,
-        Arm64FaddpV,
-        Arm64FaddV,
-        Arm64FaddS,
-        Arm64FccmpeS,
-        Arm64FccmpS,
-        Arm64FcmeqS,
-        Arm64FcmeqV,
-        Arm64FcmeqSz,
-        Arm64FcmeqVz,
-        Arm64FcmgeS,
-        Arm64FcmgeV,
-        Arm64FcmgeSz,
-        Arm64FcmgeVz,
-        Arm64FcmgtS,
-        Arm64FcmgtV,
-        Arm64FcmgtSz,
-        Arm64FcmgtVz,
-        Arm64FcmleSz,
-        Arm64FcmleVz,
-        Arm64FcmltSz,
-        Arm64FcmltVz,
-        Arm64FcmpeS,
-        Arm64FcmpS,
-        Arm64FcselS,
-        Arm64FcvtasS,
-        Arm64FcvtasV,
-        Arm64FcvtasGp,
-        Arm64FcvtauS,
-        Arm64FcvtauV,
-        Arm64FcvtauGp,
-        Arm64FcvtlV,
-        Arm64FcvtmsS,
-        Arm64FcvtmsV,
-        Arm64FcvtmsGp,
-        Arm64FcvtmuS,
-        Arm64FcvtmuV,
-        Arm64FcvtmuGp,
-        Arm64FcvtnsS,
-        Arm64FcvtnsV,
-        Arm64FcvtnsGp,
-        Arm64FcvtnuS,
-        Arm64FcvtnuV,
-        Arm64FcvtnuGp,
-        Arm64FcvtnV,
-        Arm64FcvtpsS,
-        Arm64FcvtpsV,
-        Arm64FcvtpsGp,
-        Arm64FcvtpuS,
-        Arm64FcvtpuV,
-        Arm64FcvtpuGp,
-        Arm64FcvtxnS,
-        Arm64FcvtxnV,
-        Arm64FcvtzsSFixed,
-        Arm64FcvtzsVFixed,
-        Arm64FcvtzsS,
-        Arm64FcvtzsV,
-        Arm64FcvtzsGpFixed,
-        Arm64FcvtzsGp,
-        Arm64FcvtzuSFixed,
-        Arm64FcvtzuVFixed,
-        Arm64FcvtzuS,
-        Arm64FcvtzuV,
-        Arm64FcvtzuGpFixed,
-        Arm64FcvtzuGp,
-        Arm64FcvtS,
-        Arm64FdivV,
-        Arm64FdivS,
-        Arm64FmaddS,
-        Arm64FmaxnmpS,
-        Arm64FmaxnmpV,
-        Arm64FmaxnmvV,
-        Arm64FmaxnmV,
-        Arm64FmaxnmS,
-        Arm64FmaxpS,
-        Arm64FmaxpV,
-        Arm64FmaxvV,
-        Arm64FmaxV,
-        Arm64FmaxS,
-        Arm64FminnmpS,
-        Arm64FminnmpV,
-        Arm64FminnmvV,
-        Arm64FminnmV,
-        Arm64FminnmS,
-        Arm64FminpS,
-        Arm64FminpV,
-        Arm64FminvV,
-        Arm64FminV,
-        Arm64FminS,
-        Arm64FmlaSe,
-        Arm64FmlaVe,
-        Arm64FmlaV,
-        Arm64FmlsSe,
-        Arm64FmlsVe,
-        Arm64FmlsV,
-        Arm64FmovVi,
-        Arm64FmovS,
-        Arm64FmovGp,
-        Arm64FmovSi,
-        Arm64FmsubS,
-        Arm64FmulxSe,
-        Arm64FmulxVe,
-        Arm64FmulxS,
-        Arm64FmulxV,
-        Arm64FmulSe,
-        Arm64FmulVe,
-        Arm64FmulV,
-        Arm64FmulS,
-        Arm64FnegV,
-        Arm64FnegS,
-        Arm64FnmaddS,
-        Arm64FnmsubS,
-        Arm64FnmulS,
-        Arm64FrecpeS,
-        Arm64FrecpeV,
-        Arm64FrecpsS,
-        Arm64FrecpsV,
-        Arm64FrecpxS,
-        Arm64FrintaV,
-        Arm64FrintaS,
-        Arm64FrintiV,
-        Arm64FrintiS,
-        Arm64FrintmV,
-        Arm64FrintmS,
-        Arm64FrintnV,
-        Arm64FrintnS,
-        Arm64FrintpV,
-        Arm64FrintpS,
-        Arm64FrintxV,
-        Arm64FrintxS,
-        Arm64FrintzV,
-        Arm64FrintzS,
-        Arm64FrsqrteS,
-        Arm64FrsqrteV,
-        Arm64FrsqrtsS,
-        Arm64FrsqrtsV,
-        Arm64FsqrtV,
-        Arm64FsqrtS,
-        Arm64FsubV,
-        Arm64FsubS,
-        Arm64InsVe,
-        Arm64InsGp,
-        Arm64Ld1rV,
-        Arm64Ld1Vms,
-        Arm64Ld1Vss,
-        Arm64Ld2rV,
-        Arm64Ld2Vms,
-        Arm64Ld2Vss,
-        Arm64Ld3rV,
-        Arm64Ld3Vms,
-        Arm64Ld3Vss,
-        Arm64Ld4rV,
-        Arm64Ld4Vms,
-        Arm64Ld4Vss,
-        Arm64MlaVe,
-        Arm64MlaV,
-        Arm64MlsVe,
-        Arm64MlsV,
-        Arm64MoviV,
-        Arm64MrsFpsr,
-        Arm64MsrFpsr,
-        Arm64MulVe,
-        Arm64MulV,
-        Arm64MvniV,
-        Arm64NegS,
-        Arm64NegV,
-        Arm64NotV,
-        Arm64OrnV,
-        Arm64OrrVi,
-        Arm64OrrV,
-        Arm64PmullV,
-        Arm64PmulV,
-        Arm64RaddhnV,
-        Arm64RbitV,
-        Arm64Rev16V,
-        Arm64Rev32V,
-        Arm64Rev64V,
-        Arm64RshrnV,
-        Arm64RsubhnV,
-        Arm64SabalV,
-        Arm64SabaV,
-        Arm64SabdlV,
-        Arm64SabdV,
-        Arm64SadalpV,
-        Arm64SaddlpV,
-        Arm64SaddlvV,
-        Arm64SaddlV,
-        Arm64SaddwV,
-        Arm64ScvtfSFixed,
-        Arm64ScvtfVFixed,
-        Arm64ScvtfS,
-        Arm64ScvtfV,
-        Arm64ScvtfGpFixed,
-        Arm64ScvtfGp,
-        Arm64Sha1cV,
-        Arm64Sha1hV,
-        Arm64Sha1mV,
-        Arm64Sha1pV,
-        Arm64Sha1su0V,
-        Arm64Sha1su1V,
-        Arm64Sha256h2V,
-        Arm64Sha256hV,
-        Arm64Sha256su0V,
-        Arm64Sha256su1V,
-        Arm64ShaddV,
-        Arm64ShllV,
-        Arm64ShlS,
-        Arm64ShlV,
-        Arm64ShrnV,
-        Arm64ShsubV,
-        Arm64SliS,
-        Arm64SliV,
-        Arm64SmaxpV,
-        Arm64SmaxvV,
-        Arm64SmaxV,
-        Arm64SminpV,
-        Arm64SminvV,
-        Arm64SminV,
-        Arm64SmlalVe,
-        Arm64SmlalV,
-        Arm64SmlslVe,
-        Arm64SmlslV,
-        Arm64SmovV,
-        Arm64SmullVe,
-        Arm64SmullV,
-        Arm64SqabsS,
-        Arm64SqabsV,
-        Arm64SqaddS,
-        Arm64SqaddV,
-        Arm64SqdmlalSe,
-        Arm64SqdmlalVe,
-        Arm64SqdmlalS,
-        Arm64SqdmlalV,
-        Arm64SqdmlslSe,
-        Arm64SqdmlslVe,
-        Arm64SqdmlslS,
-        Arm64SqdmlslV,
-        Arm64SqdmulhSe,
-        Arm64SqdmulhVe,
-        Arm64SqdmulhS,
-        Arm64SqdmulhV,
-        Arm64SqdmullSe,
-        Arm64SqdmullVe,
-        Arm64SqdmullS,
-        Arm64SqdmullV,
-        Arm64SqnegS,
-        Arm64SqnegV,
-        Arm64SqrdmulhSe,
-        Arm64SqrdmulhVe,
-        Arm64SqrdmulhS,
-        Arm64SqrdmulhV,
-        Arm64SqrshlS,
-        Arm64SqrshlV,
-        Arm64SqrshrnS,
-        Arm64SqrshrnV,
-        Arm64SqrshrunS,
-        Arm64SqrshrunV,
-        Arm64SqshluS,
-        Arm64SqshluV,
-        Arm64SqshlSi,
-        Arm64SqshlVi,
-        Arm64SqshlS,
-        Arm64SqshlV,
-        Arm64SqshrnS,
-        Arm64SqshrnV,
-        Arm64SqshrunS,
-        Arm64SqshrunV,
-        Arm64SqsubS,
-        Arm64SqsubV,
-        Arm64SqxtnS,
-        Arm64SqxtnV,
-        Arm64SqxtunS,
-        Arm64SqxtunV,
-        Arm64SrhaddV,
-        Arm64SriS,
-        Arm64SriV,
-        Arm64SrshlS,
-        Arm64SrshlV,
-        Arm64SrshrS,
-        Arm64SrshrV,
-        Arm64SrsraS,
-        Arm64SrsraV,
-        Arm64SshllV,
-        Arm64SshlS,
-        Arm64SshlV,
-        Arm64SshrS,
-        Arm64SshrV,
-        Arm64SsraS,
-        Arm64SsraV,
-        Arm64SsublV,
-        Arm64SsubwV,
-        Arm64St1Vms,
-        Arm64St1Vss,
-        Arm64St2Vms,
-        Arm64St2Vss,
-        Arm64St3Vms,
-        Arm64St3Vss,
-        Arm64St4Vms,
-        Arm64St4Vss,
-        Arm64SubhnV,
-        Arm64SubS,
-        Arm64SubV,
-        Arm64SuqaddS,
-        Arm64SuqaddV,
-        Arm64TblV,
-        Arm64TbxV,
-        Arm64Trn1V,
-        Arm64Trn2V,
-        Arm64UabalV,
-        Arm64UabaV,
-        Arm64UabdlV,
-        Arm64UabdV,
-        Arm64UadalpV,
-        Arm64UaddlpV,
-        Arm64UaddlvV,
-        Arm64UaddlV,
-        Arm64UaddwV,
-        Arm64UcvtfSFixed,
-        Arm64UcvtfVFixed,
-        Arm64UcvtfS,
-        Arm64UcvtfV,
-        Arm64UcvtfGpFixed,
-        Arm64UcvtfGp,
-        Arm64UhaddV,
-        Arm64UhsubV,
-        Arm64UmaxpV,
-        Arm64UmaxvV,
-        Arm64UmaxV,
-        Arm64UminpV,
-        Arm64UminvV,
-        Arm64UminV,
-        Arm64UmlalVe,
-        Arm64UmlalV,
-        Arm64UmlslVe,
-        Arm64UmlslV,
-        Arm64UmovV,
-        Arm64UmullVe,
-        Arm64UmullV,
-        Arm64UqaddS,
-        Arm64UqaddV,
-        Arm64UqrshlS,
-        Arm64UqrshlV,
-        Arm64UqrshrnS,
-        Arm64UqrshrnV,
-        Arm64UqshlSi,
-        Arm64UqshlVi,
-        Arm64UqshlS,
-        Arm64UqshlV,
-        Arm64UqshrnS,
-        Arm64UqshrnV,
-        Arm64UqsubS,
-        Arm64UqsubV,
-        Arm64UqxtnS,
-        Arm64UqxtnV,
-        Arm64UrecpeV,
-        Arm64UrhaddV,
-        Arm64UrshlS,
-        Arm64UrshlV,
-        Arm64UrshrS,
-        Arm64UrshrV,
-        Arm64UrsqrteV,
-        Arm64UrsraS,
-        Arm64UrsraV,
-        Arm64UshllV,
-        Arm64UshlS,
-        Arm64UshlV,
-        Arm64UshrS,
-        Arm64UshrV,
-        Arm64UsqaddS,
-        Arm64UsqaddV,
-        Arm64UsraS,
-        Arm64UsraV,
-        Arm64UsublV,
-        Arm64UsubwV,
-        Arm64Uzp1V,
-        Arm64Uzp2V,
-        Arm64XtnV,
-        Arm64Zip1V,
-        Arm64Zip2V,
-
-        Arm64VTypeShift = 13,
-        Arm64VTypeMask = 1 << Arm64VTypeShift,
-        Arm64V64 = 0 << Arm64VTypeShift,
-        Arm64V128 = 1 << Arm64VTypeShift,
-
-        Arm64VSizeShift = 14,
-        Arm64VSizeMask = 3 << Arm64VSizeShift,
-        Arm64VFloat = 0 << Arm64VSizeShift,
-        Arm64VDouble = 1 << Arm64VSizeShift,
-        Arm64VByte = 0 << Arm64VSizeShift,
-        Arm64VHWord = 1 << Arm64VSizeShift,
-        Arm64VWord = 2 << Arm64VSizeShift,
-        Arm64VDWord = 3 << Arm64VSizeShift
-    }
-}

ARMeilleure/Optimizations.cs

@@ -1,57 +0,0 @@
-using System.Runtime.Intrinsics.Arm;
-
-namespace ARMeilleure
-{
-    using Arm64HardwareCapabilities = ARMeilleure.CodeGen.Arm64.HardwareCapabilities;
-    using X86HardwareCapabilities = ARMeilleure.CodeGen.X86.HardwareCapabilities;
-
-    public static class Optimizations
-    {
-        public static bool FastFP { get; set; } = true;
-
-        public static bool AllowLcqInFunctionTable  { get; set; } = true;
-        public static bool UseUnmanagedDispatchLoop { get; set; } = true;
-
-        public static bool UseAdvSimdIfAvailable    { get; set; } = true;
-        public static bool UseArm64PmullIfAvailable { get; set; } = true;
-
-        public static bool UseSseIfAvailable       { get; set; } = true;
-        public static bool UseSse2IfAvailable      { get; set; } = true;
-        public static bool UseSse3IfAvailable      { get; set; } = true;
-        public static bool UseSsse3IfAvailable     { get; set; } = true;
-        public static bool UseSse41IfAvailable     { get; set; } = true;
-        public static bool UseSse42IfAvailable     { get; set; } = true;
-        public static bool UsePopCntIfAvailable    { get; set; } = true;
-        public static bool UseAvxIfAvailable       { get; set; } = true;
-        public static bool UseF16cIfAvailable      { get; set; } = true;
-        public static bool UseFmaIfAvailable       { get; set; } = true;
-        public static bool UseAesniIfAvailable     { get; set; } = true;
-        public static bool UsePclmulqdqIfAvailable { get; set; } = true;
-        public static bool UseShaIfAvailable       { get; set; } = true;
-        public static bool UseGfniIfAvailable      { get; set; } = true;
-
-        public static bool ForceLegacySse
-        {
-            get => X86HardwareCapabilities.ForceLegacySse;
-            set => X86HardwareCapabilities.ForceLegacySse = value;
-        }
-
-        internal static bool UseAdvSimd    => UseAdvSimdIfAvailable    && Arm64HardwareCapabilities.SupportsAdvSimd;
-        internal static bool UseArm64Pmull => UseArm64PmullIfAvailable && Arm64HardwareCapabilities.SupportsPmull;
-
-        internal static bool UseSse       => UseSseIfAvailable       && X86HardwareCapabilities.SupportsSse;
-        internal static bool UseSse2      => UseSse2IfAvailable      && X86HardwareCapabilities.SupportsSse2;
-        internal static bool UseSse3      => UseSse3IfAvailable      && X86HardwareCapabilities.SupportsSse3;
-        internal static bool UseSsse3     => UseSsse3IfAvailable     && X86HardwareCapabilities.SupportsSsse3;
-        internal static bool UseSse41     => UseSse41IfAvailable     && X86HardwareCapabilities.SupportsSse41;
-        internal static bool UseSse42     => UseSse42IfAvailable     && X86HardwareCapabilities.SupportsSse42;
-        internal static bool UsePopCnt    => UsePopCntIfAvailable    && X86HardwareCapabilities.SupportsPopcnt;
-        internal static bool UseAvx       => UseAvxIfAvailable       && X86HardwareCapabilities.SupportsAvx && !ForceLegacySse;
-        internal static bool UseF16c      => UseF16cIfAvailable      && X86HardwareCapabilities.SupportsF16c;
-        internal static bool UseFma       => UseFmaIfAvailable       && X86HardwareCapabilities.SupportsFma;
-        internal static bool UseAesni     => UseAesniIfAvailable     && X86HardwareCapabilities.SupportsAesni;
-        internal static bool UsePclmulqdq => UsePclmulqdqIfAvailable && X86HardwareCapabilities.SupportsPclmulqdq;
-        internal static bool UseSha       => UseShaIfAvailable       && X86HardwareCapabilities.SupportsSha;
-        internal static bool UseGfni      => UseGfniIfAvailable      && X86HardwareCapabilities.SupportsGfni;
-    }
-}

ARMeilleure/State/ExecutionContext.cs

@@ -1,164 +0,0 @@
-using ARMeilleure.Memory;
-using System;
-
-namespace ARMeilleure.State
-{
-    public class ExecutionContext
-    {
-        private const int MinCountForCheck = 4000;
-
-        private NativeContext _nativeContext;
-
-        internal IntPtr NativeContextPtr => _nativeContext.BasePtr;
-
-        private bool _interrupted;
-
-        private readonly ICounter _counter;
-
-        public ulong Pc => _nativeContext.GetPc();
-
-        public uint CtrEl0 => 0x8444c004;
-        public uint DczidEl0 => 0x00000004;
-
-        public ulong CntfrqEl0 => _counter.Frequency;
-        public ulong CntpctEl0 => _counter.Counter;
-
-        // CNTVCT_EL0 = CNTPCT_EL0 - CNTVOFF_EL2
-        // Since EL2 isn't implemented, CNTVOFF_EL2 = 0
-        public ulong CntvctEl0 => CntpctEl0;
-
-        public long TpidrEl0 { get; set; }
-        public long TpidrroEl0 { get; set; }
-
-        public uint Pstate
-        {
-            get => _nativeContext.GetPstate();
-            set => _nativeContext.SetPstate(value);
-        }
-
-        public FPSR Fpsr
-        {
-            get => (FPSR)_nativeContext.GetFPState((uint)FPSR.Mask);
-            set => _nativeContext.SetFPState((uint)value, (uint)FPSR.Mask);
-        }
-
-        public FPCR Fpcr
-        {
-            get => (FPCR)_nativeContext.GetFPState((uint)FPCR.Mask);
-            set => _nativeContext.SetFPState((uint)value, (uint)FPCR.Mask);
-        }
-        public FPCR StandardFpcrValue => (Fpcr & (FPCR.Ahp)) | FPCR.Dn | FPCR.Fz;
-
-        public FPSCR Fpscr
-        {
-            get => (FPSCR)_nativeContext.GetFPState((uint)FPSCR.Mask);
-            set => _nativeContext.SetFPState((uint)value, (uint)FPSCR.Mask);
-        }
-
-        public bool IsAarch32 { get; set; }
-
-        internal ExecutionMode ExecutionMode
-        {
-            get
-            {
-                if (IsAarch32)
-                {
-                    return GetPstateFlag(PState.TFlag)
-                        ? ExecutionMode.Aarch32Thumb
-                        : ExecutionMode.Aarch32Arm;
-                }
-                else
-                {
-                    return ExecutionMode.Aarch64;
-                }
-            }
-        }
-
-        public bool Running
-        {
-            get => _nativeContext.GetRunning();
-            private set => _nativeContext.SetRunning(value);
-        }
-
-        private readonly ExceptionCallbackNoArgs _interruptCallback;
-        private readonly ExceptionCallback _breakCallback;
-        private readonly ExceptionCallback _supervisorCallback;
-        private readonly ExceptionCallback _undefinedCallback;
-
-        public ExecutionContext(
-            IJitMemoryAllocator allocator,
-            ICounter counter,
-            ExceptionCallbackNoArgs interruptCallback = null,
-            ExceptionCallback breakCallback = null,
-            ExceptionCallback supervisorCallback = null,
-            ExceptionCallback undefinedCallback = null)
-        {
-            _nativeContext = new NativeContext(allocator);
-            _counter = counter;
-            _interruptCallback = interruptCallback;
-            _breakCallback = breakCallback;
-            _supervisorCallback = supervisorCallback;
-            _undefinedCallback = undefinedCallback;
-
-            Running = true;
-
-            _nativeContext.SetCounter(MinCountForCheck);
-        }
-
-        public ulong GetX(int index) => _nativeContext.GetX(index);
-        public void SetX(int index, ulong value) => _nativeContext.SetX(index, value);
-
-        public V128 GetV(int index) => _nativeContext.GetV(index);
-        public void SetV(int index, V128 value) => _nativeContext.SetV(index, value);
-
-        public bool GetPstateFlag(PState flag) => _nativeContext.GetPstateFlag(flag);
-        public void SetPstateFlag(PState flag, bool value) => _nativeContext.SetPstateFlag(flag, value);
-
-        public bool GetFPstateFlag(FPState flag) => _nativeContext.GetFPStateFlag(flag);
-        public void SetFPstateFlag(FPState flag, bool value) => _nativeContext.SetFPStateFlag(flag, value);
-
-        internal void CheckInterrupt()
-        {
-            if (_interrupted)
-            {
-                _interrupted = false;
-
-                _interruptCallback?.Invoke(this);
-            }
-
-            _nativeContext.SetCounter(MinCountForCheck);
-        }
-
-        public void RequestInterrupt()
-        {
-            _interrupted = true;
-        }
-
-        internal void OnBreak(ulong address, int imm)
-        {
-            _breakCallback?.Invoke(this, address, imm);
-        }
-
-        internal void OnSupervisorCall(ulong address, int imm)
-        {
-            _supervisorCallback?.Invoke(this, address, imm);
-        }
-
-        internal void OnUndefined(ulong address, int opCode)
-        {
-            _undefinedCallback?.Invoke(this, address, opCode);
-        }
-
-        public void StopRunning()
-        {
-            Running = false;
-
-            _nativeContext.SetCounter(0);
-        }
-
-        public void Dispose()
-        {
-            _nativeContext.Dispose();
-        }
-    }
-}

ARMeilleure/State/NativeContext.cs

@@ -1,251 +0,0 @@
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Memory;
-using System;
-using System.Runtime.CompilerServices;
-
-namespace ARMeilleure.State
-{
-    class NativeContext : IDisposable
-    {
-        private unsafe struct NativeCtxStorage
-        {
-            public fixed ulong X[RegisterConsts.IntRegsCount];
-            public fixed ulong V[RegisterConsts.VecRegsCount * 2];
-            public fixed uint Flags[RegisterConsts.FlagsCount];
-            public fixed uint FpFlags[RegisterConsts.FpFlagsCount];
-            public int Counter;
-            public ulong DispatchAddress;
-            public ulong ExclusiveAddress;
-            public ulong ExclusiveValueLow;
-            public ulong ExclusiveValueHigh;
-            public int Running;
-        }
-
-        private static NativeCtxStorage _dummyStorage = new NativeCtxStorage();
-
-        private readonly IJitMemoryBlock _block;
-
-        public IntPtr BasePtr => _block.Pointer;
-
-        public NativeContext(IJitMemoryAllocator allocator)
-        {
-            _block = allocator.Allocate((ulong)Unsafe.SizeOf<NativeCtxStorage>());
-
-            GetStorage().ExclusiveAddress = ulong.MaxValue;
-        }
-
-        public ulong GetPc()
-        {
-            // TODO: More precise tracking of PC value.
-            return GetStorage().DispatchAddress;
-        }
-
-        public unsafe ulong GetX(int index)
-        {
-            if ((uint)index >= RegisterConsts.IntRegsCount)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-
-            return GetStorage().X[index];
-        }
-
-        public unsafe void SetX(int index, ulong value)
-        {
-            if ((uint)index >= RegisterConsts.IntRegsCount)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-
-            GetStorage().X[index] = value;
-        }
-
-        public unsafe V128 GetV(int index)
-        {
-            if ((uint)index >= RegisterConsts.VecRegsCount)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-
-            return new V128(GetStorage().V[index * 2 + 0], GetStorage().V[index * 2 + 1]);
-        }
-
-        public unsafe void SetV(int index, V128 value)
-        {
-            if ((uint)index >= RegisterConsts.VecRegsCount)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-
-            GetStorage().V[index * 2 + 0] = value.Extract<ulong>(0);
-            GetStorage().V[index * 2 + 1] = value.Extract<ulong>(1);
-        }
-
-        public unsafe bool GetPstateFlag(PState flag)
-        {
-            if ((uint)flag >= RegisterConsts.FlagsCount)
-            {
-                throw new ArgumentException($"Invalid flag \"{flag}\" specified.");
-            }
-
-            return GetStorage().Flags[(int)flag] != 0;
-        }
-
-        public unsafe void SetPstateFlag(PState flag, bool value)
-        {
-            if ((uint)flag >= RegisterConsts.FlagsCount)
-            {
-                throw new ArgumentException($"Invalid flag \"{flag}\" specified.");
-            }
-
-            GetStorage().Flags[(int)flag] = value ? 1u : 0u;
-        }
-
-        public unsafe uint GetPstate()
-        {
-            uint value = 0;
-            for (int flag = 0; flag < RegisterConsts.FlagsCount; flag++)
-            {
-                value |= GetStorage().Flags[flag] != 0 ? 1u << flag : 0u;
-            }
-            return value;
-        }
-
-        public unsafe void SetPstate(uint value)
-        {
-            for (int flag = 0; flag < RegisterConsts.FlagsCount; flag++)
-            {
-                uint bit = 1u << flag;
-                GetStorage().Flags[flag] = (value & bit) == bit ? 1u : 0u;
-            }
-        }
-
-        public unsafe bool GetFPStateFlag(FPState flag)
-        {
-            if ((uint)flag >= RegisterConsts.FpFlagsCount)
-            {
-                throw new ArgumentException($"Invalid flag \"{flag}\" specified.");
-            }
-
-            return GetStorage().FpFlags[(int)flag] != 0;
-        }
-
-        public unsafe void SetFPStateFlag(FPState flag, bool value)
-        {
-            if ((uint)flag >= RegisterConsts.FpFlagsCount)
-            {
-                throw new ArgumentException($"Invalid flag \"{flag}\" specified.");
-            }
-
-            GetStorage().FpFlags[(int)flag] = value ? 1u : 0u;
-        }
-
-        public unsafe uint GetFPState(uint mask = uint.MaxValue)
-        {
-            uint value = 0;
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                uint bit = 1u << flag;
-
-                if ((mask & bit) == bit)
-                {
-                    value |= GetStorage().FpFlags[flag] != 0 ? bit : 0u;
-                }
-            }
-            return value;
-        }
-
-        public unsafe void SetFPState(uint value, uint mask = uint.MaxValue)
-        {
-            for (int flag = 0; flag < RegisterConsts.FpFlagsCount; flag++)
-            {
-                uint bit = 1u << flag;
-
-                if ((mask & bit) == bit)
-                {
-                    GetStorage().FpFlags[flag] = (value & bit) == bit ? 1u : 0u;
-                }
-            }
-        }
-
-        public int GetCounter() => GetStorage().Counter;
-        public void SetCounter(int value) => GetStorage().Counter = value;
-
-        public bool GetRunning() => GetStorage().Running != 0;
-        public void SetRunning(bool value) => GetStorage().Running = value ? 1 : 0;
-
-        public unsafe static int GetRegisterOffset(Register reg)
-        {
-            if (reg.Type == RegisterType.Integer)
-            {
-                if ((uint)reg.Index >= RegisterConsts.IntRegsCount)
-                {
-                    throw new ArgumentException("Invalid register.");
-                }
-
-                return StorageOffset(ref _dummyStorage, ref _dummyStorage.X[reg.Index]);
-            }
-            else if (reg.Type == RegisterType.Vector)
-            {
-                if ((uint)reg.Index >= RegisterConsts.VecRegsCount)
-                {
-                    throw new ArgumentException("Invalid register.");
-                }
-
-                return StorageOffset(ref _dummyStorage, ref _dummyStorage.V[reg.Index * 2]);
-            }
-            else if (reg.Type == RegisterType.Flag)
-            {
-                if ((uint)reg.Index >= RegisterConsts.FlagsCount)
-                {
-                    throw new ArgumentException("Invalid register.");
-                }
-
-                return StorageOffset(ref _dummyStorage, ref _dummyStorage.Flags[reg.Index]);
-            }
-            else /* if (reg.Type == RegisterType.FpFlag) */
-            {
-                if ((uint)reg.Index >= RegisterConsts.FpFlagsCount)
-                {
-                    throw new ArgumentException("Invalid register.");
-                }
-
-                return StorageOffset(ref _dummyStorage, ref _dummyStorage.FpFlags[reg.Index]);
-            }
-        }
-
-        public static int GetCounterOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.Counter);
-        }
-
-        public static int GetDispatchAddressOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.DispatchAddress);
-        }
-
-        public static int GetExclusiveAddressOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.ExclusiveAddress);
-        }
-
-        public static int GetExclusiveValueOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.ExclusiveValueLow);
-        }
-
-        public static int GetRunningOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.Running);
-        }
-
-        private static int StorageOffset<T>(ref NativeCtxStorage storage, ref T target)
-        {
-            return (int)Unsafe.ByteOffset(ref Unsafe.As<NativeCtxStorage, T>(ref storage), ref target);
-        }
-
-        private unsafe ref NativeCtxStorage GetStorage() => ref Unsafe.AsRef<NativeCtxStorage>((void*)_block.Pointer);
-
-        public void Dispose() => _block.Dispose();
-    }
-}

ARMeilleure/Translation/ArmEmitterContext.cs

@@ -1,267 +0,0 @@
-using ARMeilleure.CodeGen.Linking;
-using ARMeilleure.Common;
-using ARMeilleure.Decoders;
-using ARMeilleure.Diagnostics;
-using ARMeilleure.Instructions;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Memory;
-using ARMeilleure.State;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Translation
-{
-    class ArmEmitterContext : EmitterContext
-    {
-        private readonly Dictionary<ulong, Operand> _labels;
-
-        private OpCode _optOpLastCompare;
-        private OpCode _optOpLastFlagSet;
-
-        private Operand _optCmpTempN;
-        private Operand _optCmpTempM;
-
-        private Block _currBlock;
-
-        public Block CurrBlock
-        {
-            get
-            {
-                return _currBlock;
-            }
-            set
-            {
-                _currBlock = value;
-
-                ResetBlockState();
-            }
-        }
-
-        private bool _pendingQcFlagSync;
-
-        public OpCode CurrOp { get; set; }
-
-        public IMemoryManager Memory { get; }
-
-        public EntryTable<uint> CountTable { get; }
-        public AddressTable<ulong> FunctionTable { get; }
-        public TranslatorStubs Stubs { get; }
-
-        public ulong EntryAddress { get; }
-        public bool HighCq { get; }
-        public bool HasPtc { get; }
-        public Aarch32Mode Mode { get; }
-
-        private int _ifThenBlockStateIndex = 0;
-        private Condition[] _ifThenBlockState = { };
-        public bool IsInIfThenBlock => _ifThenBlockStateIndex < _ifThenBlockState.Length;
-        public Condition CurrentIfThenBlockCond => _ifThenBlockState[_ifThenBlockStateIndex];
-
-        public ArmEmitterContext(
-            IMemoryManager memory,
-            EntryTable<uint> countTable,
-            AddressTable<ulong> funcTable,
-            TranslatorStubs stubs,
-            ulong entryAddress,
-            bool highCq,
-            bool hasPtc,
-            Aarch32Mode mode)
-        {
-            Memory = memory;
-            CountTable = countTable;
-            FunctionTable = funcTable;
-            Stubs = stubs;
-            EntryAddress = entryAddress;
-            HighCq = highCq;
-            HasPtc = hasPtc;
-            Mode = mode;
-
-            _labels = new Dictionary<ulong, Operand>();
-        }
-
-        public override Operand Call(MethodInfo info, params Operand[] callArgs)
-        {
-            SyncQcFlag();
-
-            if (!HasPtc)
-            {
-                return base.Call(info, callArgs);
-            }
-            else
-            {
-                int index = Delegates.GetDelegateIndex(info);
-                IntPtr funcPtr = Delegates.GetDelegateFuncPtrByIndex(index);
-
-                OperandType returnType = GetOperandType(info.ReturnType);
-
-                Symbol symbol = new Symbol(SymbolType.DelegateTable, (ulong)index);
-
-                Symbols.Add((ulong)funcPtr.ToInt64(), info.Name);
-
-                return Call(Const(funcPtr.ToInt64(), symbol), returnType, callArgs);
-            }
-        }
-
-        public Operand GetLabel(ulong address)
-        {
-            if (!_labels.TryGetValue(address, out Operand label))
-            {
-                label = Label();
-
-                _labels.Add(address, label);
-            }
-
-            return label;
-        }
-
-        public void MarkComparison(Operand n, Operand m)
-        {
-            _optOpLastCompare = CurrOp;
-
-            _optCmpTempN = Copy(n);
-            _optCmpTempM = Copy(m);
-        }
-
-        public void MarkFlagSet(PState stateFlag)
-        {
-            // Set this only if any of the NZCV flag bits were modified.
-            // This is used to ensure that when emiting a direct IL branch
-            // instruction for compare + branch sequences, we're not expecting
-            // to use comparison values from an old instruction, when in fact
-            // the flags were already overwritten by another instruction further along.
-            if (stateFlag >= PState.VFlag)
-            {
-                _optOpLastFlagSet = CurrOp;
-            }
-        }
-
-        private void ResetBlockState()
-        {
-            _optOpLastCompare = null;
-            _optOpLastFlagSet = null;
-        }
-
-        public void SetPendingQcFlagSync()
-        {
-            _pendingQcFlagSync = true;
-        }
-
-        public void SyncQcFlag()
-        {
-            if (_pendingQcFlagSync)
-            {
-                if (Optimizations.UseAdvSimd)
-                {
-                    Operand fpsr = AddIntrinsicInt(Intrinsic.Arm64MrsFpsr);
-
-                    uint qcFlagMask = (uint)FPSR.Qc;
-
-                    Operand qcClearLabel = Label();
-
-                    BranchIfFalse(qcClearLabel, BitwiseAnd(fpsr, Const(qcFlagMask)));
-
-                    AddIntrinsicNoRet(Intrinsic.Arm64MsrFpsr, Const(0));
-                    InstEmitHelper.SetFpFlag(this, FPState.QcFlag, Const(1));
-
-                    MarkLabel(qcClearLabel);
-                }
-
-                _pendingQcFlagSync = false;
-            }
-        }
-
-        public void ClearQcFlag()
-        {
-            if (Optimizations.UseAdvSimd)
-            {
-                AddIntrinsicNoRet(Intrinsic.Arm64MsrFpsr, Const(0));
-            }
-        }
-
-        public void ClearQcFlagIfModified()
-        {
-            if (_pendingQcFlagSync && Optimizations.UseAdvSimd)
-            {
-                AddIntrinsicNoRet(Intrinsic.Arm64MsrFpsr, Const(0));
-            }
-        }
-
-        public Operand TryGetComparisonResult(Condition condition)
-        {
-            if (_optOpLastCompare == null || _optOpLastCompare != _optOpLastFlagSet)
-            {
-                return default;
-            }
-
-            Operand n = _optCmpTempN;
-            Operand m = _optCmpTempM;
-
-            InstName cmpName = _optOpLastCompare.Instruction.Name;
-
-            if (cmpName == InstName.Subs)
-            {
-                switch (condition)
-                {
-                    case Condition.Eq:   return ICompareEqual           (n, m);
-                    case Condition.Ne:   return ICompareNotEqual        (n, m);
-                    case Condition.GeUn: return ICompareGreaterOrEqualUI(n, m);
-                    case Condition.LtUn: return ICompareLessUI          (n, m);
-                    case Condition.GtUn: return ICompareGreaterUI       (n, m);
-                    case Condition.LeUn: return ICompareLessOrEqualUI   (n, m);
-                    case Condition.Ge:   return ICompareGreaterOrEqual  (n, m);
-                    case Condition.Lt:   return ICompareLess            (n, m);
-                    case Condition.Gt:   return ICompareGreater         (n, m);
-                    case Condition.Le:   return ICompareLessOrEqual     (n, m);
-                }
-            }
-            else if (cmpName == InstName.Adds && _optOpLastCompare is IOpCodeAluImm op)
-            {
-                // There are several limitations that needs to be taken into account for CMN comparisons:
-                // - The unsigned comparisons are not valid, as they depend on the
-                // carry flag value, and they will have different values for addition and
-                // subtraction. For addition, it's carry, and for subtraction, it's borrow.
-                // So, we need to make sure we're not doing a unsigned compare for the CMN case.
-                // - We can only do the optimization for the immediate variants,
-                // because when the second operand value is exactly INT_MIN, we can't
-                // negate the value as theres no positive counterpart.
-                // Such invalid values can't be encoded on the immediate encodings.
-                if (op.RegisterSize == RegisterSize.Int32)
-                {
-                    m = Const((int)-op.Immediate);
-                }
-                else
-                {
-                    m = Const(-op.Immediate);
-                }
-
-                switch (condition)
-                {
-                    case Condition.Eq: return ICompareEqual         (n, m);
-                    case Condition.Ne: return ICompareNotEqual      (n, m);
-                    case Condition.Ge: return ICompareGreaterOrEqual(n, m);
-                    case Condition.Lt: return ICompareLess          (n, m);
-                    case Condition.Gt: return ICompareGreater       (n, m);
-                    case Condition.Le: return ICompareLessOrEqual   (n, m);
-                }
-            }
-
-            return default;
-        }
-
-        public void SetIfThenBlockState(Condition[] state)
-        {
-            _ifThenBlockState = state;
-            _ifThenBlockStateIndex = 0;
-        }
-
-        public void AdvanceIfThenBlockState()
-        {
-            if (IsInIfThenBlock)
-            {
-                _ifThenBlockStateIndex++;
-            }
-        }
-    }
-}

ARMeilleure/Translation/DelegateHelper.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace ARMeilleure.Translation
-{
-    static class DelegateHelper
-    {
-        private const string DelegateTypesAssemblyName = "JitDelegateTypes";
-
-        private static readonly ModuleBuilder _modBuilder;
-
-        private static readonly Dictionary<string, Type> _delegateTypesCache;
-
-        static DelegateHelper()
-        {
-            AssemblyBuilder asmBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(DelegateTypesAssemblyName), AssemblyBuilderAccess.Run);
-
-            _modBuilder = asmBuilder.DefineDynamicModule(DelegateTypesAssemblyName);
-
-            _delegateTypesCache = new Dictionary<string, Type>();
-        }
-
-        public static Delegate GetDelegate(MethodInfo info)
-        {
-            ArgumentNullException.ThrowIfNull(info);
-
-            Type[] parameters = info.GetParameters().Select(pI => pI.ParameterType).ToArray();
-            Type   returnType = info.ReturnType;
-
-            Type delegateType = GetDelegateType(parameters, returnType);
-
-            return Delegate.CreateDelegate(delegateType, info);
-        }
-
-        private static Type GetDelegateType(Type[] parameters, Type returnType)
-        {
-            string key = GetFunctionSignatureKey(parameters, returnType);
-
-            if (!_delegateTypesCache.TryGetValue(key, out Type delegateType))
-            {
-                delegateType = MakeDelegateType(parameters, returnType, key);
-
-                _delegateTypesCache.TryAdd(key, delegateType);
-            }
-
-            return delegateType;
-        }
-
-        private static string GetFunctionSignatureKey(Type[] parameters, Type returnType)
-        {
-            string sig = GetTypeName(returnType);
-
-            foreach (Type type in parameters)
-            {
-                sig += '_' + GetTypeName(type);
-            }
-
-            return sig;
-        }
-
-        private static string GetTypeName(Type type)
-        {
-            return type.FullName.Replace(".", string.Empty);
-        }
-
-        private const MethodAttributes CtorAttributes =
-            MethodAttributes.RTSpecialName |
-            MethodAttributes.HideBySig     |
-            MethodAttributes.Public;
-
-        private const TypeAttributes DelegateTypeAttributes =
-            TypeAttributes.Class     |
-            TypeAttributes.Public    |
-            TypeAttributes.Sealed    |
-            TypeAttributes.AnsiClass |
-            TypeAttributes.AutoClass;
-
-        private const MethodImplAttributes ImplAttributes =
-            MethodImplAttributes.Runtime |
-            MethodImplAttributes.Managed;
-
-        private const MethodAttributes InvokeAttributes =
-            MethodAttributes.Public    |
-            MethodAttributes.HideBySig |
-            MethodAttributes.NewSlot   |
-            MethodAttributes.Virtual;
-
-        private static readonly Type[] _delegateCtorSignature = { typeof(object), typeof(IntPtr) };
-
-        private static Type MakeDelegateType(Type[] parameters, Type returnType, string name)
-        {
-            TypeBuilder builder = _modBuilder.DefineType(name, DelegateTypeAttributes, typeof(MulticastDelegate));
-
-            builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _delegateCtorSignature).SetImplementationFlags(ImplAttributes);
-
-            builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
-
-            return builder.CreateTypeInfo();
-        }
-    }
-}

ARMeilleure/Translation/Delegates.cs

@@ -1,267 +0,0 @@
-using ARMeilleure.Instructions;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace ARMeilleure.Translation
-{
-    static class Delegates
-    {
-        public static bool TryGetDelegateFuncPtrByIndex(int index, out IntPtr funcPtr)
-        {
-            if (index >= 0 && index < _delegates.Count)
-            {
-                funcPtr = _delegates.Values[index].FuncPtr; // O(1).
-
-                return true;
-            }
-            else
-            {
-                funcPtr = default;
-
-                return false;
-            }
-        }
-
-        public static IntPtr GetDelegateFuncPtrByIndex(int index)
-        {
-            if (index < 0 || index >= _delegates.Count)
-            {
-                throw new ArgumentOutOfRangeException($"({nameof(index)} = {index})");
-            }
-
-            return _delegates.Values[index].FuncPtr; // O(1).
-        }
-
-        public static IntPtr GetDelegateFuncPtr(MethodInfo info)
-        {
-            ArgumentNullException.ThrowIfNull(info);
-
-            string key = GetKey(info);
-
-            if (!_delegates.TryGetValue(key, out DelegateInfo dlgInfo)) // O(log(n)).
-            {
-                throw new KeyNotFoundException($"({nameof(key)} = {key})");
-            }
-
-            return dlgInfo.FuncPtr;
-        }
-
-        public static int GetDelegateIndex(MethodInfo info)
-        {
-            ArgumentNullException.ThrowIfNull(info);
-
-            string key = GetKey(info);
-
-            int index = _delegates.IndexOfKey(key); // O(log(n)).
-
-            if (index == -1)
-            {
-                throw new KeyNotFoundException($"({nameof(key)} = {key})");
-            }
-
-            return index;
-        }
-
-        private static void SetDelegateInfo(MethodInfo info)
-        {
-            string key = GetKey(info);
-
-            Delegate dlg = DelegateHelper.GetDelegate(info);
-
-            _delegates.Add(key, new DelegateInfo(dlg)); // ArgumentException (key).
-        }
-
-        private static string GetKey(MethodInfo info)
-        {
-            return $"{info.DeclaringType.Name}.{info.Name}";
-        }
-
-        private static readonly SortedList<string, DelegateInfo> _delegates;
-
-        static Delegates()
-        {
-            _delegates = new SortedList<string, DelegateInfo>();
-
-            SetDelegateInfo(typeof(Math).GetMethod(nameof(Math.Abs),      new Type[] { typeof(double) }));
-            SetDelegateInfo(typeof(Math).GetMethod(nameof(Math.Ceiling),  new Type[] { typeof(double) }));
-            SetDelegateInfo(typeof(Math).GetMethod(nameof(Math.Floor),    new Type[] { typeof(double) }));
-            SetDelegateInfo(typeof(Math).GetMethod(nameof(Math.Round),    new Type[] { typeof(double), typeof(MidpointRounding) }));
-            SetDelegateInfo(typeof(Math).GetMethod(nameof(Math.Truncate), new Type[] { typeof(double) }));
-
-            SetDelegateInfo(typeof(MathF).GetMethod(nameof(MathF.Abs),      new Type[] { typeof(float) }));
-            SetDelegateInfo(typeof(MathF).GetMethod(nameof(MathF.Ceiling),  new Type[] { typeof(float) }));
-            SetDelegateInfo(typeof(MathF).GetMethod(nameof(MathF.Floor),    new Type[] { typeof(float) }));
-            SetDelegateInfo(typeof(MathF).GetMethod(nameof(MathF.Round),    new Type[] { typeof(float), typeof(MidpointRounding) }));
-            SetDelegateInfo(typeof(MathF).GetMethod(nameof(MathF.Truncate), new Type[] { typeof(float) }));
-
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Break)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.CheckSynchronization)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.EnqueueForRejit)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntfrqEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntvctEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCtrEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetDczidEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.InvalidateCacheLine)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrroEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidr32))); // A32 only.
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetTpidrEl032))); // A32 only.
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadByte)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt16)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt32)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadVector128)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SetTpidrEl0)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SetTpidrEl032))); // A32 only.
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SignalMemoryTracking)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.SupervisorCall)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.Undefined)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteByte)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt16)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt32)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt64)));
-            SetDelegateInfo(typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteVector128)));
-
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingSigns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.CountLeadingZeros)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32b)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cb)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32ch)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cw)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32cx)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32h)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32w)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Crc32x)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Decrypt)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Encrypt)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.FixedRotate)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashChoose)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashLower)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashMajority)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashParity)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.HashUpper)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.InverseMixColumns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.MixColumns)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.PolynomialMult64_128)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToS64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU32)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF64ToU64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha1SchedulePart2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Sha256SchedulePart2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.SignedShrImm64)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl3)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbl4)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx1)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx2)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx3)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.Tbx4)));
-            SetDelegateInfo(typeof(SoftFallback).GetMethod(nameof(SoftFallback.UnsignedShrImm64)));
-
-            SetDelegateInfo(typeof(SoftFloat16_32).GetMethod(nameof(SoftFloat16_32.FPConvert)));
-            SetDelegateInfo(typeof(SoftFloat16_64).GetMethod(nameof(SoftFloat16_64.FPConvert)));
-
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompare)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQ)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareEQFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGE)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGT)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareGTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLE)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLT)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPCompareLTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPDiv)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMax)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNum)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMaxNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMin)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNum)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMinNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMul)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSub)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulSubFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPMulX)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPNegMulSub)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimate)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecipStepFused)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRecpX)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimate)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPRSqrtStepFused)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSqrt)));
-            SetDelegateInfo(typeof(SoftFloat32).GetMethod(nameof(SoftFloat32.FPSub)));
-
-            SetDelegateInfo(typeof(SoftFloat32_16).GetMethod(nameof(SoftFloat32_16.FPConvert)));
-
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompare)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQ)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareEQFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGE)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGT)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareGTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLE)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLEFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLT)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPCompareLTFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPDiv)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMax)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNum)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMaxNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMin)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNum)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMinNumFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMul)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulAddFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSub)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulSubFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPMulX)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulAdd)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPNegMulSub)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimate)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecipStepFused)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRecpX)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimate)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtEstimateFpscr))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStep))); // A32 only.
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPRSqrtStepFused)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSqrt)));
-            SetDelegateInfo(typeof(SoftFloat64).GetMethod(nameof(SoftFloat64.FPSub)));
-
-            SetDelegateInfo(typeof(SoftFloat64_16).GetMethod(nameof(SoftFloat64_16.FPConvert)));
-        }
-    }
-}

ARMeilleure/Translation/DispatcherFunction.cs

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

ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -1,420 +0,0 @@
-using ARMeilleure.State;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-using static ARMeilleure.Translation.PTC.PtcFormatter;
-
-namespace ARMeilleure.Translation.PTC
-{
-    class PtcProfiler
-    {
-        private const string OuterHeaderMagicString = "Pohd\0\0\0\0";
-
-        private const uint InternalVersion = 1866; //! Not to be incremented manually for each change to the ARMeilleure project.
-
-        private const int SaveInterval = 30; // Seconds.
-
-        private const CompressionLevel SaveCompressionLevel = CompressionLevel.Fastest;
-
-        private readonly Ptc _ptc;
-
-        private readonly System.Timers.Timer _timer;
-
-        private readonly ulong _outerHeaderMagic;
-
-        private readonly ManualResetEvent _waitEvent;
-
-        private readonly object _lock;
-
-        private bool _disposed;
-
-        private Hash128 _lastHash;
-
-        public Dictionary<ulong, FuncProfile> ProfiledFuncs { get; private set; }
-
-        public bool Enabled { get; private set; }
-
-        public ulong StaticCodeStart { get; set; }
-        public ulong StaticCodeSize  { get; set; }
-
-        public PtcProfiler(Ptc ptc)
-        {
-            _ptc = ptc;
-
-            _timer = new System.Timers.Timer((double)SaveInterval * 1000d);
-            _timer.Elapsed += PreSave;
-
-            _outerHeaderMagic = BinaryPrimitives.ReadUInt64LittleEndian(EncodingCache.UTF8NoBOM.GetBytes(OuterHeaderMagicString).AsSpan());
-
-            _waitEvent = new ManualResetEvent(true);
-
-            _lock = new object();
-
-            _disposed = false;
-
-            ProfiledFuncs = new Dictionary<ulong, FuncProfile>();
-
-            Enabled = false;
-        }
-
-        public void AddEntry(ulong address, ExecutionMode mode, bool highCq)
-        {
-            if (IsAddressInStaticCodeRange(address))
-            {
-                Debug.Assert(!highCq);
-
-                lock (_lock)
-                {
-                    ProfiledFuncs.TryAdd(address, new FuncProfile(mode, highCq: false));
-                }
-            }
-        }
-
-        public void UpdateEntry(ulong address, ExecutionMode mode, bool highCq)
-        {
-            if (IsAddressInStaticCodeRange(address))
-            {
-                Debug.Assert(highCq);
-
-                lock (_lock)
-                {
-                    Debug.Assert(ProfiledFuncs.ContainsKey(address));
-
-                    ProfiledFuncs[address] = new FuncProfile(mode, highCq: true);
-                }
-            }
-        }
-
-        public bool IsAddressInStaticCodeRange(ulong address)
-        {
-            return address >= StaticCodeStart && address < StaticCodeStart + StaticCodeSize;
-        }
-
-        public ConcurrentQueue<(ulong address, FuncProfile funcProfile)> GetProfiledFuncsToTranslate(TranslatorCache<TranslatedFunction> funcs)
-        {
-            var profiledFuncsToTranslate = new ConcurrentQueue<(ulong address, FuncProfile funcProfile)>();
-
-            foreach (var profiledFunc in ProfiledFuncs)
-            {
-                if (!funcs.ContainsKey(profiledFunc.Key))
-                {
-                    profiledFuncsToTranslate.Enqueue((profiledFunc.Key, profiledFunc.Value));
-                }
-            }
-
-            return profiledFuncsToTranslate;
-        }
-
-        public void ClearEntries()
-        {
-            ProfiledFuncs.Clear();
-            ProfiledFuncs.TrimExcess();
-        }
-
-        public void PreLoad()
-        {
-            _lastHash = default;
-
-            string fileNameActual = $"{_ptc.CachePathActual}.info";
-            string fileNameBackup = $"{_ptc.CachePathBackup}.info";
-
-            FileInfo fileInfoActual = new FileInfo(fileNameActual);
-            FileInfo fileInfoBackup = new FileInfo(fileNameBackup);
-
-            if (fileInfoActual.Exists && fileInfoActual.Length != 0L)
-            {
-                if (!Load(fileNameActual, false))
-                {
-                    if (fileInfoBackup.Exists && fileInfoBackup.Length != 0L)
-                    {
-                        Load(fileNameBackup, true);
-                    }
-                }
-            }
-            else if (fileInfoBackup.Exists && fileInfoBackup.Length != 0L)
-            {
-                Load(fileNameBackup, true);
-            }
-        }
-
-        private bool Load(string fileName, bool isBackup)
-        {
-            using (FileStream compressedStream = new(fileName, FileMode.Open))
-            using (DeflateStream deflateStream = new(compressedStream, CompressionMode.Decompress, true))
-            {
-                OuterHeader outerHeader = DeserializeStructure<OuterHeader>(compressedStream);
-
-                if (!outerHeader.IsHeaderValid())
-                {
-                    InvalidateCompressedStream(compressedStream);
-
-                    return false;
-                }
-
-                if (outerHeader.Magic != _outerHeaderMagic)
-                {
-                    InvalidateCompressedStream(compressedStream);
-
-                    return false;
-                }
-
-                if (outerHeader.InfoFileVersion != InternalVersion)
-                {
-                    InvalidateCompressedStream(compressedStream);
-
-                    return false;
-                }
-
-                if (outerHeader.Endianness != Ptc.GetEndianness())
-                {
-                    InvalidateCompressedStream(compressedStream);
-
-                    return false;
-                }
-
-                using (MemoryStream stream = new MemoryStream())
-                {
-                    Debug.Assert(stream.Seek(0L, SeekOrigin.Begin) == 0L && stream.Length == 0L);
-
-                    try
-                    {
-                        deflateStream.CopyTo(stream);
-                    }
-                    catch
-                    {
-                        InvalidateCompressedStream(compressedStream);
-
-                        return false;
-                    }
-
-                    Debug.Assert(stream.Position == stream.Length);
-
-                    stream.Seek(0L, SeekOrigin.Begin);
-
-                    Hash128 expectedHash = DeserializeStructure<Hash128>(stream);
-
-                    Hash128 actualHash = XXHash128.ComputeHash(GetReadOnlySpan(stream));
-
-                    if (actualHash != expectedHash)
-                    {
-                        InvalidateCompressedStream(compressedStream);
-
-                        return false;
-                    }
-
-                    ProfiledFuncs = Deserialize(stream);
-
-                    Debug.Assert(stream.Position == stream.Length);
-
-                    _lastHash = actualHash;
-                }
-            }
-
-            long fileSize = new FileInfo(fileName).Length;
-
-            Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} (size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
-
-            return true;
-        }
-
-        private static Dictionary<ulong, FuncProfile> Deserialize(Stream stream)
-        {
-            return DeserializeDictionary<ulong, FuncProfile>(stream, (stream) => DeserializeStructure<FuncProfile>(stream));
-        }
-
-        private ReadOnlySpan<byte> GetReadOnlySpan(MemoryStream memoryStream)
-        {
-            return new(memoryStream.GetBuffer(), (int)memoryStream.Position, (int)memoryStream.Length - (int)memoryStream.Position);
-        }
-
-        private void InvalidateCompressedStream(FileStream compressedStream)
-        {
-            compressedStream.SetLength(0L);
-        }
-
-        private void PreSave(object source, System.Timers.ElapsedEventArgs e)
-        {
-            _waitEvent.Reset();
-
-            string fileNameActual = $"{_ptc.CachePathActual}.info";
-            string fileNameBackup = $"{_ptc.CachePathBackup}.info";
-
-            FileInfo fileInfoActual = new FileInfo(fileNameActual);
-
-            if (fileInfoActual.Exists && fileInfoActual.Length != 0L)
-            {
-                File.Copy(fileNameActual, fileNameBackup, true);
-            }
-
-            Save(fileNameActual);
-
-            _waitEvent.Set();
-        }
-
-        private void Save(string fileName)
-        {
-            int profiledFuncsCount;
-
-            OuterHeader outerHeader = new OuterHeader();
-
-            outerHeader.Magic = _outerHeaderMagic;
-
-            outerHeader.InfoFileVersion = InternalVersion;
-            outerHeader.Endianness = Ptc.GetEndianness();
-
-            outerHeader.SetHeaderHash();
-
-            using (MemoryStream stream = new MemoryStream())
-            {
-                Debug.Assert(stream.Seek(0L, SeekOrigin.Begin) == 0L && stream.Length == 0L);
-
-                stream.Seek((long)Unsafe.SizeOf<Hash128>(), SeekOrigin.Begin);
-
-                lock (_lock)
-                {
-                    Serialize(stream, ProfiledFuncs);
-
-                    profiledFuncsCount = ProfiledFuncs.Count;
-                }
-
-                Debug.Assert(stream.Position == stream.Length);
-
-                stream.Seek((long)Unsafe.SizeOf<Hash128>(), SeekOrigin.Begin);
-                Hash128 hash = XXHash128.ComputeHash(GetReadOnlySpan(stream));
-
-                stream.Seek(0L, SeekOrigin.Begin);
-                SerializeStructure(stream, hash);
-
-                if (hash == _lastHash)
-                {
-                    return;
-                }
-
-                using (FileStream compressedStream = new(fileName, FileMode.OpenOrCreate))
-                using (DeflateStream deflateStream = new(compressedStream, SaveCompressionLevel, true))
-                {
-                    try
-                    {
-                        SerializeStructure(compressedStream, outerHeader);
-
-                        stream.WriteTo(deflateStream);
-
-                        _lastHash = hash;
-                    }
-                    catch
-                    {
-                        compressedStream.Position = 0L;
-
-                        _lastHash = default;
-                    }
-
-                    if (compressedStream.Position < compressedStream.Length)
-                    {
-                        compressedStream.SetLength(compressedStream.Position);
-                    }
-                }
-            }
-
-            long fileSize = new FileInfo(fileName).Length;
-
-            if (fileSize != 0L)
-            {
-                Logger.Info?.Print(LogClass.Ptc, $"Saved Profiling Info (size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
-            }
-        }
-
-        private void Serialize(Stream stream, Dictionary<ulong, FuncProfile> profiledFuncs)
-        {
-            SerializeDictionary(stream, profiledFuncs, (stream, structure) => SerializeStructure(stream, structure));
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 29*/)]
-        private struct OuterHeader
-        {
-            public ulong Magic;
-
-            public uint InfoFileVersion;
-
-            public bool Endianness;
-
-            public Hash128 HeaderHash;
-
-            public void SetHeaderHash()
-            {
-                Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
-
-                HeaderHash = XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader).Slice(0, Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>()));
-            }
-
-            public bool IsHeaderValid()
-            {
-                Span<OuterHeader> spanHeader = MemoryMarshal.CreateSpan(ref this, 1);
-
-                return XXHash128.ComputeHash(MemoryMarshal.AsBytes(spanHeader).Slice(0, Unsafe.SizeOf<OuterHeader>() - Unsafe.SizeOf<Hash128>())) == HeaderHash;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 5*/)]
-        public struct FuncProfile
-        {
-            public ExecutionMode Mode;
-            public bool HighCq;
-
-            public FuncProfile(ExecutionMode mode, bool highCq)
-            {
-                Mode = mode;
-                HighCq = highCq;
-            }
-        }
-
-        public void Start()
-        {
-            if (_ptc.State == PtcState.Enabled ||
-                _ptc.State == PtcState.Continuing)
-            {
-                Enabled = true;
-
-                _timer.Enabled = true;
-            }
-        }
-
-        public void Stop()
-        {
-            Enabled = false;
-
-            if (!_disposed)
-            {
-                _timer.Enabled = false;
-            }
-        }
-
-        public void Wait()
-        {
-            _waitEvent.WaitOne();
-        }
-
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                _disposed = true;
-
-                _timer.Elapsed -= PreSave;
-                _timer.Dispose();
-
-                Wait();
-                _waitEvent.Dispose();
-            }
-        }
-    }
-}

ARMeilleure/Translation/TranslatedFunction.cs

@@ -1,29 +0,0 @@
-using ARMeilleure.Common;
-using System;
-
-namespace ARMeilleure.Translation
-{
-    class TranslatedFunction
-    {
-        private readonly GuestFunction _func; // Ensure that this delegate will not be garbage collected.
-
-        public IntPtr 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)
-        {
-            _func = func;
-            FuncPointer = funcPointer;
-            CallCounter = callCounter;
-            GuestSize = guestSize;
-            HighCq = highCq;
-        }
-
-        public ulong Execute(State.ExecutionContext context)
-        {
-            return _func(context.NativeContextPtr);
-        }
-    }
-}

ARMeilleure/Translation/Translator.cs

@@ -1,576 +0,0 @@
-using ARMeilleure.CodeGen;
-using ARMeilleure.Common;
-using ARMeilleure.Decoders;
-using ARMeilleure.Diagnostics;
-using ARMeilleure.Instructions;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.Memory;
-using ARMeilleure.Signal;
-using ARMeilleure.State;
-using ARMeilleure.Translation.Cache;
-using ARMeilleure.Translation.PTC;
-using Ryujinx.Common;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Threading;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-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 EntryTable<uint> CountTable { get; }
-        internal TranslatorStubs Stubs { get; }
-        internal TranslatorQueue Queue { get; }
-        internal IMemoryManager Memory { get; }
-
-        private volatile int _threadCount;
-
-        // FIXME: Remove this once the init logic of the emulator will be redone.
-        public static readonly ManualResetEvent IsReadyForTranslation = new(false);
-
-        public Translator(IJitMemoryAllocator allocator, IMemoryManager memory, bool for64Bits)
-        {
-            _allocator = allocator;
-            Memory = memory;
-
-            _oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>>();
-
-            _ptc = new Ptc();
-
-            Queue = new TranslatorQueue();
-
-            JitCache.Initialize(allocator);
-
-            CountTable = new EntryTable<uint>();
-            Functions = new TranslatorCache<TranslatedFunction>();
-            FunctionTable = new AddressTable<ulong>(for64Bits ? Levels64Bit : Levels32Bit);
-            Stubs = new TranslatorStubs(this);
-
-            FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
-
-            if (memory.Type.IsHostMapped())
-            {
-                NativeSignalHandler.InitializeSignalHandler(allocator.GetPageSize());
-            }
-        }
-
-        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
-        {
-            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type);
-            return _ptc;
-        }
-
-        public void PrepareCodeRange(ulong address, ulong size)
-        {
-            if (_ptc.Profiler.StaticCodeSize == 0)
-            {
-                _ptc.Profiler.StaticCodeStart = address;
-                _ptc.Profiler.StaticCodeSize = size;
-            }
-        }
-
-        public void Execute(State.ExecutionContext context, ulong address)
-        {
-            if (Interlocked.Increment(ref _threadCount) == 1)
-            {
-                IsReadyForTranslation.WaitOne();
-
-                if (_ptc.State == PtcState.Enabled)
-                {
-                    Debug.Assert(Functions.Count == 0);
-                    _ptc.LoadTranslations(this);
-                    _ptc.MakeAndSaveTranslations(this);
-                }
-
-                _ptc.Profiler.Start();
-
-                _ptc.Disable();
-
-                // Simple heuristic, should be user configurable in future. (1 for 4 core/ht or less, 2 for 6 core + ht
-                // etc). All threads are normal priority except from the last, which just fills as much of the last core
-                // as the os lets it with a low priority. If we only have one rejit thread, it should be normal priority
-                // as highCq code is performance critical.
-                //
-                // TODO: Use physical cores rather than logical. This only really makes sense for processors with
-                // hyperthreading. Requires OS specific code.
-                int unboundedThreadCount = Math.Max(1, (Environment.ProcessorCount - 6) / 3);
-                int threadCount          = Math.Min(4, unboundedThreadCount);
-
-                for (int i = 0; i < threadCount; i++)
-                {
-                    bool last = i != 0 && i == unboundedThreadCount - 1;
-
-                    Thread backgroundTranslatorThread = new Thread(BackgroundTranslate)
-                    {
-                        Name = "CPU.BackgroundTranslatorThread." + i,
-                        Priority = last ? ThreadPriority.Lowest : ThreadPriority.Normal
-                    };
-
-                    backgroundTranslatorThread.Start();
-                }
-            }
-
-            Statistics.InitializeTimer();
-
-            NativeInterface.RegisterThread(context, Memory, this);
-
-            if (Optimizations.UseUnmanagedDispatchLoop)
-            {
-                Stubs.DispatchLoop(context.NativeContextPtr, address);
-            }
-            else
-            {
-                do
-                {
-                    address = ExecuteSingle(context, address);
-                }
-                while (context.Running && address != 0);
-            }
-
-            NativeInterface.UnregisterThread();
-
-            if (Interlocked.Decrement(ref _threadCount) == 0)
-            {
-                ClearJitCache();
-
-                Queue.Dispose();
-                Stubs.Dispose();
-                FunctionTable.Dispose();
-                CountTable.Dispose();
-
-                _ptc.Close();
-                _ptc.Profiler.Stop();
-
-                _ptc.Dispose();
-                _ptc.Profiler.Dispose();
-            }
-        }
-
-        private ulong ExecuteSingle(State.ExecutionContext context, ulong address)
-        {
-            TranslatedFunction func = GetOrTranslate(address, context.ExecutionMode);
-
-            Statistics.StartTimer();
-
-            ulong nextAddr = func.Execute(context);
-
-            Statistics.StopTimer(address);
-
-            return nextAddr;
-        }
-
-        public ulong Step(State.ExecutionContext context, ulong address)
-        {
-            TranslatedFunction func = Translate(address, context.ExecutionMode, highCq: false, singleStep: true);
-
-            address = func.Execute(context);
-
-            EnqueueForDeletion(address, func);
-
-            return address;
-        }
-
-        internal TranslatedFunction GetOrTranslate(ulong address, ExecutionMode mode)
-        {
-            if (!Functions.TryGetValue(address, out TranslatedFunction func))
-            {
-                func = Translate(address, mode, highCq: false);
-
-                TranslatedFunction oldFunc = Functions.GetOrAdd(address, func.GuestSize, func);
-
-                if (oldFunc != func)
-                {
-                    JitCache.Unmap(func.FuncPointer);
-                    func = oldFunc;
-                }
-
-                if (_ptc.Profiler.Enabled)
-                {
-                    _ptc.Profiler.AddEntry(address, mode, highCq: false);
-                }
-
-                RegisterFunction(address, func);
-            }
-
-            return func;
-        }
-
-        internal void RegisterFunction(ulong guestAddress, TranslatedFunction func)
-        {
-            if (FunctionTable.IsValid(guestAddress) && (Optimizations.AllowLcqInFunctionTable || func.HighCq))
-            {
-                Volatile.Write(ref FunctionTable.GetValue(guestAddress), (ulong)func.FuncPointer);
-            }
-        }
-
-        internal TranslatedFunction Translate(ulong address, ExecutionMode mode, bool highCq, bool singleStep = false)
-        {
-            var context = new ArmEmitterContext(
-                Memory,
-                CountTable,
-                FunctionTable,
-                Stubs,
-                address,
-                highCq,
-                _ptc.State != PtcState.Disabled,
-                mode: Aarch32Mode.User);
-
-            Logger.StartPass(PassName.Decoding);
-
-            Block[] blocks = Decoder.Decode(Memory, address, mode, highCq, singleStep ? DecoderMode.SingleInstruction : DecoderMode.MultipleBlocks);
-
-            Logger.EndPass(PassName.Decoding);
-
-            Logger.StartPass(PassName.Translation);
-
-            EmitSynchronization(context);
-
-            if (blocks[0].Address != address)
-            {
-                context.Branch(context.GetLabel(address));
-            }
-
-            ControlFlowGraph cfg = EmitAndGetCFG(context, blocks, out Range funcRange, out Counter<uint> counter);
-
-            ulong funcSize = funcRange.End - funcRange.Start;
-
-            Logger.EndPass(PassName.Translation, cfg);
-
-            Logger.StartPass(PassName.RegisterUsage);
-
-            RegisterUsage.RunPass(cfg, mode);
-
-            Logger.EndPass(PassName.RegisterUsage);
-
-            var retType = OperandType.I64;
-            var argTypes = new OperandType[] { OperandType.I64 };
-
-            var options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
-
-            if (context.HasPtc && !singleStep)
-            {
-                options |= CompilerOptions.Relocatable;
-            }
-
-            CompiledFunction compiledFunc = Compiler.Compile(cfg, argTypes, retType, options, RuntimeInformation.ProcessArchitecture);
-
-            if (context.HasPtc && !singleStep)
-            {
-                Hash128 hash = Ptc.ComputeHash(Memory, address, funcSize);
-
-                _ptc.WriteCompiledFunction(address, funcSize, hash, highCq, compiledFunc);
-            }
-
-            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(out IntPtr funcPointer);
-
-            Allocators.ResetAll();
-
-            return new TranslatedFunction(func, funcPointer, counter, funcSize, highCq);
-        }
-
-        private void BackgroundTranslate()
-        {
-            while (_threadCount != 0 && Queue.TryDequeue(out RejitRequest request))
-            {
-                TranslatedFunction func = Translate(request.Address, request.Mode, highCq: true);
-
-                Functions.AddOrUpdate(request.Address, func.GuestSize, func, (key, oldFunc) =>
-                {
-                    EnqueueForDeletion(key, oldFunc);
-                    return func;
-                });
-
-                if (_ptc.Profiler.Enabled)
-                {
-                    _ptc.Profiler.UpdateEntry(request.Address, request.Mode, highCq: true);
-                }
-
-                RegisterFunction(request.Address, func);
-            }
-        }
-
-        private readonly struct Range
-        {
-            public ulong Start { get; }
-            public ulong End { get; }
-
-            public Range(ulong start, ulong end)
-            {
-                Start = start;
-                End = end;
-            }
-        }
-
-        private static ControlFlowGraph EmitAndGetCFG(
-            ArmEmitterContext context,
-            Block[] blocks,
-            out Range range,
-            out Counter<uint> counter)
-        {
-            counter = null;
-
-            ulong rangeStart = ulong.MaxValue;
-            ulong rangeEnd = 0;
-
-            for (int blkIndex = 0; blkIndex < blocks.Length; blkIndex++)
-            {
-                Block block = blocks[blkIndex];
-
-                if (!block.Exit)
-                {
-                    if (rangeStart > block.Address)
-                    {
-                        rangeStart = block.Address;
-                    }
-
-                    if (rangeEnd < block.EndAddress)
-                    {
-                        rangeEnd = block.EndAddress;
-                    }
-                }
-
-                if (block.Address == context.EntryAddress)
-                {
-                    if (!context.HighCq)
-                    {
-                        EmitRejitCheck(context, out counter);
-                    }
-
-                    context.ClearQcFlag();
-                }
-
-                context.CurrBlock = block;
-
-                context.MarkLabel(context.GetLabel(block.Address));
-
-                if (block.Exit)
-                {
-                    // Left option here as it may be useful if we need to return to managed rather than tail call in
-                    // future. (eg. for debug)
-                    bool useReturns = false;
-
-                    InstEmitFlowHelper.EmitVirtualJump(context, Const(block.Address), isReturn: useReturns);
-                }
-                else
-                {
-                    for (int opcIndex = 0; opcIndex < block.OpCodes.Count; opcIndex++)
-                    {
-                        OpCode opCode = block.OpCodes[opcIndex];
-
-                        context.CurrOp = opCode;
-
-                        bool isLastOp = opcIndex == block.OpCodes.Count - 1;
-
-                        if (isLastOp)
-                        {
-                            context.SyncQcFlag();
-
-                            if (block.Branch != null && !block.Branch.Exit && block.Branch.Address <= block.Address)
-                            {
-                                EmitSynchronization(context);
-                            }
-                        }
-
-                        Operand lblPredicateSkip = default;
-
-                        if (context.IsInIfThenBlock && context.CurrentIfThenBlockCond != Condition.Al)
-                        {
-                            lblPredicateSkip = Label();
-
-                            InstEmitFlowHelper.EmitCondBranch(context, lblPredicateSkip, context.CurrentIfThenBlockCond.Invert());
-                        }
-
-                        if (opCode is OpCode32 op && op.Cond < Condition.Al)
-                        {
-                            lblPredicateSkip = Label();
-
-                            InstEmitFlowHelper.EmitCondBranch(context, lblPredicateSkip, op.Cond.Invert());
-                        }
-
-                        if (opCode.Instruction.Emitter != null)
-                        {
-                            opCode.Instruction.Emitter(context);
-                        }
-                        else
-                        {
-                            throw new InvalidOperationException($"Invalid instruction \"{opCode.Instruction.Name}\".");
-                        }
-
-                        if (lblPredicateSkip != default)
-                        {
-                            context.MarkLabel(lblPredicateSkip);
-                        }
-
-                        if (context.IsInIfThenBlock && opCode.Instruction.Name != InstName.It)
-                        {
-                            context.AdvanceIfThenBlockState();
-                        }
-                    }
-                }
-            }
-
-            range = new Range(rangeStart, rangeEnd);
-
-            return context.GetControlFlowGraph();
-        }
-
-        internal static void EmitRejitCheck(ArmEmitterContext context, out Counter<uint> counter)
-        {
-            const int MinsCallForRejit = 100;
-
-            counter = new Counter<uint>(context.CountTable);
-
-            Operand lblEnd = Label();
-
-            Operand address = !context.HasPtc ?
-                Const(ref counter.Value) :
-                Const(ref counter.Value, Ptc.CountTableSymbol);
-
-            Operand curCount = context.Load(OperandType.I32, address);
-            Operand count = context.Add(curCount, Const(1));
-            context.Store(address, count);
-            context.BranchIf(lblEnd, curCount, Const(MinsCallForRejit), Comparison.NotEqual, BasicBlockFrequency.Cold);
-
-            context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.EnqueueForRejit)), Const(context.EntryAddress));
-
-            context.MarkLabel(lblEnd);
-        }
-
-        internal static void EmitSynchronization(EmitterContext context)
-        {
-            long countOffs = NativeContext.GetCounterOffset();
-
-            Operand lblNonZero = Label();
-            Operand lblExit = Label();
-
-            Operand countAddr = context.Add(context.LoadArgument(OperandType.I64, 0), Const(countOffs));
-            Operand count = context.Load(OperandType.I32, countAddr);
-            context.BranchIfTrue(lblNonZero, count, BasicBlockFrequency.Cold);
-
-            Operand running = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.CheckSynchronization)));
-            context.BranchIfTrue(lblExit, running, BasicBlockFrequency.Cold);
-
-            context.Return(Const(0L));
-
-            context.MarkLabel(lblNonZero);
-            count = context.Subtract(count, Const(1));
-            context.Store(countAddr, count);
-
-            context.MarkLabel(lblExit);
-        }
-
-        public void InvalidateJitCacheRegion(ulong address, ulong size)
-        {
-            ulong[] overlapAddresses = Array.Empty<ulong>();
-
-            int overlapsCount = Functions.GetOverlaps(address, size, ref overlapAddresses);
-
-            if (overlapsCount != 0)
-            {
-                // If rejit is running, stop it as it may be trying to rejit a function on the invalidated region.
-                ClearRejitQueue(allowRequeue: true);
-            }
-
-            for (int index = 0; index < overlapsCount; index++)
-            {
-                ulong overlapAddress = overlapAddresses[index];
-
-                if (Functions.TryGetValue(overlapAddress, out TranslatedFunction overlap))
-                {
-                    Functions.Remove(overlapAddress);
-                    Volatile.Write(ref FunctionTable.GetValue(overlapAddress), FunctionTable.Fill);
-                    EnqueueForDeletion(overlapAddress, overlap);
-                }
-            }
-
-            // TODO: Remove overlapping functions from the JitCache aswell.
-            // This should be done safely, with a mechanism to ensure the function is not being executed.
-        }
-
-        internal void EnqueueForRejit(ulong guestAddress, ExecutionMode mode)
-        {
-            Queue.Enqueue(guestAddress, mode);
-        }
-
-        private void EnqueueForDeletion(ulong guestAddress, TranslatedFunction func)
-        {
-            _oldFuncs.Enqueue(new(guestAddress, func));
-        }
-
-        private void ClearJitCache()
-        {
-            // Ensure no attempt will be made to compile new functions due to rejit.
-            ClearRejitQueue(allowRequeue: false);
-
-            List<TranslatedFunction> functions = Functions.AsList();
-
-            foreach (var func in functions)
-            {
-                JitCache.Unmap(func.FuncPointer);
-
-                func.CallCounter?.Dispose();
-            }
-
-            Functions.Clear();
-
-            while (_oldFuncs.TryDequeue(out var kv))
-            {
-                JitCache.Unmap(kv.Value.FuncPointer);
-
-                kv.Value.CallCounter?.Dispose();
-            }
-        }
-
-        private void ClearRejitQueue(bool allowRequeue)
-        {
-            if (!allowRequeue)
-            {
-                Queue.Clear();
-
-                return;
-            }
-
-            lock (Queue.Sync)
-            {
-                while (Queue.Count > 0 && Queue.TryDequeue(out RejitRequest request))
-                {
-                    if (Functions.TryGetValue(request.Address, out var func) && func.CallCounter != null)
-                    {
-                        Volatile.Write(ref func.CallCounter.Value, 0);
-                    }
-                }
-            }
-        }
-    }
-}

ARMeilleure/Translation/TranslatorStubs.cs

@@ -1,241 +0,0 @@
-using ARMeilleure.Instructions;
-using ARMeilleure.IntermediateRepresentation;
-using ARMeilleure.State;
-using ARMeilleure.Translation.Cache;
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
-
-namespace ARMeilleure.Translation
-{
-    /// <summary>
-    /// Represents a stub manager.
-    /// </summary>
-    class TranslatorStubs : IDisposable
-    {
-        private static readonly Lazy<IntPtr> _slowDispatchStub = new(GenerateSlowDispatchStub, isThreadSafe: true);
-
-        private bool _disposed;
-
-        private readonly Translator _translator;
-        private readonly Lazy<IntPtr> _dispatchStub;
-        private readonly Lazy<DispatcherFunction> _dispatchLoop;
-
-        /// <summary>
-        /// Gets the dispatch stub.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException"><see cref="TranslatorStubs"/> instance was disposed</exception>
-        public IntPtr DispatchStub
-        {
-            get
-            {
-                ObjectDisposedException.ThrowIf(_disposed, this);
-
-                return _dispatchStub.Value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the slow dispatch stub.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException"><see cref="TranslatorStubs"/> instance was disposed</exception>
-        public IntPtr SlowDispatchStub
-        {
-            get
-            {
-                ObjectDisposedException.ThrowIf(_disposed, this);
-
-                return _slowDispatchStub.Value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the dispatch loop function.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException"><see cref="TranslatorStubs"/> instance was disposed</exception>
-        public DispatcherFunction DispatchLoop
-        {
-            get
-            {
-                ObjectDisposedException.ThrowIf(_disposed, this);
-
-                return _dispatchLoop.Value;
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
-        /// <see cref="Translator"/> instance.
-        /// </summary>
-        /// <param name="translator"><see cref="Translator"/> instance to use</param>
-        /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(Translator translator)
-        {
-            ArgumentNullException.ThrowIfNull(translator);
-
-            _translator = translator;
-            _dispatchStub = new(GenerateDispatchStub, isThreadSafe: true);
-            _dispatchLoop = new(GenerateDispatchLoop, isThreadSafe: true);
-        }
-
-        /// <summary>
-        /// Releases all resources used by the <see cref="TranslatorStubs"/> instance.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases all unmanaged and optionally managed resources used by the <see cref="TranslatorStubs"/> 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)
-            {
-                if (_dispatchStub.IsValueCreated)
-                {
-                    JitCache.Unmap(_dispatchStub.Value);
-                }
-
-                if (_dispatchLoop.IsValueCreated)
-                {
-                    JitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
-                }
-
-                _disposed = true;
-            }
-        }
-
-        /// <summary>
-        /// Frees resources used by the <see cref="TranslatorStubs"/> instance.
-        /// </summary>
-        ~TranslatorStubs()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Generates a <see cref="DispatchStub"/>.
-        /// </summary>
-        /// <returns>Generated <see cref="DispatchStub"/></returns>
-        private IntPtr GenerateDispatchStub()
-        {
-            var context = new EmitterContext();
-
-            Operand lblFallback = Label();
-            Operand lblEnd = Label();
-
-            // Load the target guest address from the native context.
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-            Operand guestAddress = context.Load(OperandType.I64,
-                context.Add(nativeContext, Const((ulong)NativeContext.GetDispatchAddressOffset())));
-
-            // Check if guest address is within range of the AddressTable.
-            Operand masked = context.BitwiseAnd(guestAddress, Const(~_translator.FunctionTable.Mask));
-            context.BranchIfTrue(lblFallback, masked);
-
-            Operand index = default;
-            Operand page = Const((long)_translator.FunctionTable.Base);
-
-            for (int i = 0; i < _translator.FunctionTable.Levels.Length; i++)
-            {
-                ref var level = ref _translator.FunctionTable.Levels[i];
-
-                // level.Mask is not used directly because it is more often bigger than 32-bits, so it will not
-                // be encoded as an immediate on x86's bitwise and operation.
-                Operand mask = Const(level.Mask >> level.Index);
-
-                index = context.BitwiseAnd(context.ShiftRightUI(guestAddress, Const(level.Index)), mask);
-
-                if (i < _translator.FunctionTable.Levels.Length - 1)
-                {
-                    page = context.Load(OperandType.I64, context.Add(page, context.ShiftLeft(index, Const(3))));
-                    context.BranchIfFalse(lblFallback, page);
-                }
-            }
-
-            Operand hostAddress;
-            Operand hostAddressAddr = context.Add(page, context.ShiftLeft(index, Const(3)));
-            hostAddress = context.Load(OperandType.I64, hostAddressAddr);
-            context.Tailcall(hostAddress, nativeContext);
-
-            context.MarkLabel(lblFallback);
-            hostAddress = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)), guestAddress);
-            context.Tailcall(hostAddress, nativeContext);
-
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
-
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
-
-            return Marshal.GetFunctionPointerForDelegate(func);
-        }
-
-        /// <summary>
-        /// Generates a <see cref="SlowDispatchStub"/>.
-        /// </summary>
-        /// <returns>Generated <see cref="SlowDispatchStub"/></returns>
-        private static IntPtr GenerateSlowDispatchStub()
-        {
-            var context = new EmitterContext();
-
-            // Load the target guest address from the native context.
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-            Operand guestAddress = context.Load(OperandType.I64,
-                context.Add(nativeContext, Const((ulong)NativeContext.GetDispatchAddressOffset())));
-
-            MethodInfo getFuncAddress = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress));
-            Operand hostAddress = context.Call(getFuncAddress, guestAddress);
-            context.Tailcall(hostAddress, nativeContext);
-
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
-
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
-
-            return Marshal.GetFunctionPointerForDelegate(func);
-        }
-
-        /// <summary>
-        /// Generates a <see cref="DispatchLoop"/> function.
-        /// </summary>
-        /// <returns><see cref="DispatchLoop"/> function</returns>
-        private DispatcherFunction GenerateDispatchLoop()
-        {
-            var context = new EmitterContext();
-
-            Operand beginLbl = Label();
-            Operand endLbl = Label();
-
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-            Operand guestAddress = context.Copy(
-                context.AllocateLocal(OperandType.I64),
-                context.LoadArgument(OperandType.I64, 1));
-
-            Operand runningAddress = context.Add(nativeContext, Const((ulong)NativeContext.GetRunningOffset()));
-            Operand dispatchAddress = context.Add(nativeContext, Const((ulong)NativeContext.GetDispatchAddressOffset()));
-
-            context.MarkLabel(beginLbl);
-            context.Store(dispatchAddress, guestAddress);
-            context.Copy(guestAddress, context.Call(Const((ulong)DispatchStub), OperandType.I64, nativeContext));
-            context.BranchIfFalse(endLbl, guestAddress);
-            context.BranchIfFalse(endLbl, context.Load(OperandType.I32, runningAddress));
-            context.Branch(beginLbl);
-
-            context.MarkLabel(endLbl);
-            context.Return();
-
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.None;
-            var argTypes = new[] { OperandType.I64, OperandType.I64 };
-
-            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>();
-        }
-    }
-}

Directory.Packages.props

@@ -3,26 +3,26 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="0.10.18" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
-    <PackageVersion Include="Avalonia.Desktop" Version="0.10.18" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.18" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" />
+    <PackageVersion Include="Avalonia" Version="0.10.19" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.19" />
+    <PackageVersion Include="Avalonia.Desktop" Version="0.10.19" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.19" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="0.10.19" />
     <PackageVersion Include="Avalonia.Svg" Version="0.10.18" />
     <PackageVersion Include="Avalonia.Svg.Skia" Version="0.10.18" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Concentus" Version="1.1.7" />
-    <PackageVersion Include="Crc32.NET" Version="1.2.0" />
     <PackageVersion Include="DiscordRichPresence" Version="1.1.3.18" />
-    <PackageVersion Include="DynamicData" Version="7.12.11" />
+    <PackageVersion Include="DynamicData" Version="7.13.5" />
     <PackageVersion Include="FluentAvaloniaUI" Version="1.4.5" />
     <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
     <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
     <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
-    <PackageVersion Include="LibHac" Version="0.17.0" />
+    <PackageVersion Include="LibHac" Version="0.18.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.1.0" />
@@ -34,7 +34,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build13" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
-    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.26.1-build23" />
+    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.26.3-build25" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />
@@ -44,12 +44,10 @@
     <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
     <PackageVersion Include="SPB" Version="0.0.4-build28" />
     <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
-    <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageVersion Include="System.Management" Version="7.0.0" />
-    <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
-    <PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
-    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-a913199" />
-    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.5.1" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.30.1" />
+    <PackageVersion Include="System.IO.Hashing" Version="7.0.0" />
+    <PackageVersion Include="System.Management" Version="7.0.1" />
+    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
+    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.6.1" />
   </ItemGroup>
-</Project>
+</Project>

README.md

@@ -40,7 +40,7 @@
 
 ## Compatibility
 
-As of November 2022, Ryujinx has been tested on approximately 3,800 titles; over 3,600 boot past menus and into gameplay, with roughly 3,200 of those being considered playable.
+As of April 2023, Ryujinx has been tested on approximately 4,050 titles; over 4,000 boot past menus and into gameplay, with roughly 3,400 of those being considered playable.
 You can check out the compatibility list [here](https://github.com/Ryujinx/Ryujinx-Games-List/issues). 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
@@ -96,7 +96,7 @@ Ryujinx system files are stored in the `Ryujinx` folder. This folder is located
 
 - **GPU**
 
-  The GPU emulator emulates the Switch's Maxwell GPU using either the OpenGL (version 4.5 minimum), Vulkan, or Metal (via MoltenVK) APIs through a custom build of OpenTK or Silk.NET respectively. There are currently four graphics enhancements available to the end user in Ryujinx: Disk Shader Caching, Resolution Scaling, Aspect Ratio Adjustment, and Anisotropic Filtering. These enhancements can be adjusted or toggled as desired in the GUI.
+  The GPU emulator emulates the Switch's Maxwell GPU using either the OpenGL (version 4.5 minimum), Vulkan, or Metal (via MoltenVK) APIs through a custom build of OpenTK or Silk.NET respectively. There are currently six graphics enhancements available to the end user in Ryujinx: Disk Shader Caching, Resolution Scaling, Anti-Aliasing, Scaling Filters (including FSR), Anisotropic Filtering and Aspect Ratio Adjustment. These enhancements can be adjusted or toggled as desired in the GUI.
 
 - **Input**
 

Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs

@@ -1,176 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Integration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using Ryujinx.SDL2.Common;
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-
-using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
-using static SDL2.SDL;
-
-namespace Ryujinx.Audio.Backends.SDL2
-{
-    public class SDL2HardwareDeviceDriver : IHardwareDeviceDriver
-    {
-        private readonly ManualResetEvent _updateRequiredEvent;
-        private readonly ManualResetEvent _pauseEvent;
-        private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
-
-        public SDL2HardwareDeviceDriver()
-        {
-            _updateRequiredEvent = new ManualResetEvent(false);
-            _pauseEvent = new ManualResetEvent(true);
-            _sessions = new ConcurrentDictionary<SDL2HardwareDeviceSession, byte>();
-
-            SDL2Driver.Instance.Initialize();
-        }
-
-        public static bool IsSupported => IsSupportedInternal();
-
-        private static bool IsSupportedInternal()
-        {
-            uint device = OpenStream(SampleFormat.PcmInt16, Constants.TargetSampleRate, Constants.ChannelCountMax, Constants.TargetSampleCount, null);
-
-            if (device != 0)
-            {
-                SDL_CloseAudioDevice(device);
-            }
-
-            return device != 0;
-        }
-
-        public ManualResetEvent GetUpdateRequiredEvent()
-        {
-            return _updateRequiredEvent;
-        }
-
-        public ManualResetEvent GetPauseEvent()
-        {
-            return _pauseEvent;
-        }
-
-        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume)
-        {
-            if (channelCount == 0)
-            {
-                channelCount = 2;
-            }
-
-            if (sampleRate == 0)
-            {
-                sampleRate = Constants.TargetSampleRate;
-            }
-
-            if (direction != Direction.Output)
-            {
-                throw new NotImplementedException("Input direction is currently not implemented on SDL2 backend!");
-            }
-
-            SDL2HardwareDeviceSession session = new SDL2HardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
-
-            _sessions.TryAdd(session, 0);
-
-            return session;
-        }
-
-        internal bool Unregister(SDL2HardwareDeviceSession session)
-        {
-            return _sessions.TryRemove(session, out _);
-        }
-
-        private static SDL_AudioSpec GetSDL2Spec(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount)
-        {
-            return new SDL_AudioSpec
-            {
-                channels = (byte)requestedChannelCount,
-                format = GetSDL2Format(requestedSampleFormat),
-                freq = (int)requestedSampleRate,
-                samples = (ushort)sampleCount
-            };
-        }
-
-        internal static ushort GetSDL2Format(SampleFormat format)
-        {
-            return format switch
-            {
-                SampleFormat.PcmInt8 => AUDIO_S8,
-                SampleFormat.PcmInt16 => AUDIO_S16,
-                SampleFormat.PcmInt32 => AUDIO_S32,
-                SampleFormat.PcmFloat => AUDIO_F32,
-                _ => throw new ArgumentException($"Unsupported sample format {format}"),
-            };
-        }
-
-        internal static uint OpenStream(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount, SDL_AudioCallback callback)
-        {
-            SDL_AudioSpec desired = GetSDL2Spec(requestedSampleFormat, requestedSampleRate, requestedChannelCount, sampleCount);
-
-            desired.callback = callback;
-
-            uint device = SDL_OpenAudioDevice(IntPtr.Zero, 0, ref desired, out SDL_AudioSpec got, 0);
-
-            if (device == 0)
-            {
-                Logger.Error?.Print(LogClass.Application, 
-                    $"SDL2 open audio device initialization failed with error \"{SDL_GetError()}\"");
-
-                return 0;
-            }
-
-            bool isValid = got.format == desired.format && got.freq == desired.freq && got.channels == desired.channels;
-
-            if (!isValid)
-            {
-                Logger.Error?.Print(LogClass.Application, "SDL2 open audio device is not valid");
-                SDL_CloseAudioDevice(device);
-
-                return 0;
-            }
-
-            return device;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                foreach (SDL2HardwareDeviceSession session in _sessions.Keys)
-                {
-                    session.Dispose();
-                }
-
-                SDL2Driver.Instance.Dispose();
-
-                _pauseEvent.Dispose();
-            }
-        }
-
-        public bool SupportsSampleRate(uint sampleRate)
-        {
-            return true;
-        }
-
-        public bool SupportsSampleFormat(SampleFormat sampleFormat)
-        {
-            return sampleFormat != SampleFormat.PcmInt24;
-        }
-
-        public bool SupportsChannelCount(uint channelCount)
-        {
-            return true;
-        }
-
-        public bool SupportsDirection(Direction direction)
-        {
-            // TODO: add direction input when supported.
-            return direction == Direction.Output;
-        }
-    }
-}

Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceSession.cs

@@ -1,223 +0,0 @@
-using Ryujinx.Audio.Backends.Common;
-using Ryujinx.Audio.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-
-using static SDL2.SDL;
-
-namespace Ryujinx.Audio.Backends.SDL2
-{
-    class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase
-    {
-        private SDL2HardwareDeviceDriver _driver;
-        private ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers;
-        private DynamicRingBuffer _ringBuffer;
-        private ulong _playedSampleCount;
-        private ManualResetEvent _updateRequiredEvent;
-        private uint _outputStream;
-        private SDL_AudioCallback _callbackDelegate;
-        private int _bytesPerFrame;
-        private uint _sampleCount;
-        private bool _started;
-        private float _volume;
-        private ushort _nativeSampleFormat;
-
-        public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
-        {
-            _driver = driver;
-            _updateRequiredEvent = _driver.GetUpdateRequiredEvent();
-            _queuedBuffers = new ConcurrentQueue<SDL2AudioBuffer>();
-            _ringBuffer = new DynamicRingBuffer();
-            _callbackDelegate = Update;
-            _bytesPerFrame = BackendHelper.GetSampleSize(RequestedSampleFormat) * (int)RequestedChannelCount;
-            _nativeSampleFormat = SDL2HardwareDeviceDriver.GetSDL2Format(RequestedSampleFormat);
-            _sampleCount = uint.MaxValue;
-            _started = false;
-            _volume = requestedVolume;
-        }
-
-        private void EnsureAudioStreamSetup(AudioBuffer buffer)
-        {
-            uint bufferSampleCount = (uint)GetSampleCount(buffer);
-            bool needAudioSetup = _outputStream == 0 ||
-                (bufferSampleCount >= Constants.TargetSampleCount && bufferSampleCount < _sampleCount);
-
-            if (needAudioSetup)
-            {
-                _sampleCount = Math.Max(Constants.TargetSampleCount, bufferSampleCount);
-
-                uint newOutputStream = SDL2HardwareDeviceDriver.OpenStream(RequestedSampleFormat, RequestedSampleRate, RequestedChannelCount, _sampleCount, _callbackDelegate);
-
-                if (newOutputStream == 0)
-                {
-                    // No stream in place, this is unexpected.
-                    throw new InvalidOperationException($"OpenStream failed with error: \"{SDL_GetError()}\"");
-                }
-                else
-                {
-                    if (_outputStream != 0)
-                    {
-                        SDL_CloseAudioDevice(_outputStream);
-                    }
-
-                    _outputStream = newOutputStream;
-
-                    SDL_PauseAudioDevice(_outputStream, _started ? 0 : 1);
-
-                    Logger.Info?.Print(LogClass.Audio, $"New audio stream setup with a target sample count of {_sampleCount}");
-                }
-            }
-        }
-
-        private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength)
-        {
-            Span<byte> streamSpan = new Span<byte>((void*)stream, streamLength);
-
-            int maxFrameCount = (int)GetSampleCount(streamLength);
-            int bufferedFrames = _ringBuffer.Length / _bytesPerFrame;
-
-            int frameCount = Math.Min(bufferedFrames, maxFrameCount);
-
-            if (frameCount == 0)
-            {
-                // SDL2 left the responsibility to the user to clear the buffer.
-                streamSpan.Fill(0);
-
-                return;
-            }
-
-            byte[] samples = new byte[frameCount * _bytesPerFrame];
-
-            _ringBuffer.Read(samples, 0, samples.Length);
-
-            fixed (byte* p = samples)
-            {
-                IntPtr pStreamSrc = (IntPtr)p;
-
-                // Zero the dest buffer
-                streamSpan.Fill(0);
-
-                // Apply volume to written data
-                SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_volume * SDL_MIX_MAXVOLUME));
-            }
-
-            ulong sampleCount = GetSampleCount(samples.Length);
-
-            ulong availaibleSampleCount = sampleCount;
-
-            bool needUpdate = false;
-
-            while (availaibleSampleCount > 0 && _queuedBuffers.TryPeek(out SDL2AudioBuffer driverBuffer))
-            {
-                ulong sampleStillNeeded = driverBuffer.SampleCount - Interlocked.Read(ref driverBuffer.SamplePlayed);
-                ulong playedAudioBufferSampleCount = Math.Min(sampleStillNeeded, availaibleSampleCount);
-
-                ulong currentSamplePlayed = Interlocked.Add(ref driverBuffer.SamplePlayed, playedAudioBufferSampleCount);
-                availaibleSampleCount -= playedAudioBufferSampleCount;
-
-                if (currentSamplePlayed == driverBuffer.SampleCount)
-                {
-                    _queuedBuffers.TryDequeue(out _);
-
-                    needUpdate = true;
-                }
-
-                Interlocked.Add(ref _playedSampleCount, playedAudioBufferSampleCount);
-            }
-
-            // Notify the output if needed.
-            if (needUpdate)
-            {
-                _updateRequiredEvent.Set();
-            }
-        }
-
-        public override ulong GetPlayedSampleCount()
-        {
-            return Interlocked.Read(ref _playedSampleCount);
-        }
-
-        public override float GetVolume()
-        {
-            return _volume;
-        }
-
-        public override void PrepareToClose() { }
-
-        public override void QueueBuffer(AudioBuffer buffer)
-        {
-            EnsureAudioStreamSetup(buffer);
-
-            SDL2AudioBuffer driverBuffer = new SDL2AudioBuffer(buffer.DataPointer, GetSampleCount(buffer));
-
-            _ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
-
-            _queuedBuffers.Enqueue(driverBuffer);
-        }
-
-        public override void SetVolume(float volume)
-        {
-            _volume = volume;
-        }
-
-        public override void Start()
-        {
-            if (!_started)
-            {
-                if (_outputStream != 0)
-                {
-                    SDL_PauseAudioDevice(_outputStream, 0);
-                }
-
-                _started = true;
-            }
-        }
-
-        public override void Stop()
-        {
-            if (_started)
-            {
-                if (_outputStream != 0)
-                {
-                    SDL_PauseAudioDevice(_outputStream, 1);
-                }
-
-                _started = false;
-            }
-        }
-
-        public override void UnregisterBuffer(AudioBuffer buffer) { }
-
-        public override bool WasBufferFullyConsumed(AudioBuffer buffer)
-        {
-            if (!_queuedBuffers.TryPeek(out SDL2AudioBuffer driverBuffer))
-            {
-                return true;
-            }
-
-            return driverBuffer.DriverIdentifier != buffer.DataPointer;
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing && _driver.Unregister(this))
-            {
-                PrepareToClose();
-                Stop();
-
-                if (_outputStream != 0)
-                {
-                    SDL_CloseAudioDevice(_outputStream);
-                }
-            }
-        }
-
-        public override void Dispose()
-        {
-            Dispose(true);
-        }
-    }
-}

Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs

@@ -1,248 +0,0 @@
-using Ryujinx.Audio.Backends.SoundIo.Native;
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Integration;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-
-using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
-using static Ryujinx.Audio.Backends.SoundIo.Native.SoundIo;
-
-namespace Ryujinx.Audio.Backends.SoundIo
-{
-    public class SoundIoHardwareDeviceDriver : IHardwareDeviceDriver
-    {
-        private readonly SoundIoContext _audioContext;
-        private readonly SoundIoDeviceContext _audioDevice;
-        private readonly ManualResetEvent _updateRequiredEvent;
-        private readonly ManualResetEvent _pauseEvent;
-        private readonly ConcurrentDictionary<SoundIoHardwareDeviceSession, byte> _sessions;
-        private int _disposeState;
-
-        public SoundIoHardwareDeviceDriver()
-        {
-            _audioContext = SoundIoContext.Create();
-            _updateRequiredEvent = new ManualResetEvent(false);
-            _pauseEvent = new ManualResetEvent(true);
-            _sessions = new ConcurrentDictionary<SoundIoHardwareDeviceSession, byte>();
-
-            _audioContext.Connect();
-            _audioContext.FlushEvents();
-
-            _audioDevice = FindValidAudioDevice(_audioContext, true);
-        }
-
-        public static bool IsSupported => IsSupportedInternal();
-
-        private static bool IsSupportedInternal()
-        {
-            SoundIoContext context = null;
-            SoundIoDeviceContext device = null;
-            SoundIoOutStreamContext stream = null;
-
-            bool backendDisconnected = false;
-
-            try
-            {
-                context = SoundIoContext.Create();
-                context.OnBackendDisconnect = err =>
-                {
-                    backendDisconnected = true;
-                };
-
-                context.Connect();
-                context.FlushEvents();
-
-                if (backendDisconnected)
-                {
-                    return false;
-                }
-
-                if (context.OutputDeviceCount == 0)
-                {
-                    return false;
-                }
-
-                device = FindValidAudioDevice(context);
-
-                if (device == null || backendDisconnected)
-                {
-                    return false;
-                }
-
-                stream = device.CreateOutStream();
-
-                if (stream == null || backendDisconnected)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-            finally
-            {
-                stream?.Dispose();
-                context?.Dispose();
-            }
-        }
-
-        private static SoundIoDeviceContext FindValidAudioDevice(SoundIoContext audioContext, bool fallback = false)
-        {
-            SoundIoDeviceContext defaultAudioDevice = audioContext.GetOutputDevice(audioContext.DefaultOutputDeviceIndex);
-
-            if (!defaultAudioDevice.IsRaw)
-            {
-                return defaultAudioDevice;
-            }
-
-            for (int i = 0; i < audioContext.OutputDeviceCount; i++)
-            {
-                SoundIoDeviceContext audioDevice = audioContext.GetOutputDevice(i);
-
-                if (audioDevice.Id == defaultAudioDevice.Id && !audioDevice.IsRaw)
-                {
-                    return audioDevice;
-                }
-            }
-
-            return fallback ? defaultAudioDevice : null;
-        }
-
-        public ManualResetEvent GetUpdateRequiredEvent()
-        {
-            return _updateRequiredEvent;
-        }
-
-        public ManualResetEvent GetPauseEvent()
-        {
-            return _pauseEvent;
-        }
-
-        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume)
-        {
-            if (channelCount == 0)
-            {
-                channelCount = 2;
-            }
-
-            if (sampleRate == 0)
-            {
-                sampleRate = Constants.TargetSampleRate;
-            }
-
-            volume = Math.Clamp(volume, 0, 1);
-
-            if (direction != Direction.Output)
-            {
-                throw new NotImplementedException("Input direction is currently not implemented on SoundIO backend!");
-            }
-
-            SoundIoHardwareDeviceSession session = new SoundIoHardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
-
-            _sessions.TryAdd(session, 0);
-
-            return session;
-        }
-
-        internal bool Unregister(SoundIoHardwareDeviceSession session)
-        {
-            return _sessions.TryRemove(session, out _);
-        }
-
-        public static SoundIoFormat GetSoundIoFormat(SampleFormat format)
-        {
-            return format switch
-            {
-                SampleFormat.PcmInt8 => SoundIoFormat.S8,
-                SampleFormat.PcmInt16 => SoundIoFormat.S16LE,
-                SampleFormat.PcmInt24 => SoundIoFormat.S24LE,
-                SampleFormat.PcmInt32 => SoundIoFormat.S32LE,
-                SampleFormat.PcmFloat => SoundIoFormat.Float32LE,
-                _ => throw new ArgumentException ($"Unsupported sample format {format}"),
-            };
-        }
-
-        internal SoundIoOutStreamContext OpenStream(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount)
-        {
-            SoundIoFormat driverSampleFormat = GetSoundIoFormat(requestedSampleFormat);
-
-            if (!_audioDevice.SupportsSampleRate((int)requestedSampleRate))
-            {
-                throw new ArgumentException($"This sound device does not support a sample rate of {requestedSampleRate}Hz");
-            }
-
-            if (!_audioDevice.SupportsFormat(driverSampleFormat))
-            {
-                throw new ArgumentException($"This sound device does not support {requestedSampleFormat}");
-            }
-
-            if (!_audioDevice.SupportsChannelCount((int)requestedChannelCount))
-            {
-                throw new ArgumentException($"This sound device does not support channel count {requestedChannelCount}");
-            }
-
-            SoundIoOutStreamContext result = _audioDevice.CreateOutStream();
-
-            result.Name = "Ryujinx";
-            result.Layout = SoundIoChannelLayout.GetDefaultValue((int)requestedChannelCount);
-            result.Format = driverSampleFormat;
-            result.SampleRate = (int)requestedSampleRate;
-
-            return result;
-        }
-
-        internal void FlushContextEvents()
-        {
-            _audioContext.FlushEvents();
-        }
-
-        public void Dispose()
-        {
-            if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
-            {
-                Dispose(true);
-            }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                foreach (SoundIoHardwareDeviceSession session in _sessions.Keys)
-                {
-                    session.Dispose();
-                }
-
-                _audioContext.Disconnect();
-                _audioContext.Dispose();
-                _pauseEvent.Dispose();
-            }
-        }
-
-        public bool SupportsSampleRate(uint sampleRate)
-        {
-            return _audioDevice.SupportsSampleRate((int)sampleRate);
-        }
-
-        public bool SupportsSampleFormat(SampleFormat sampleFormat)
-        {
-            return _audioDevice.SupportsFormat(GetSoundIoFormat(sampleFormat));
-        }
-
-        public bool SupportsChannelCount(uint channelCount)
-        {
-            return _audioDevice.SupportsChannelCount((int)channelCount);
-        }
-
-        public bool SupportsDirection(Direction direction)
-        {
-            // TODO: add direction input when supported.
-            return direction == Direction.Output;
-        }
-    }
-}

Ryujinx.Audio/Common/AudioDeviceSession.cs

@@ -1,516 +0,0 @@
-using Ryujinx.Audio.Integration;
-using Ryujinx.Common;
-using System;
-using System.Diagnostics;
-
-namespace Ryujinx.Audio.Common
-{
-    /// <summary>
-    /// An audio device session.
-    /// </summary>
-    class AudioDeviceSession : IDisposable
-    {
-        /// <summary>
-        /// The volume of the <see cref="AudioDeviceSession"/>.
-        /// </summary>
-        private float _volume;
-
-        /// <summary>
-        /// The state of the <see cref="AudioDeviceSession"/>.
-        /// </summary>
-        private AudioDeviceState _state;
-
-        /// <summary>
-        /// Array of all buffers currently used or released.
-        /// </summary>
-        private AudioBuffer[] _buffers;
-
-        /// <summary>
-        /// The server index inside <see cref="_buffers"/> (appended but not queued to device driver).
-        /// </summary>
-        private uint _serverBufferIndex;
-
-        /// <summary>
-        /// The hardware index inside <see cref="_buffers"/> (queued to device driver).
-        /// </summary>
-        private uint _hardwareBufferIndex;
-
-        /// <summary>
-        /// The released index inside <see cref="_buffers"/> (released by the device driver).
-        /// </summary>
-        private uint _releasedBufferIndex;
-
-        /// <summary>
-        /// The count of buffer appended (server side).
-        /// </summary>
-        private uint _bufferAppendedCount;
-
-        /// <summary>
-        /// The count of buffer registered (driver side).
-        /// </summary>
-        private uint _bufferRegisteredCount;
-
-        /// <summary>
-        /// The count of buffer released (released by the driver side).
-        /// </summary>
-        private uint _bufferReleasedCount;
-
-        /// <summary>
-        /// The released buffer event.
-        /// </summary>
-        private IWritableEvent _bufferEvent;
-
-        /// <summary>
-        /// The session on the device driver.
-        /// </summary>
-        private IHardwareDeviceSession _hardwareDeviceSession;
-
-        /// <summary>
-        /// Max number of buffers that can be registered to the device driver at a time.
-        /// </summary>
-        private uint _bufferRegisteredLimit;
-
-        /// <summary>
-        /// Create a new <see cref="AudioDeviceSession"/>.
-        /// </summary>
-        /// <param name="deviceSession">The device driver session associated</param>
-        /// <param name="bufferEvent">The release buffer event</param>
-        /// <param name="bufferRegisteredLimit">The max number of buffers that can be registered to the device driver at a time</param>
-        public AudioDeviceSession(IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent, uint bufferRegisteredLimit = 4)
-        {
-            _bufferEvent = bufferEvent;
-            _hardwareDeviceSession = deviceSession;
-            _bufferRegisteredLimit = bufferRegisteredLimit;
-
-            _buffers = new AudioBuffer[Constants.AudioDeviceBufferCountMax];
-            _serverBufferIndex = 0;
-            _hardwareBufferIndex = 0;
-            _releasedBufferIndex = 0;
-
-            _bufferAppendedCount = 0;
-            _bufferRegisteredCount = 0;
-            _bufferReleasedCount = 0;
-            _volume = deviceSession.GetVolume();
-            _state = AudioDeviceState.Stopped;
-        }
-
-        /// <summary>
-        /// Get the released buffer event.
-        /// </summary>
-        /// <returns>The released buffer event</returns>
-        public IWritableEvent GetBufferEvent()
-        {
-            return _bufferEvent;
-        }
-
-        /// <summary>
-        /// Get the state of the session.
-        /// </summary>
-        /// <returns>The state of the session</returns>
-        public AudioDeviceState GetState()
-        {
-            Debug.Assert(_state == AudioDeviceState.Started || _state == AudioDeviceState.Stopped);
-
-            return _state;
-        }
-
-        /// <summary>
-        /// Get the total buffer count (server + driver + released).
-        /// </summary>
-        /// <returns>Return the total buffer count</returns>
-        private uint GetTotalBufferCount()
-        {
-            uint bufferCount = _bufferAppendedCount + _bufferRegisteredCount + _bufferReleasedCount;
-
-            Debug.Assert(bufferCount <= Constants.AudioDeviceBufferCountMax);
-
-            return bufferCount;
-        }
-
-        /// <summary>
-        /// Register a new <see cref="AudioBuffer"/> on the server side.
-        /// </summary>
-        /// <param name="buffer">The <see cref="AudioBuffer"/> to register</param>
-        /// <returns>True if the operation succeeded</returns>
-        private bool RegisterBuffer(AudioBuffer buffer)
-        {
-            if (GetTotalBufferCount() == Constants.AudioDeviceBufferCountMax)
-            {
-                return false;
-            }
-
-            _buffers[_serverBufferIndex] = buffer;
-            _serverBufferIndex = (_serverBufferIndex + 1) % Constants.AudioDeviceBufferCountMax;
-            _bufferAppendedCount++;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Flush server buffers to hardware.
-        /// </summary>
-        private void FlushToHardware()
-        {
-            uint bufferToFlushCount = Math.Min(Math.Min(_bufferAppendedCount, 4), _bufferRegisteredLimit - _bufferRegisteredCount);
-
-            AudioBuffer[] buffersToFlush = new AudioBuffer[bufferToFlushCount];
-
-            uint hardwareBufferIndex = _hardwareBufferIndex;
-
-            for (int i = 0; i < buffersToFlush.Length; i++)
-            {
-                buffersToFlush[i] = _buffers[hardwareBufferIndex];
-
-                _bufferAppendedCount--;
-                _bufferRegisteredCount++;
-
-                hardwareBufferIndex = (hardwareBufferIndex + 1) % Constants.AudioDeviceBufferCountMax;
-            }
-
-            _hardwareBufferIndex = hardwareBufferIndex;
-
-            for (int i = 0; i < buffersToFlush.Length; i++)
-            {
-                _hardwareDeviceSession.QueueBuffer(buffersToFlush[i]);
-            }
-        }
-
-        /// <summary>
-        /// Get the current index of the <see cref="AudioBuffer"/> playing on the driver side.
-        /// </summary>
-        /// <param name="playingIndex">The output index of the <see cref="AudioBuffer"/> playing on the driver side</param>
-        /// <returns>True if any buffer is playing</returns>
-        private bool TryGetPlayingBufferIndex(out uint playingIndex)
-        {
-            if (_bufferRegisteredCount > 0)
-            {
-                playingIndex = (_hardwareBufferIndex - _bufferRegisteredCount) % Constants.AudioDeviceBufferCountMax;
-
-                return true;
-            }
-
-            playingIndex = 0;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Try to pop the <see cref="AudioBuffer"/> playing on the driver side.
-        /// </summary>
-        /// <param name="buffer">The output <see cref="AudioBuffer"/> playing on the driver side</param>
-        /// <returns>True if any buffer is playing</returns>
-        private bool TryPopPlayingBuffer(out AudioBuffer buffer)
-        {
-            if (_bufferRegisteredCount > 0)
-            {
-                uint bufferIndex = (_hardwareBufferIndex - _bufferRegisteredCount) % Constants.AudioDeviceBufferCountMax;
-
-                buffer = _buffers[bufferIndex];
-
-                _buffers[bufferIndex] = null;
-
-                _bufferRegisteredCount--;
-
-                return true;
-            }
-
-            buffer = null;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Try to pop a <see cref="AudioBuffer"/> released by the driver side.
-        /// </summary>
-        /// <param name="buffer">The output <see cref="AudioBuffer"/> released by the driver side</param>
-        /// <returns>True if any buffer has been released</returns>
-        public bool TryPopReleasedBuffer(out AudioBuffer buffer)
-        {
-            if (_bufferReleasedCount > 0)
-            {
-                uint bufferIndex = (_releasedBufferIndex - _bufferReleasedCount) % Constants.AudioDeviceBufferCountMax;
-
-                buffer = _buffers[bufferIndex];
-
-                _buffers[bufferIndex] = null;
-
-                _bufferReleasedCount--;
-
-                return true;
-            }
-
-            buffer = null;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Release a <see cref="AudioBuffer"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="AudioBuffer"/> to release</param>
-        private void ReleaseBuffer(AudioBuffer buffer)
-        {
-            buffer.PlayedTimestamp = (ulong)PerformanceCounter.ElapsedNanoseconds;
-
-            _bufferRegisteredCount--;
-            _bufferReleasedCount++;
-
-            _releasedBufferIndex = (_releasedBufferIndex + 1) % Constants.AudioDeviceBufferCountMax;
-        }
-
-        /// <summary>
-        /// Update the released buffers.
-        /// </summary>
-        /// <param name="updateForStop">True if the session is currently stopping</param>
-        private void UpdateReleaseBuffers(bool updateForStop = false)
-        {
-            bool wasAnyBuffersReleased = false;
-
-            while (TryGetPlayingBufferIndex(out uint playingIndex))
-            {
-                if (!updateForStop && !_hardwareDeviceSession.WasBufferFullyConsumed(_buffers[playingIndex]))
-                {
-                    break;
-                }
-
-                if (updateForStop)
-                {
-                    _hardwareDeviceSession.UnregisterBuffer(_buffers[playingIndex]);
-                }
-
-                ReleaseBuffer(_buffers[playingIndex]);
-
-                wasAnyBuffersReleased = true;
-            }
-
-            if (wasAnyBuffersReleased)
-            {
-                _bufferEvent.Signal();
-            }
-        }
-
-        /// <summary>
-        /// Append a new <see cref="AudioBuffer"/>.
-        /// </summary>
-        /// <param name="buffer">The <see cref="AudioBuffer"/> to append</param>
-        /// <returns>True if the buffer was appended</returns>
-        public bool AppendBuffer(AudioBuffer buffer)
-        {
-            if (_hardwareDeviceSession.RegisterBuffer(buffer))
-            {
-                if (RegisterBuffer(buffer))
-                {
-                    FlushToHardware();
-
-                    return true;
-                }
-
-                _hardwareDeviceSession.UnregisterBuffer(buffer);
-            }
-
-            return false;
-        }
-
-        public bool AppendUacBuffer(AudioBuffer buffer, uint handle)
-        {
-            // NOTE: On hardware, there is another RegisterBuffer method taking an handle.
-            // This variant of the call always return false (stubbed?) as a result this logic will never succeed.
-
-            return false;
-        }
-
-        /// <summary>
-        /// Start the audio session.
-        /// </summary>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
-        public ResultCode Start()
-        {
-            if (_state == AudioDeviceState.Started)
-            {
-                return ResultCode.OperationFailed;
-            }
-
-            _hardwareDeviceSession.Start();
-
-            _state = AudioDeviceState.Started;
-
-            FlushToHardware();
-
-            _hardwareDeviceSession.SetVolume(_volume);
-
-            return ResultCode.Success;
-        }
-
-        /// <summary>
-        /// Stop the audio session.
-        /// </summary>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
-        public ResultCode Stop()
-        {
-            if (_state == AudioDeviceState.Started)
-            {
-                _hardwareDeviceSession.Stop();
-
-                UpdateReleaseBuffers(true);
-
-                _state = AudioDeviceState.Stopped;
-            }
-
-            return ResultCode.Success;
-        }
-
-        /// <summary>
-        /// Get the volume of the session.
-        /// </summary>
-        /// <returns>The volume of the session</returns>
-        public float GetVolume()
-        {
-            return _hardwareDeviceSession.GetVolume();
-        }
-
-        /// <summary>
-        /// Set the volume of the session.
-        /// </summary>
-        /// <param name="volume">The new volume to set</param>
-        public void SetVolume(float volume)
-        {
-            _volume = volume;
-
-            if (_state == AudioDeviceState.Started)
-            {
-                _hardwareDeviceSession.SetVolume(volume);
-            }
-        }
-
-        /// <summary>
-        /// Get the count of buffer currently in use (server + driver side).
-        /// </summary>
-        /// <returns>The count of buffer currently in use</returns>
-        public uint GetBufferCount()
-        {
-            return _bufferAppendedCount + _bufferRegisteredCount;
-        }
-
-        /// <summary>
-        /// Check if a buffer is present.
-        /// </summary>
-        /// <param name="bufferTag">The unique tag of the buffer</param>
-        /// <returns>Return true if a buffer is present</returns>
-        public bool ContainsBuffer(ulong bufferTag)
-        {
-            uint bufferIndex = (_releasedBufferIndex - _bufferReleasedCount) % Constants.AudioDeviceBufferCountMax;
-
-            for (int i = 0; i < GetTotalBufferCount(); i++)
-            {
-                if (_buffers[bufferIndex].BufferTag == bufferTag)
-                {
-                    return true;
-                }
-
-                bufferIndex = (bufferIndex + 1) % Constants.AudioDeviceBufferCountMax;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Get the count of sample played in this session.
-        /// </summary>
-        /// <returns>The count of sample played in this session</returns>
-        public ulong GetPlayedSampleCount()
-        {
-            if (_state == AudioDeviceState.Stopped)
-            {
-                return 0;
-            }
-            else
-            {
-                return _hardwareDeviceSession.GetPlayedSampleCount();
-            }
-        }
-
-        /// <summary>
-        /// Flush all buffers to the initial state.
-        /// </summary>
-        /// <returns>True if any buffer was flushed</returns>
-        public bool FlushBuffers()
-        {
-            if (_state == AudioDeviceState.Stopped)
-            {
-                return false;
-            }
-
-            uint bufferCount = GetBufferCount();
-
-            while (TryPopReleasedBuffer(out AudioBuffer buffer))
-            {
-                _hardwareDeviceSession.UnregisterBuffer(buffer);
-            }
-
-            while (TryPopPlayingBuffer(out AudioBuffer buffer))
-            {
-                _hardwareDeviceSession.UnregisterBuffer(buffer);
-            }
-
-            if (_bufferRegisteredCount == 0 || (_bufferReleasedCount + _bufferAppendedCount) > Constants.AudioDeviceBufferCountMax)
-            {
-                return false;
-            }
-
-            _bufferReleasedCount += _bufferAppendedCount;
-            _releasedBufferIndex = (_releasedBufferIndex + _bufferAppendedCount) % Constants.AudioDeviceBufferCountMax;
-            _bufferAppendedCount = 0;
-            _hardwareBufferIndex = _serverBufferIndex;
-
-            if (bufferCount > 0)
-            {
-                _bufferEvent.Signal();
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Update the session.
-        /// </summary>
-        public void Update()
-        {
-            if (_state == AudioDeviceState.Started)
-            {
-                UpdateReleaseBuffers();
-                FlushToHardware();
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // Tell the hardware session that we are ending.
-                _hardwareDeviceSession.PrepareToClose();
-
-                // Unregister all buffers
-
-                while (TryPopReleasedBuffer(out AudioBuffer buffer))
-                {
-                    _hardwareDeviceSession.UnregisterBuffer(buffer);
-                }
-
-                while (TryPopPlayingBuffer(out AudioBuffer buffer))
-                {
-                    _hardwareDeviceSession.UnregisterBuffer(buffer);
-                }
-
-                // Finally dispose hardware session.
-                _hardwareDeviceSession.Dispose();
-
-                _bufferEvent.Signal();
-            }
-        }
-    }
-}

Ryujinx.Audio/Renderer/Device/VirtualDevice.cs

@@ -1,89 +0,0 @@
-using System.Diagnostics;
-
-namespace Ryujinx.Audio.Renderer.Device
-{
-    /// <summary>
-    /// Represents a virtual device used by IAudioDevice.
-    /// </summary>
-    public class VirtualDevice
-    {
-        /// <summary>
-        /// All the defined virtual devices.
-        /// </summary>
-        public static readonly VirtualDevice[] Devices = new VirtualDevice[5]
-        {
-            new VirtualDevice("AudioStereoJackOutput", 2, true),
-            new VirtualDevice("AudioBuiltInSpeakerOutput", 2, false),
-            new VirtualDevice("AudioTvOutput", 6, false),
-            new VirtualDevice("AudioUsbDeviceOutput", 2, true),
-            new VirtualDevice("AudioExternalOutput", 6, true),
-        };
-
-        /// <summary>
-        /// The name of the <see cref="VirtualDevice"/>.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// The count of channels supported by the <see cref="VirtualDevice"/>.
-        /// </summary>
-        public uint ChannelCount { get; }
-
-        /// <summary>
-        /// The system master volume of the <see cref="VirtualDevice"/>.
-        /// </summary>
-        public float MasterVolume { get; private set; }
-
-        /// <summary>
-        /// Define if the <see cref="VirtualDevice"/> is provided by an external interface.
-        /// </summary>
-        public bool IsExternalOutput { get; }
-
-        /// <summary>
-        /// Create a new <see cref="VirtualDevice"/> instance.
-        /// </summary>
-        /// <param name="name">The name of the <see cref="VirtualDevice"/>.</param>
-        /// <param name="channelCount">The count of channels supported by the <see cref="VirtualDevice"/>.</param>
-        /// <param name="isExternalOutput">Indicate if the <see cref="VirtualDevice"/> is provided by an external interface.</param>
-        private VirtualDevice(string name, uint channelCount, bool isExternalOutput)
-        {
-            Name = name;
-            ChannelCount = channelCount;
-            IsExternalOutput = isExternalOutput;
-        }
-
-        /// <summary>
-        /// Update the master volume of the <see cref="VirtualDevice"/>.
-        /// </summary>
-        /// <param name="volume">The new master volume.</param>
-        public void UpdateMasterVolume(float volume)
-        {
-            Debug.Assert(volume >= 0.0f && volume <= 1.0f);
-
-            MasterVolume = volume;
-        }
-
-        /// <summary>
-        /// Check if the <see cref="VirtualDevice"/> is a usb device.
-        /// </summary>
-        /// <returns>Returns true if the <see cref="VirtualDevice"/> is a usb device.</returns>
-        public bool IsUsbDevice()
-        {
-            return Name.Equals("AudioUsbDeviceOutput");
-        }
-
-        /// <summary>
-        /// Get the output device name of the <see cref="VirtualDevice"/>.
-        /// </summary>
-        /// <returns>The output device name of the <see cref="VirtualDevice"/>.</returns>
-        public string GetOutputDeviceName()
-        {
-            if (IsExternalOutput)
-            {
-                return "AudioExternalOutput";
-            }
-
-            return Name;
-        }
-    }
-}

Ryujinx.Audio/Renderer/Device/VirtualDeviceSessionRegistry.cs

@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.Audio.Renderer.Device
-{
-    /// <summary>
-    /// Represent an instance containing a registry of <see cref="VirtualDeviceSession"/>.
-    /// </summary>
-    public class VirtualDeviceSessionRegistry
-    {
-        /// <summary>
-        /// The session registry, used to store the sessions of a given AppletResourceId.
-        /// </summary>
-        private Dictionary<ulong, VirtualDeviceSession[]> _sessionsRegistry = new Dictionary<ulong, VirtualDeviceSession[]>();
-
-        /// <summary>
-        /// The default <see cref="VirtualDevice"/>.
-        /// </summary>
-        /// <remarks>This is used when the USB device is the default one on older revision.</remarks>
-        public VirtualDevice DefaultDevice => VirtualDevice.Devices[0];
-
-        /// <summary>
-        /// The current active <see cref="VirtualDevice"/>.
-        /// </summary>
-        // TODO: make this configurable
-        public VirtualDevice ActiveDevice = VirtualDevice.Devices[2];
-
-        /// <summary>
-        /// Get the associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId.
-        /// </summary>
-        /// <param name="resourceAppletId">The AppletResourceId used.</param>
-        /// <returns>The associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId.</returns>
-        public VirtualDeviceSession[] GetSessionByAppletResourceId(ulong resourceAppletId)
-        {
-            if (_sessionsRegistry.TryGetValue(resourceAppletId, out VirtualDeviceSession[] result))
-            {
-                return result;
-            }
-
-            result = CreateSessionsFromBehaviourContext();
-
-            _sessionsRegistry.Add(resourceAppletId, result);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Create a new array of sessions for each <see cref="VirtualDevice"/>.
-        /// </summary>
-        /// <returns>A new array of sessions for each <see cref="VirtualDevice"/>.</returns>
-        private static VirtualDeviceSession[] CreateSessionsFromBehaviourContext()
-        {
-            VirtualDeviceSession[] virtualDeviceSession = new VirtualDeviceSession[VirtualDevice.Devices.Length];
-
-            for (int i = 0; i < virtualDeviceSession.Length; i++)
-            {
-                virtualDeviceSession[i] = new VirtualDeviceSession(VirtualDevice.Devices[i]);
-            }
-
-            return virtualDeviceSession;
-        }
-    }
-}

Ryujinx.Audio/Renderer/Dsp/AudioProcessor.cs

@@ -1,276 +0,0 @@
-using Ryujinx.Audio.Integration;
-using Ryujinx.Audio.Renderer.Dsp.Command;
-using Ryujinx.Audio.Renderer.Utils;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using System;
-using System.Threading;
-
-namespace Ryujinx.Audio.Renderer.Dsp
-{
-    public class AudioProcessor : IDisposable
-    {
-        private const int MaxBufferedFrames = 5;
-        private const int TargetBufferedFrames = 3;
-
-        private enum MailboxMessage : uint
-        {
-            Start,
-            Stop,
-            RenderStart,
-            RenderEnd
-        }
-
-        private class RendererSession
-        {
-            public CommandList CommandList;
-            public int RenderingLimit;
-            public ulong AppletResourceId;
-        }
-
-        private Mailbox<MailboxMessage> _mailbox;
-        private RendererSession[] _sessionCommandList;
-        private Thread _workerThread;
-
-        public IHardwareDevice[] OutputDevices { get; private set; }
-
-        private long _lastTime;
-        private long _playbackEnds;
-        private ManualResetEvent _event;
-
-        private ManualResetEvent _pauseEvent;
-
-        public AudioProcessor()
-        {
-            _event = new ManualResetEvent(false);
-        }
-
-        private static uint GetHardwareChannelCount(IHardwareDeviceDriver deviceDriver)
-        {
-            // Get the real device driver (In case the compat layer is on top of it).
-            deviceDriver = deviceDriver.GetRealDeviceDriver();
-
-            if (deviceDriver.SupportsChannelCount(6))
-            {
-                return 6;
-            }
-            else
-            {
-                // NOTE: We default to stereo as this will get downmixed to mono by the compat layer if it's not compatible.
-                return 2;
-            }
-        }
-
-        public void Start(IHardwareDeviceDriver deviceDriver, float volume)
-        {
-            OutputDevices = new IHardwareDevice[Constants.AudioRendererSessionCountMax];
-
-            // TODO: Before enabling this, we need up-mixing from stereo to 5.1.
-            // uint channelCount = GetHardwareChannelCount(deviceDriver);
-            uint channelCount = 2;
-
-            for (int i = 0; i < OutputDevices.Length; i++)
-            {
-                // TODO: Don't hardcode sample rate.
-                OutputDevices[i] = new HardwareDeviceImpl(deviceDriver, channelCount, Constants.TargetSampleRate, volume);
-            }
-
-            _mailbox = new Mailbox<MailboxMessage>();
-            _sessionCommandList = new RendererSession[Constants.AudioRendererSessionCountMax];
-            _event.Reset();
-            _lastTime = PerformanceCounter.ElapsedNanoseconds;
-            _pauseEvent = deviceDriver.GetPauseEvent();
-
-            StartThread();
-
-            _mailbox.SendMessage(MailboxMessage.Start);
-
-            if (_mailbox.ReceiveResponse() != MailboxMessage.Start)
-            {
-                throw new InvalidOperationException("Audio Processor Start response was invalid!");
-            }
-        }
-
-        public void Stop()
-        {
-            _mailbox.SendMessage(MailboxMessage.Stop);
-
-            if (_mailbox.ReceiveResponse() != MailboxMessage.Stop)
-            {
-                throw new InvalidOperationException("Audio Processor Stop response was invalid!");
-            }
-
-            foreach (IHardwareDevice device in OutputDevices)
-            {
-                device.Dispose();
-            }
-        }
-
-        public void Send(int sessionId, CommandList commands, int renderingLimit, ulong appletResourceId)
-        {
-            _sessionCommandList[sessionId] = new RendererSession
-            {
-                CommandList = commands,
-                RenderingLimit = renderingLimit,
-                AppletResourceId = appletResourceId
-            };
-        }
-
-        public bool HasRemainingCommands(int sessionId)
-        {
-            return _sessionCommandList[sessionId] != null;
-        }
-
-        public void Signal()
-        {
-            _mailbox.SendMessage(MailboxMessage.RenderStart);
-        }
-
-        public void Wait()
-        {
-            if (_mailbox.ReceiveResponse() != MailboxMessage.RenderEnd)
-            {
-                throw new InvalidOperationException("Audio Processor Wait response was invalid!");
-            }
-
-            long increment = Constants.AudioProcessorMaxUpdateTimeTarget;
-
-            long timeNow = PerformanceCounter.ElapsedNanoseconds;
-
-            if (timeNow > _playbackEnds)
-            {
-                // Playback has restarted.
-                _playbackEnds = timeNow;
-            }
-
-            _playbackEnds += increment;
-
-            // The number of frames we are behind where the timer says we should be.
-            long framesBehind = (timeNow - _lastTime) / increment;
-
-            // The number of frames yet to play on the backend.
-            long bufferedFrames = (_playbackEnds - timeNow) / increment + framesBehind;
-
-            // If we've entered a situation where a lot of buffers will be queued on the backend,
-            // Skip some audio frames so that playback can catch up.
-            if (bufferedFrames > MaxBufferedFrames)
-            {
-                // Skip a few frames so that we're not too far behind. (the target number of frames)
-                _lastTime += increment * (bufferedFrames - TargetBufferedFrames);
-            }
-
-            while (timeNow < _lastTime + increment)
-            {
-                _event.WaitOne(1);
-
-                timeNow = PerformanceCounter.ElapsedNanoseconds;
-            }
-
-            _lastTime += increment;
-        }
-
-        private void StartThread()
-        {
-            _workerThread = new Thread(Work)
-            {
-                Name = "AudioProcessor.Worker"
-            };
-
-            _workerThread.Start();
-        }
-
-        private void Work()
-        {
-            if (_mailbox.ReceiveMessage() != MailboxMessage.Start)
-            {
-                throw new InvalidOperationException("Audio Processor Start message was invalid!");
-            }
-
-            _mailbox.SendResponse(MailboxMessage.Start);
-            _mailbox.SendResponse(MailboxMessage.RenderEnd);
-
-            Logger.Info?.Print(LogClass.AudioRenderer, "Starting audio processor");
-
-            while (true)
-            {
-                _pauseEvent?.WaitOne();
-
-                MailboxMessage message = _mailbox.ReceiveMessage();
-
-                if (message == MailboxMessage.Stop)
-                {
-                    break;
-                }
-
-                if (message == MailboxMessage.RenderStart)
-                {
-                    long startTicks = PerformanceCounter.ElapsedNanoseconds;
-
-                    for (int i = 0; i < _sessionCommandList.Length; i++)
-                    {
-                        if (_sessionCommandList[i] != null)
-                        {
-                            _sessionCommandList[i].CommandList.Process(OutputDevices[i]);
-                            _sessionCommandList[i].CommandList.Dispose();
-                            _sessionCommandList[i] = null;
-                        }
-                    }
-
-                    long endTicks = PerformanceCounter.ElapsedNanoseconds;
-
-                    long elapsedTime = endTicks - startTicks;
-
-                    if (Constants.AudioProcessorMaxUpdateTime < elapsedTime)
-                    {
-                        Logger.Debug?.Print(LogClass.AudioRenderer, $"DSP too slow (exceeded by {elapsedTime - Constants.AudioProcessorMaxUpdateTime}ns)");
-                    }
-
-                    _mailbox.SendResponse(MailboxMessage.RenderEnd);
-                }
-            }
-
-            Logger.Info?.Print(LogClass.AudioRenderer, "Stopping audio processor");
-            _mailbox.SendResponse(MailboxMessage.Stop);
-        }
-
-        public float GetVolume()
-        {
-            if (OutputDevices != null)
-            {
-                foreach (IHardwareDevice outputDevice in OutputDevices)
-                {
-                    if (outputDevice != null)
-                    {
-                        return outputDevice.GetVolume();
-                    }
-                }
-            }
-
-            return 0f;
-        }
-
-        public void SetVolume(float volume)
-        {
-            if (OutputDevices != null)
-            {
-                foreach (IHardwareDevice outputDevice in OutputDevices)
-                {
-                    outputDevice?.SetVolume(volume);
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _event.Dispose();
-            }
-        }
-    }
-}

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

@@ -1,173 +0,0 @@
-using System;
-using System.Diagnostics;
-using Ryujinx.Audio.Renderer.Dsp.Effect;
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class CompressorCommand : ICommand
-    {
-        private const int FixedPointPrecision = 15;
-
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.Compressor;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public CompressorParameter Parameter => _parameter;
-        public Memory<CompressorState> State { get; }
-        public ushort[] OutputBufferIndices { get; }
-        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
-
-        private CompressorParameter _parameter;
-
-        public CompressorCommand(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, bool isEnabled, int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-            _parameter = parameter;
-            State = state;
-
-            IsEffectEnabled = isEnabled;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-
-            for (int i = 0; i < _parameter.ChannelCount; i++)
-            {
-                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ref CompressorState state = ref State.Span[0];
-
-            if (IsEffectEnabled)
-            {
-                if (_parameter.Status == Server.Effect.UsageState.Invalid)
-                {
-                    state = new CompressorState(ref _parameter);
-                }
-                else if (_parameter.Status == Server.Effect.UsageState.New)
-                {
-                    state.UpdateParameter(ref _parameter);
-                }
-            }
-
-            ProcessCompressor(context, ref state);
-        }
-
-        private unsafe void ProcessCompressor(CommandList context, ref CompressorState state)
-        {
-            Debug.Assert(_parameter.IsChannelCountValid());
-
-            if (IsEffectEnabled && _parameter.IsChannelCountValid())
-            {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<float> channelInput = stackalloc float[Parameter.ChannelCount];
-                ExponentialMovingAverage inputMovingAverage = state.InputMovingAverage;
-                float unknown4 = state.Unknown4;
-                ExponentialMovingAverage compressionGainAverage = state.CompressionGainAverage;
-                float previousCompressionEmaAlpha = state.PreviousCompressionEmaAlpha;
-
-                for (int i = 0; i < _parameter.ChannelCount; i++)
-                {
-                    inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
-                    outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
-                }
-
-                for (int sampleIndex = 0; sampleIndex < context.SampleCount; sampleIndex++)
-                {
-                    for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
-                    {
-                        channelInput[channelIndex] = *((float*)inputBuffers[channelIndex] + sampleIndex);
-                    }
-
-                    float newMean = inputMovingAverage.Update(FloatingPointHelper.MeanSquare(channelInput), _parameter.InputGain);
-                    float y = FloatingPointHelper.Log10(newMean) * 10.0f;
-                    float z = 0.0f;
-
-                    bool unknown10OutOfRange = false;
-
-                    if (newMean < 1.0e-10f)
-                    {
-                        z = 1.0f;
-
-                        unknown10OutOfRange = state.Unknown10 < -100.0f;
-                    }
-
-                    if (y >= state.Unknown10 || unknown10OutOfRange)
-                    {
-                        float tmpGain;
-
-                        if (y >= state.Unknown14)
-                        {
-                            tmpGain = ((1.0f / Parameter.Ratio) - 1.0f) * (y - Parameter.Threshold);
-                        }
-                        else
-                        {
-                            tmpGain = (y - state.Unknown10) * ((y - state.Unknown10) * -state.CompressorGainReduction);
-                        }
-
-                        z = FloatingPointHelper.DecibelToLinearExtended(tmpGain);
-                    }
-
-                    float unknown4New = z;
-                    float compressionEmaAlpha;
-
-                    if ((unknown4 - z) <= 0.08f)
-                    {
-                        compressionEmaAlpha = Parameter.ReleaseCoefficient;
-
-                        if ((unknown4 - z) >= -0.08f)
-                        {
-                            if (MathF.Abs(compressionGainAverage.Read() - z) >= 0.001f)
-                            {
-                                unknown4New = unknown4;
-                            }
-
-                            compressionEmaAlpha = previousCompressionEmaAlpha;
-                        }
-                    }
-                    else
-                    {
-                        compressionEmaAlpha = Parameter.AttackCoefficient;
-                    }
-
-                    float compressionGain = compressionGainAverage.Update(z, compressionEmaAlpha);
-
-                    for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
-                    {
-                        *((float*)outputBuffers[channelIndex] + sampleIndex) = channelInput[channelIndex] * compressionGain * state.OutputGain;
-                    }
-
-                    unknown4 = unknown4New;
-                    previousCompressionEmaAlpha = compressionEmaAlpha;
-                }
-
-                state.InputMovingAverage = inputMovingAverage;
-                state.Unknown4 = unknown4;
-                state.CompressionGainAverage = compressionGainAverage;
-                state.PreviousCompressionEmaAlpha = previousCompressionEmaAlpha;
-            }
-            else
-            {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    if (InputBufferIndices[i] != OutputBufferIndices[i])
-                    {
-                        context.CopyBuffer(OutputBufferIndices[i], InputBufferIndices[i]);
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,280 +0,0 @@
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using Ryujinx.Audio.Renderer.Server.Effect;
-using Ryujinx.Audio.Renderer.Utils.Math;
-using System;
-using System.Diagnostics;
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class DelayCommand : ICommand
-    {
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.Delay;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public DelayParameter Parameter => _parameter;
-        public Memory<DelayState> State { get; }
-        public ulong WorkBuffer { get; }
-        public ushort[] OutputBufferIndices { get; }
-        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
-
-        private DelayParameter _parameter;
-
-        private const int FixedPointPrecision = 14;
-
-        public DelayCommand(uint bufferOffset, DelayParameter parameter, Memory<DelayState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-            _parameter = parameter;
-            State = state;
-            WorkBuffer = workBuffer;
-
-            IsEffectEnabled = isEnabled;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-
-            for (int i = 0; i < Parameter.ChannelCount; i++)
-            {
-                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
-            }
-
-            DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, InputBufferIndices);
-            DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, OutputBufferIndices);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelayMono(ref DelayState state, float* outputBuffer, float* inputBuffer, uint sampleCount)
-        {
-            const ushort channelCount = 1;
-
-            float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
-            float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
-            float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
-            float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                float input = inputBuffer[i] * 64;
-                float delayLineValue = state.DelayLines[0].Read();
-
-                float temp = input * inGain + delayLineValue * feedbackGain;
-
-                state.UpdateLowPassFilter(ref temp, channelCount);
-
-                outputBuffer[i] = (input * dryGain + delayLineValue * outGain) / 64;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelayStereo(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            const ushort channelCount = 2;
-
-            float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
-            float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
-            float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
-            float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
-            float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
-
-            Matrix2x2 delayFeedback = new Matrix2x2(delayFeedbackBaseGain, delayFeedbackCrossGain,
-                                                    delayFeedbackCrossGain, delayFeedbackBaseGain);
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                Vector2 channelInput = new Vector2
-                {
-                    X = *((float*)inputBuffers[0] + i) * 64,
-                    Y = *((float*)inputBuffers[1] + i) * 64,
-                };
-
-                Vector2 delayLineValues = new Vector2()
-                {
-                    X = state.DelayLines[0].Read(),
-                    Y = state.DelayLines[1].Read(),
-                };
-
-                Vector2 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
-
-                state.UpdateLowPassFilter(ref Unsafe.As<Vector2, float>(ref temp), channelCount);
-
-                *((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
-                *((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelayQuadraphonic(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            const ushort channelCount = 4;
-
-            float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
-            float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
-            float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
-            float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
-            float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
-
-            Matrix4x4 delayFeedback = new Matrix4x4(delayFeedbackBaseGain, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f,
-                                                    delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain,
-                                                    delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain,
-                                                    0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain);
-
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                Vector4 channelInput = new Vector4
-                {
-                    X = *((float*)inputBuffers[0] + i) * 64,
-                    Y = *((float*)inputBuffers[1] + i) * 64,
-                    Z = *((float*)inputBuffers[2] + i) * 64,
-                    W = *((float*)inputBuffers[3] + i) * 64
-                };
-
-                Vector4 delayLineValues = new Vector4()
-                {
-                    X = state.DelayLines[0].Read(),
-                    Y = state.DelayLines[1].Read(),
-                    Z = state.DelayLines[2].Read(),
-                    W = state.DelayLines[3].Read()
-                };
-
-                Vector4 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
-
-                state.UpdateLowPassFilter(ref Unsafe.As<Vector4, float>(ref temp), channelCount);
-
-                *((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
-                *((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
-                *((float*)outputBuffers[2] + i) = (channelInput.Z * dryGain + delayLineValues.Z * outGain) / 64;
-                *((float*)outputBuffers[3] + i) = (channelInput.W * dryGain + delayLineValues.W * outGain) / 64;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-        private unsafe void ProcessDelaySurround(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            const ushort channelCount = 6;
-
-            float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
-            float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
-            float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
-            float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
-            float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
-            float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
-
-            Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, 0.0f, delayFeedbackCrossGain, 0.0f,
-                                                    0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain,
-                                                    delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f,
-                                                    0.0f, 0.0f, 0.0f, feedbackGain, 0.0f, 0.0f,
-                                                    delayFeedbackCrossGain, 0.0f, 0.0f, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain,
-                                                    0.0f, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain, delayFeedbackBaseGain);
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                Vector6 channelInput = new Vector6
-                {
-                    X = *((float*)inputBuffers[0] + i) * 64,
-                    Y = *((float*)inputBuffers[1] + i) * 64,
-                    Z = *((float*)inputBuffers[2] + i) * 64,
-                    W = *((float*)inputBuffers[3] + i) * 64,
-                    V = *((float*)inputBuffers[4] + i) * 64,
-                    U = *((float*)inputBuffers[5] + i) * 64
-                };
-
-                Vector6 delayLineValues = new Vector6
-                {
-                    X = state.DelayLines[0].Read(),
-                    Y = state.DelayLines[1].Read(),
-                    Z = state.DelayLines[2].Read(),
-                    W = state.DelayLines[3].Read(),
-                    V = state.DelayLines[4].Read(),
-                    U = state.DelayLines[5].Read()
-                };
-
-                Vector6 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
-
-                state.UpdateLowPassFilter(ref Unsafe.As<Vector6, float>(ref temp), channelCount);
-
-                *((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
-                *((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
-                *((float*)outputBuffers[2] + i) = (channelInput.Z * dryGain + delayLineValues.Z * outGain) / 64;
-                *((float*)outputBuffers[3] + i) = (channelInput.W * dryGain + delayLineValues.W * outGain) / 64;
-                *((float*)outputBuffers[4] + i) = (channelInput.V * dryGain + delayLineValues.V * outGain) / 64;
-                *((float*)outputBuffers[5] + i) = (channelInput.U * dryGain + delayLineValues.U * outGain) / 64;
-            }
-        }
-
-        private unsafe void ProcessDelay(CommandList context, ref DelayState state)
-        {
-            Debug.Assert(Parameter.IsChannelCountValid());
-
-            if (IsEffectEnabled && Parameter.IsChannelCountValid())
-            {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
-                    outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
-                }
-
-                switch (Parameter.ChannelCount)
-                {
-                    case 1:
-                        ProcessDelayMono(ref state, (float*)outputBuffers[0], (float*)inputBuffers[0], context.SampleCount);
-                        break;
-                    case 2:
-                        ProcessDelayStereo(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 4:
-                        ProcessDelayQuadraphonic(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 6:
-                        ProcessDelaySurround(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    default:
-                        throw new NotImplementedException(Parameter.ChannelCount.ToString());
-                }
-            }
-            else
-            {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    if (InputBufferIndices[i] != OutputBufferIndices[i])
-                    {
-                        context.CopyBuffer(OutputBufferIndices[i], InputBufferIndices[i]);
-                    }
-                }
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ref DelayState state = ref State.Span[0];
-
-            if (IsEffectEnabled)
-            {
-                if (Parameter.Status == UsageState.Invalid)
-                {
-                    state = new DelayState(ref _parameter, WorkBuffer);
-                }
-                else if (Parameter.Status == UsageState.New)
-                {
-                    state.UpdateParameter(ref _parameter);
-                }
-            }
-
-            ProcessDelay(context, ref state);
-        }
-    }
-}

Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs

@@ -1,91 +0,0 @@
-using Ryujinx.Audio.Integration;
-using Ryujinx.Audio.Renderer.Server.Sink;
-using System;
-using System.Runtime.CompilerServices;
-using System.Text;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class DeviceSinkCommand : ICommand
-    {
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.DeviceSink;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public string DeviceName { get; }
-
-        public int SessionId { get; }
-
-        public uint InputCount { get; }
-        public ushort[] InputBufferIndices { get; }
-
-        public Memory<float> Buffers { get; }
-
-        public DeviceSinkCommand(uint bufferOffset, DeviceSink sink, int sessionId, Memory<float> buffers, int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-
-            DeviceName = Encoding.ASCII.GetString(sink.Parameter.DeviceName).TrimEnd('\0');
-            SessionId = sessionId;
-            InputCount = sink.Parameter.InputCount;
-            InputBufferIndices = new ushort[InputCount];
-
-            for (int i = 0; i < Math.Min(InputCount, Constants.ChannelCountMax); i++)
-            {
-                InputBufferIndices[i] = (ushort)(bufferOffset + sink.Parameter.Input[i]);
-            }
-
-            if (sink.UpsamplerState != null)
-            {
-                Buffers = sink.UpsamplerState.OutputBuffer;
-            }
-            else
-            {
-                Buffers = buffers;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private Span<float> GetBuffer(int index, int sampleCount)
-        {
-            return Buffers.Span.Slice(index * sampleCount, sampleCount);
-        }
-
-        public void Process(CommandList context)
-        {
-            IHardwareDevice device = context.OutputDevice;
-
-            if (device.GetSampleRate() == Constants.TargetSampleRate)
-            {
-                int channelCount = (int)device.GetChannelCount();
-                uint bufferCount = Math.Min(device.GetChannelCount(), InputCount);
-
-                const int sampleCount = Constants.TargetSampleCount;
-
-                short[] outputBuffer = new short[bufferCount * sampleCount];
-
-                for (int i = 0; i < bufferCount; i++)
-                {
-                    ReadOnlySpan<float> inputBuffer = GetBuffer(InputBufferIndices[i], sampleCount);
-
-                    for (int j = 0; j < sampleCount; j++)
-                    {
-                        outputBuffer[i + j * channelCount] = PcmHelper.Saturate(inputBuffer[j]);
-                    }
-                }
-
-                device.AppendBuffer(outputBuffer, InputCount);
-            }
-            else
-            {
-                // TODO: support resampling for device only supporting something different
-                throw new NotImplementedException();
-            }
-        }
-    }
-}

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

@@ -1,254 +0,0 @@
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using Ryujinx.Audio.Renderer.Server.Effect;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class Reverb3dCommand : ICommand
-    {
-        private static readonly int[] OutputEarlyIndicesTableMono = new int[20] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableMono = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableMono = new int[1] { 0 };
-
-        private static readonly int[] OutputEarlyIndicesTableStereo = new int[20] { 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableStereo = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableStereo = new int[2] { 0, 1 };
-
-        private static readonly int[] OutputEarlyIndicesTableQuadraphonic = new int[20] { 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 3, 3, 3 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableQuadraphonic = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
-
-        private static readonly int[] OutputEarlyIndicesTableSurround = new int[40] { 4, 5, 0, 5, 0, 5, 1, 5, 1, 5, 1, 5, 1, 5, 2, 5, 2, 5, 2, 5, 1, 5, 1, 5, 1, 5, 0, 5, 0, 5, 0, 5, 0, 5, 3, 5, 3, 5, 3, 5 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableSurround = new int[40] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableSurround = new int[6] { 0, 1, 2, 3, -1, 3 };
-
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.Reverb3d;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
-
-        public Reverb3dParameter Parameter => _parameter;
-        public Memory<Reverb3dState> State { get; }
-        public ulong WorkBuffer { get; }
-        public ushort[] OutputBufferIndices { get; }
-        public ushort[] InputBufferIndices { get; }
-
-        public bool IsEffectEnabled { get; }
-
-        private Reverb3dParameter _parameter;
-
-        public Reverb3dCommand(uint bufferOffset, Reverb3dParameter parameter, Memory<Reverb3dState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
-        {
-            Enabled = true;
-            IsEffectEnabled = isEnabled;
-            NodeId = nodeId;
-            _parameter = parameter;
-            State = state;
-            WorkBuffer = workBuffer;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-
-            for (int i = 0; i < Parameter.ChannelCount; i++)
-            {
-                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
-            }
-
-            // NOTE: We do the opposite as Nintendo here for now to restore previous behaviour
-            // TODO: Update reverb 3d processing and remove this to use RemapLegacyChannelEffectMappingToChannelResourceMapping.
-            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, InputBufferIndices);
-            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, OutputBufferIndices);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverb3dMono(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> 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)
-        {
-            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)
-        {
-            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)
-        {
-            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)
-        {
-            const int delayLineSampleIndexOffset = 1;
-
-            bool isMono = Parameter.ChannelCount == 1;
-            bool isSurround = Parameter.ChannelCount == 6;
-
-            Span<float> outputValues = stackalloc float[Constants.ChannelCountMax];
-            Span<float> channelInput = stackalloc float[Parameter.ChannelCount];
-            Span<float> feedbackValues = stackalloc float[4];
-            Span<float> feedbackOutputValues = stackalloc float[4];
-            Span<float> values = stackalloc float[4];
-
-            for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
-            {
-                outputValues.Fill(0);
-
-                float tapOut = state.PreDelayLine.TapUnsafe(state.ReflectionDelayTime, delayLineSampleIndexOffset);
-
-                for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
-                {
-                    int earlyDelayIndex = targetEarlyDelayLineIndicesTable[i];
-                    int outputIndex = outputEarlyIndicesTable[i];
-
-                    float tempTapOut = state.PreDelayLine.TapUnsafe(state.EarlyDelayTime[earlyDelayIndex], delayLineSampleIndexOffset);
-
-                    outputValues[outputIndex] += tempTapOut * state.EarlyGain[earlyDelayIndex];
-                }
-
-                float targetPreDelayValue = 0;
-
-                for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
-                {
-                    channelInput[channelIndex] = *((float*)inputBuffers[channelIndex] + sampleIndex);
-                    targetPreDelayValue += channelInput[channelIndex];
-                }
-
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    outputValues[i] *= state.EarlyReflectionsGain;
-                }
-
-                state.PreviousPreDelayValue = (targetPreDelayValue * state.TargetPreDelayGain) + (state.PreviousPreDelayValue * state.PreviousPreDelayGain);
-
-                state.PreDelayLine.Update(state.PreviousPreDelayValue);
-
-                for (int i = 0; i < state.FdnDelayLines.Length; i++)
-                {
-                    float fdnValue = state.FdnDelayLines[i].Read();
-
-                    float feedbackOutputValue = fdnValue * state.DecayDirectFdnGain[i] + state.PreviousFeedbackOutputDecayed[i];
-
-                    state.PreviousFeedbackOutputDecayed[i] = (fdnValue * state.DecayCurrentFdnGain[i]) + (feedbackOutputValue * state.DecayCurrentOutputGain[i]);
-
-                    feedbackOutputValues[i] = feedbackOutputValue;
-                }
-
-                feedbackValues[0] = feedbackOutputValues[2] + feedbackOutputValues[1];
-                feedbackValues[1] = -feedbackOutputValues[0] - feedbackOutputValues[3];
-                feedbackValues[2] = feedbackOutputValues[0] - feedbackOutputValues[3];
-                feedbackValues[3] = feedbackOutputValues[1] - feedbackOutputValues[2];
-
-                for (int i = 0; i < state.DecayDelays1.Length; i++)
-                {
-                    float temp = state.DecayDelays1[i].Update(tapOut * state.LateReverbGain + feedbackValues[i]);
-
-                    values[i] = state.DecayDelays2[i].Update(temp);
-
-                    state.FdnDelayLines[i].Update(values[i]);
-                }
-
-                for (int channelIndex = 0; channelIndex < targetOutputFeedbackIndicesTable.Length; channelIndex++)
-                {
-                    int targetOutputFeedbackIndex = targetOutputFeedbackIndicesTable[channelIndex];
-
-                    if (targetOutputFeedbackIndex >= 0)
-                    {
-                        *((float*)outputBuffers[channelIndex] + sampleIndex) = (outputValues[channelIndex] + values[targetOutputFeedbackIndex] + channelInput[channelIndex] * state.DryGain);
-                    }
-                }
-
-                if (isMono)
-                {
-                    *((float*)outputBuffers[0] + sampleIndex) += values[1];
-                }
-
-                if (isSurround)
-                {
-                    *((float*)outputBuffers[4] + sampleIndex) += (outputValues[4] + state.FrontCenterDelayLine.Update((values[2] - values[3]) * 0.5f) + channelInput[4] * state.DryGain);
-                }
-            }
-        }
-
-        public void ProcessReverb3d(CommandList context, ref Reverb3dState state)
-        {
-            Debug.Assert(Parameter.IsChannelCountValid());
-
-            if (IsEffectEnabled && Parameter.IsChannelCountValid())
-            {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
-                    outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
-                }
-
-                switch (Parameter.ChannelCount)
-                {
-                    case 1:
-                        ProcessReverb3dMono(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 2:
-                        ProcessReverb3dStereo(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 4:
-                        ProcessReverb3dQuadraphonic(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 6:
-                        ProcessReverb3dSurround(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    default:
-                        throw new NotImplementedException(Parameter.ChannelCount.ToString());
-                }
-            }
-            else
-            {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    if (InputBufferIndices[i] != OutputBufferIndices[i])
-                    {
-                        context.CopyBuffer(OutputBufferIndices[i], InputBufferIndices[i]);
-                    }
-                }
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ref Reverb3dState state = ref State.Span[0];
-
-            if (IsEffectEnabled)
-            {
-                if (Parameter.ParameterStatus == UsageState.Invalid)
-                {
-                    state = new Reverb3dState(ref _parameter, WorkBuffer);
-                }
-                else if (Parameter.ParameterStatus == UsageState.New)
-                {
-                    state.UpdateParameter(ref _parameter);
-                }
-            }
-
-            ProcessReverb3d(context, ref state);
-        }
-    }
-}

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

@@ -1,279 +0,0 @@
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class ReverbCommand : ICommand
-    {
-        private static readonly int[] OutputEarlyIndicesTableMono = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableMono = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-        private static readonly int[] OutputIndicesTableMono = new int[4] { 0, 0, 0, 0 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableMono = new int[4] { 0, 1, 2, 3 };
-
-        private static readonly int[] OutputEarlyIndicesTableStereo = new int[10] { 0, 0, 1, 1, 0, 1, 0, 0, 1, 1 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableStereo = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-        private static readonly int[] OutputIndicesTableStereo = new int[4] { 0, 0, 1, 1 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableStereo = new int[4] { 2, 0, 3, 1 };
-
-        private static readonly int[] OutputEarlyIndicesTableQuadraphonic = new int[10] { 0, 0, 1, 1, 0, 1, 2, 2, 3, 3 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableQuadraphonic = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-        private static readonly int[] OutputIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
-
-        private static readonly int[] OutputEarlyIndicesTableSurround = new int[20] { 0, 5, 0, 5, 1, 5, 1, 5, 4, 5, 4, 5, 2, 5, 2, 5, 3, 5, 3, 5 };
-        private static readonly int[] TargetEarlyDelayLineIndicesTableSurround = new int[20] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9 };
-        private static readonly int[] OutputIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, 4, 5 };
-        private static readonly int[] TargetOutputFeedbackIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, -1, 3 };
-
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.Reverb;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public ReverbParameter Parameter => _parameter;
-        public Memory<ReverbState> State { get; }
-        public ulong WorkBuffer { get; }
-        public ushort[] OutputBufferIndices { get; }
-        public ushort[] InputBufferIndices { get; }
-        public bool IsLongSizePreDelaySupported { get; }
-
-        public bool IsEffectEnabled { get; }
-
-        private ReverbParameter _parameter;
-
-        private const int FixedPointPrecision = 14;
-
-        public ReverbCommand(uint bufferOffset, ReverbParameter parameter, Memory<ReverbState> state, bool isEnabled, ulong workBuffer, int nodeId, bool isLongSizePreDelaySupported, bool newEffectChannelMappingSupported)
-        {
-            Enabled = true;
-            IsEffectEnabled = isEnabled;
-            NodeId = nodeId;
-            _parameter = parameter;
-            State = state;
-            WorkBuffer = workBuffer;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-
-            for (int i = 0; i < Parameter.ChannelCount; i++)
-            {
-                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
-            }
-
-            IsLongSizePreDelaySupported = isLongSizePreDelaySupported;
-
-            // NOTE: We do the opposite as Nintendo here for now to restore previous behaviour
-            // TODO: Update reverb processing and remove this to use RemapLegacyChannelEffectMappingToChannelResourceMapping.
-            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, InputBufferIndices);
-            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, OutputBufferIndices);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbMono(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            ProcessReverbGeneric(ref state,
-                     outputBuffers,
-                     inputBuffers,
-                     sampleCount,
-                     OutputEarlyIndicesTableMono,
-                     TargetEarlyDelayLineIndicesTableMono,
-                     TargetOutputFeedbackIndicesTableMono,
-                     OutputIndicesTableMono);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbStereo(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            ProcessReverbGeneric(ref state,
-                     outputBuffers,
-                     inputBuffers,
-                     sampleCount,
-                     OutputEarlyIndicesTableStereo,
-                     TargetEarlyDelayLineIndicesTableStereo,
-                     TargetOutputFeedbackIndicesTableStereo,
-                     OutputIndicesTableStereo);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbQuadraphonic(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            ProcessReverbGeneric(ref state,
-                     outputBuffers,
-                     inputBuffers,
-                     sampleCount,
-                     OutputEarlyIndicesTableQuadraphonic,
-                     TargetEarlyDelayLineIndicesTableQuadraphonic,
-                     TargetOutputFeedbackIndicesTableQuadraphonic,
-                     OutputIndicesTableQuadraphonic);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessReverbSurround(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
-        {
-            ProcessReverbGeneric(ref state,
-                     outputBuffers,
-                     inputBuffers,
-                     sampleCount,
-                     OutputEarlyIndicesTableSurround,
-                     TargetEarlyDelayLineIndicesTableSurround,
-                     TargetOutputFeedbackIndicesTableSurround,
-                     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)
-        {
-            bool isSurround = Parameter.ChannelCount == 6;
-
-            float reverbGain = FixedPointHelper.ToFloat(Parameter.ReverbGain, FixedPointPrecision);
-            float lateGain = FixedPointHelper.ToFloat(Parameter.LateGain, FixedPointPrecision);
-            float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
-            float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
-
-            Span<float> outputValues = stackalloc float[Constants.ChannelCountMax];
-            Span<float> feedbackValues = stackalloc float[4];
-            Span<float> feedbackOutputValues = stackalloc float[4];
-            Span<float> channelInput = stackalloc float[Parameter.ChannelCount];
-
-            for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
-            {
-                outputValues.Fill(0);
-
-                for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
-                {
-                    int earlyDelayIndex = targetEarlyDelayLineIndicesTable[i];
-                    int outputIndex = outputEarlyIndicesTable[i];
-
-                    float tapOutput = state.PreDelayLine.TapUnsafe(state.EarlyDelayTime[earlyDelayIndex], 0);
-
-                    outputValues[outputIndex] += tapOutput * state.EarlyGain[earlyDelayIndex];
-                }
-
-                if (isSurround)
-                {
-                    outputValues[5] *= 0.2f;
-                }
-
-                float targetPreDelayValue = 0;
-
-                for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
-                {
-                    channelInput[channelIndex] = *((float*)inputBuffers[channelIndex] + sampleIndex) * 64;
-                    targetPreDelayValue += channelInput[channelIndex] * reverbGain;
-                }
-
-                state.PreDelayLine.Update(targetPreDelayValue);
-
-                float lateValue = state.PreDelayLine.Tap(state.PreDelayLineDelayTime) * lateGain;
-
-                for (int i = 0; i < state.FdnDelayLines.Length; i++)
-                {
-                    feedbackOutputValues[i] = state.FdnDelayLines[i].Read() * state.HighFrequencyDecayDirectGain[i] + state.PreviousFeedbackOutput[i] * state.HighFrequencyDecayPreviousGain[i];
-                    state.PreviousFeedbackOutput[i] = feedbackOutputValues[i];
-                }
-
-                feedbackValues[0] = feedbackOutputValues[2] + feedbackOutputValues[1];
-                feedbackValues[1] = -feedbackOutputValues[0] - feedbackOutputValues[3];
-                feedbackValues[2] = feedbackOutputValues[0] - feedbackOutputValues[3];
-                feedbackValues[3] = feedbackOutputValues[1] - feedbackOutputValues[2];
-
-                for (int i = 0; i < state.FdnDelayLines.Length; i++)
-                {
-                    feedbackOutputValues[i] = state.DecayDelays[i].Update(feedbackValues[i] + lateValue);
-                    state.FdnDelayLines[i].Update(feedbackOutputValues[i]);
-                }
-
-                for (int i = 0; i < targetOutputFeedbackIndicesTable.Length; i++)
-                {
-                    int targetOutputFeedbackIndex = targetOutputFeedbackIndicesTable[i];
-                    int outputIndex = outputIndicesTable[i];
-
-                    if (targetOutputFeedbackIndex >= 0)
-                    {
-                        outputValues[outputIndex] += feedbackOutputValues[targetOutputFeedbackIndex];
-                    }
-                }
-
-                if (isSurround)
-                {
-                    outputValues[4] += state.FrontCenterDelayLine.Update((feedbackOutputValues[2] - feedbackOutputValues[3]) * 0.5f);
-                }
-
-                for (int channelIndex = 0; channelIndex < Parameter.ChannelCount; channelIndex++)
-                {
-                    *((float*)outputBuffers[channelIndex] + sampleIndex) = (outputValues[channelIndex] * outGain + channelInput[channelIndex] * dryGain) / 64;
-                }
-            }
-        }
-
-        private void ProcessReverb(CommandList context, ref ReverbState state)
-        {
-            Debug.Assert(Parameter.IsChannelCountValid());
-
-            if (IsEffectEnabled && Parameter.IsChannelCountValid())
-            {
-                Span<IntPtr> inputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-                Span<IntPtr> outputBuffers = stackalloc IntPtr[Parameter.ChannelCount];
-
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    inputBuffers[i] = context.GetBufferPointer(InputBufferIndices[i]);
-                    outputBuffers[i] = context.GetBufferPointer(OutputBufferIndices[i]);
-                }
-
-                switch (Parameter.ChannelCount)
-                {
-                    case 1:
-                        ProcessReverbMono(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 2:
-                        ProcessReverbStereo(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 4:
-                        ProcessReverbQuadraphonic(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    case 6:
-                        ProcessReverbSurround(ref state, outputBuffers, inputBuffers, context.SampleCount);
-                        break;
-                    default:
-                        throw new NotImplementedException(Parameter.ChannelCount.ToString());
-                }
-            }
-            else
-            {
-                for (int i = 0; i < Parameter.ChannelCount; i++)
-                {
-                    if (InputBufferIndices[i] != OutputBufferIndices[i])
-                    {
-                        context.CopyBuffer(OutputBufferIndices[i], InputBufferIndices[i]);
-                    }
-                }
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ref ReverbState state = ref State.Span[0];
-
-            if (IsEffectEnabled)
-            {
-                if (Parameter.Status == Server.Effect.UsageState.Invalid)
-                {
-                    state = new ReverbState(ref _parameter, WorkBuffer, IsLongSizePreDelaySupported);
-                }
-                else if (Parameter.Status == Server.Effect.UsageState.New)
-                {
-                    state.UpdateParameter(ref _parameter);
-                }
-            }
-
-            ProcessReverb(context, ref state);
-        }
-    }
-}

Ryujinx.Audio/Renderer/Dsp/DataSourceHelper.cs

@@ -1,466 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
-using System.Runtime.Intrinsics.Arm;
-using System.Runtime.Intrinsics.X86;
-using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
-
-namespace Ryujinx.Audio.Renderer.Dsp
-{
-    public static class DataSourceHelper
-    {
-        private const int FixedPointPrecision = 15;
-
-        public struct WaveBufferInformation
-        {
-            public uint SourceSampleRate;
-            public float Pitch;
-            public ulong ExtraParameter;
-            public ulong ExtraParameterSize;
-            public int ChannelIndex;
-            public int ChannelCount;
-            public DecodingBehaviour DecodingBehaviour;
-            public SampleRateConversionQuality SrcQuality;
-            public SampleFormat SampleFormat;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int GetPitchLimitBySrcQuality(SampleRateConversionQuality quality)
-        {
-            return quality switch
-            {
-                SampleRateConversionQuality.Default or SampleRateConversionQuality.Low => 4,
-                SampleRateConversionQuality.High => 8,
-                _ => throw new ArgumentException(quality.ToString()),
-            };
-        }
-
-        public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceUpdateState voiceState, uint targetSampleRate, int sampleCount)
-        {
-            const int tempBufferSize = 0x3F00;
-
-            Span<short> tempBuffer = stackalloc short[tempBufferSize];
-
-            float sampleRateRatio = (float)info.SourceSampleRate / targetSampleRate * info.Pitch;
-
-            float fraction = voiceState.Fraction;
-            int waveBufferIndex = (int)voiceState.WaveBufferIndex;
-            ulong playedSampleCount = voiceState.PlayedSampleCount;
-            int offset = voiceState.Offset;
-            uint waveBufferConsumed = voiceState.WaveBufferConsumed;
-
-            int pitchMaxLength = GetPitchLimitBySrcQuality(info.SrcQuality);
-
-            int totalNeededSize = (int)MathF.Truncate(fraction + sampleRateRatio * sampleCount);
-
-            if (totalNeededSize + pitchMaxLength <= tempBufferSize && totalNeededSize >= 0)
-            {
-                int sourceSampleCountToProcess = sampleCount;
-
-                int maxSampleCountPerIteration = Math.Min((int)MathF.Truncate((tempBufferSize - fraction) / sampleRateRatio), sampleCount);
-
-                bool isStarving = false;
-
-                int i = 0;
-
-                while (i < sourceSampleCountToProcess)
-                {
-                    int tempBufferIndex = 0;
-
-                    if (!info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
-                    {
-                        voiceState.Pitch.AsSpan().Slice(0, pitchMaxLength).CopyTo(tempBuffer);
-                        tempBufferIndex += pitchMaxLength;
-                    }
-
-                    int sampleCountToProcess = Math.Min(sourceSampleCountToProcess, maxSampleCountPerIteration);
-
-                    int y = 0;
-
-                    int sampleCountToDecode = (int)MathF.Truncate(fraction + sampleRateRatio * sampleCountToProcess);
-
-                    while (y < sampleCountToDecode)
-                    {
-                        if (waveBufferIndex >= Constants.VoiceWaveBufferCount)
-                        {
-                            waveBufferIndex = 0;
-                            playedSampleCount = 0;
-                        }
-
-                        if (!voiceState.IsWaveBufferValid[waveBufferIndex])
-                        {
-                            isStarving = true;
-                            break;
-                        }
-
-                        ref WaveBuffer waveBuffer = ref wavebuffers[waveBufferIndex];
-
-                        if (offset == 0 && info.SampleFormat == SampleFormat.Adpcm && waveBuffer.Context != 0)
-                        {
-                            voiceState.LoopContext = memoryManager.Read<AdpcmLoopContext>(waveBuffer.Context);
-                        }
-
-                        Span<short> tempSpan = tempBuffer.Slice(tempBufferIndex + y);
-
-                        int decodedSampleCount = -1;
-
-                        int targetSampleStartOffset;
-                        int targetSampleEndOffset;
-
-                        if (voiceState.LoopCount > 0 && waveBuffer.LoopStartSampleOffset != 0 && waveBuffer.LoopEndSampleOffset != 0 && waveBuffer.LoopStartSampleOffset <= waveBuffer.LoopEndSampleOffset)
-                        {
-                            targetSampleStartOffset = (int)waveBuffer.LoopStartSampleOffset;
-                            targetSampleEndOffset = (int)waveBuffer.LoopEndSampleOffset;
-                        }
-                        else
-                        {
-                            targetSampleStartOffset = (int)waveBuffer.StartSampleOffset;
-                            targetSampleEndOffset = (int)waveBuffer.EndSampleOffset;
-                        }
-
-                        int targetWaveBufferSampleCount = targetSampleEndOffset - targetSampleStartOffset;
-
-                        switch (info.SampleFormat)
-                        {
-                            case SampleFormat.Adpcm:
-                                ReadOnlySpan<byte> waveBufferAdpcm = ReadOnlySpan<byte>.Empty;
-
-                                if (waveBuffer.Buffer != 0 && waveBuffer.BufferSize != 0)
-                                {
-                                    // TODO: we are possibly copying a lot of unneeded data here, we should only take what we need.
-                                    waveBufferAdpcm = memoryManager.GetSpan(waveBuffer.Buffer, (int)waveBuffer.BufferSize);
-                                }
-
-                                ReadOnlySpan<short> coefficients = MemoryMarshal.Cast<byte, short>(memoryManager.GetSpan(info.ExtraParameter, (int)info.ExtraParameterSize));
-                                decodedSampleCount = AdpcmHelper.Decode(tempSpan, waveBufferAdpcm, targetSampleStartOffset, targetSampleEndOffset, offset, sampleCountToDecode - y, coefficients, ref voiceState.LoopContext);
-                                break;
-                            case SampleFormat.PcmInt16:
-                                ReadOnlySpan<short> waveBufferPcm16 = ReadOnlySpan<short>.Empty;
-
-                                if (waveBuffer.Buffer != 0 && waveBuffer.BufferSize != 0)
-                                {
-                                    ulong bufferOffset = waveBuffer.Buffer + PcmHelper.GetBufferOffset<short>(targetSampleStartOffset, offset, info.ChannelCount);
-                                    int bufferSize = PcmHelper.GetBufferSize<short>(targetSampleStartOffset, targetSampleEndOffset, offset, sampleCountToDecode - y) * info.ChannelCount;
-
-                                    waveBufferPcm16 = MemoryMarshal.Cast<byte, short>(memoryManager.GetSpan(bufferOffset, bufferSize));
-                                }
-
-                                decodedSampleCount = PcmHelper.Decode(tempSpan, waveBufferPcm16, targetSampleStartOffset, targetSampleEndOffset, info.ChannelIndex, info.ChannelCount);
-                                break;
-                            case SampleFormat.PcmFloat:
-                                ReadOnlySpan<float> waveBufferPcmFloat = ReadOnlySpan<float>.Empty;
-
-                                if (waveBuffer.Buffer != 0 && waveBuffer.BufferSize != 0)
-                                {
-                                    ulong bufferOffset = waveBuffer.Buffer + PcmHelper.GetBufferOffset<float>(targetSampleStartOffset, offset, info.ChannelCount);
-                                    int bufferSize = PcmHelper.GetBufferSize<float>(targetSampleStartOffset, targetSampleEndOffset, offset, sampleCountToDecode - y) * info.ChannelCount;
-
-                                    waveBufferPcmFloat = MemoryMarshal.Cast<byte, float>(memoryManager.GetSpan(bufferOffset, bufferSize));
-                                }
-
-                                decodedSampleCount = PcmHelper.Decode(tempSpan, waveBufferPcmFloat, targetSampleStartOffset, targetSampleEndOffset, info.ChannelIndex, info.ChannelCount);
-                                break;
-                            default:
-                                Logger.Error?.Print(LogClass.AudioRenderer, $"Unsupported sample format " + info.SampleFormat);
-                                break;
-                        }
-
-                        Debug.Assert(decodedSampleCount <= sampleCountToDecode);
-
-                        if (decodedSampleCount < 0)
-                        {
-                            Logger.Warning?.Print(LogClass.AudioRenderer, "Decoding failed, skipping WaveBuffer");
-
-                            voiceState.MarkEndOfBufferWaveBufferProcessing(ref waveBuffer, ref waveBufferIndex, ref waveBufferConsumed, ref playedSampleCount);
-                            decodedSampleCount = 0;
-                        }
-
-                        y += decodedSampleCount;
-                        offset += decodedSampleCount;
-                        playedSampleCount += (uint)decodedSampleCount;
-
-                        if (offset >= targetWaveBufferSampleCount || decodedSampleCount == 0)
-                        {
-                            offset = 0;
-
-                            if (waveBuffer.Looping)
-                            {
-                                voiceState.LoopCount++;
-
-                                if (waveBuffer.LoopCount >= 0)
-                                {
-                                    if (decodedSampleCount == 0 || voiceState.LoopCount > waveBuffer.LoopCount)
-                                    {
-                                        voiceState.MarkEndOfBufferWaveBufferProcessing(ref waveBuffer, ref waveBufferIndex, ref waveBufferConsumed, ref playedSampleCount);
-                                    }
-                                }
-
-                                if (decodedSampleCount == 0)
-                                {
-                                    isStarving = true;
-                                    break;
-                                }
-
-                                if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.PlayedSampleCountResetWhenLooping))
-                                {
-                                    playedSampleCount = 0;
-                                }
-                            }
-                            else
-                            {
-                                voiceState.MarkEndOfBufferWaveBufferProcessing(ref waveBuffer, ref waveBufferIndex, ref waveBufferConsumed, ref playedSampleCount);
-                            }
-                        }
-                    }
-
-                    Span<int> outputSpanInt = MemoryMarshal.Cast<float, int>(outputBuffer.Slice(i));
-
-                    if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
-                    {
-                        for (int j = 0; j < y; j++)
-                        {
-                            outputBuffer[j] = tempBuffer[j];
-                        }
-                    }
-                    else
-                    {
-                        Span<short> tempSpan = tempBuffer.Slice(tempBufferIndex + y);
-
-                        tempSpan.Slice(0, sampleCountToDecode - y).Fill(0);
-
-                        ToFloat(outputBuffer, outputSpanInt, sampleCountToProcess);
-
-                        ResamplerHelper.Resample(outputBuffer, tempBuffer, sampleRateRatio, ref fraction, sampleCountToProcess, info.SrcQuality, y != sourceSampleCountToProcess || info.Pitch != 1.0f);
-
-                        tempBuffer.Slice(sampleCountToDecode, pitchMaxLength).CopyTo(voiceState.Pitch.AsSpan());
-                    }
-
-                    i += sampleCountToProcess;
-                }
-
-                Debug.Assert(sourceSampleCountToProcess == i || !isStarving);
-
-                voiceState.WaveBufferConsumed = waveBufferConsumed;
-                voiceState.Offset = offset;
-                voiceState.PlayedSampleCount = playedSampleCount;
-                voiceState.WaveBufferIndex = (uint)waveBufferIndex;
-                voiceState.Fraction = fraction;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void ToFloatAvx(Span<float> output, ReadOnlySpan<int> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector256<int>> inputVec = MemoryMarshal.Cast<int, Vector256<int>>(input);
-            Span<Vector256<float>> outputVec = MemoryMarshal.Cast<float, Vector256<float>>(output);
-
-            int sisdStart = inputVec.Length * 8;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = Avx.ConvertToVector256Single(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void ToFloatSse2(Span<float> output, ReadOnlySpan<int> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector128<int>> inputVec = MemoryMarshal.Cast<int, Vector128<int>>(input);
-            Span<Vector128<float>> outputVec = MemoryMarshal.Cast<float, Vector128<float>>(output);
-
-            int sisdStart = inputVec.Length * 4;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = Sse2.ConvertToVector128Single(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void ToFloatAdvSimd(Span<float> output, ReadOnlySpan<int> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector128<int>> inputVec = MemoryMarshal.Cast<int, Vector128<int>>(input);
-            Span<Vector128<float>> outputVec = MemoryMarshal.Cast<float, Vector128<float>>(output);
-
-            int sisdStart = inputVec.Length * 4;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = AdvSimd.ConvertToSingle(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToFloatSlow(Span<float> output, ReadOnlySpan<int> input, int sampleCount)
-        {
-            for (int i = 0; i < sampleCount; i++)
-            {
-                output[i] = input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToFloat(Span<float> output, ReadOnlySpan<int> input, int sampleCount)
-        {
-            if (Avx.IsSupported)
-            {
-                ToFloatAvx(output, input, sampleCount);
-            }
-            else if (Sse2.IsSupported)
-            {
-                ToFloatSse2(output, input, sampleCount);
-            }
-            else if (AdvSimd.IsSupported)
-            {
-                ToFloatAdvSimd(output, input, sampleCount);
-            }
-            else
-            {
-                ToFloatSlow(output, input, sampleCount);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToIntAvx(Span<int> output, ReadOnlySpan<float> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector256<float>> inputVec = MemoryMarshal.Cast<float, Vector256<float>>(input);
-            Span<Vector256<int>> outputVec = MemoryMarshal.Cast<int, Vector256<int>>(output);
-
-            int sisdStart = inputVec.Length * 8;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = Avx.ConvertToVector256Int32(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = (int)input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToIntSse2(Span<int> output, ReadOnlySpan<float> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector128<float>> inputVec = MemoryMarshal.Cast<float, Vector128<float>>(input);
-            Span<Vector128<int>> outputVec = MemoryMarshal.Cast<int, Vector128<int>>(output);
-
-            int sisdStart = inputVec.Length * 4;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = Sse2.ConvertToVector128Int32(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = (int)input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToIntAdvSimd(Span<int> output, ReadOnlySpan<float> input, int sampleCount)
-        {
-            ReadOnlySpan<Vector128<float>> inputVec = MemoryMarshal.Cast<float, Vector128<float>>(input);
-            Span<Vector128<int>> outputVec = MemoryMarshal.Cast<int, Vector128<int>>(output);
-
-            int sisdStart = inputVec.Length * 4;
-
-            for (int i = 0; i < inputVec.Length; i++)
-            {
-                outputVec[i] = AdvSimd.ConvertToInt32RoundToZero(inputVec[i]);
-            }
-
-            for (int i = sisdStart; i < sampleCount; i++)
-            {
-                output[i] = (int)input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToIntSlow(Span<int> output, ReadOnlySpan<float> input, int sampleCount)
-        {
-            for (int i = 0; i < sampleCount; i++)
-            {
-                output[i] = (int)input[i];
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ToInt(Span<int> output, ReadOnlySpan<float> input, int sampleCount)
-        {
-            if (Avx.IsSupported)
-            {
-                ToIntAvx(output, input, sampleCount);
-            }
-            else if (Sse2.IsSupported)
-            {
-                ToIntSse2(output, input, sampleCount);
-            }
-            else if (AdvSimd.IsSupported)
-            {
-                ToIntAdvSimd(output, input, sampleCount);
-            }
-            else
-            {
-                ToIntSlow(output, input, sampleCount);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void RemapLegacyChannelEffectMappingToChannelResourceMapping(bool isSupported, Span<ushort> bufferIndices)
-        {
-            if (!isSupported && bufferIndices.Length == 6)
-            {
-                ushort backLeft = bufferIndices[2];
-                ushort backRight = bufferIndices[3];
-                ushort frontCenter = bufferIndices[4];
-                ushort lowFrequency = bufferIndices[5];
-
-                bufferIndices[2] = frontCenter;
-                bufferIndices[3] = lowFrequency;
-                bufferIndices[4] = backLeft;
-                bufferIndices[5] = backRight;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void RemapChannelResourceMappingToLegacy(bool isSupported, Span<ushort> bufferIndices)
-        {
-            if (isSupported && bufferIndices.Length == 6)
-            {
-                ushort frontCenter = bufferIndices[2];
-                ushort lowFrequency = bufferIndices[3];
-                ushort backLeft = bufferIndices[4];
-                ushort backRight = bufferIndices[5];
-
-                bufferIndices[2] = backLeft;
-                bufferIndices[3] = backRight;
-                bufferIndices[4] = frontCenter;
-                bufferIndices[5] = lowFrequency;
-            }
-        }
-    }
-}

Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs

@@ -1,67 +0,0 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Audio.Renderer.Server.MemoryPool;
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Server.Effect
-{
-    /// <summary>
-    /// Server state for a compressor effect.
-    /// </summary>
-    public class CompressorEffect : BaseEffect
-    {
-        /// <summary>
-        /// The compressor parameter.
-        /// </summary>
-        public CompressorParameter Parameter;
-
-        /// <summary>
-        /// The compressor state.
-        /// </summary>
-        public Memory<CompressorState> State { get; }
-
-        /// <summary>
-        /// Create a new <see cref="CompressorEffect"/>.
-        /// </summary>
-        public CompressorEffect()
-        {
-            State = new CompressorState[1];
-        }
-
-        public override EffectType TargetEffectType => EffectType.Compressor;
-
-        public override ulong GetWorkBuffer(int index)
-        {
-            return GetSingleBuffer();
-        }
-
-        public override void Update(out BehaviourParameter.ErrorInfo updateErrorInfo, ref EffectInParameterVersion1 parameter, PoolMapper mapper)
-        {
-            // Nintendo doesn't do anything here but we still require updateErrorInfo to be initialised.
-            updateErrorInfo = new BehaviourParameter.ErrorInfo();
-        }
-
-        public override void Update(out BehaviourParameter.ErrorInfo updateErrorInfo, ref EffectInParameterVersion2 parameter, PoolMapper mapper)
-        {
-            Debug.Assert(IsTypeValid(ref parameter));
-
-            UpdateParameterBase(ref parameter);
-
-            Parameter = MemoryMarshal.Cast<byte, CompressorParameter>(parameter.SpecificData)[0];
-            IsEnabled = parameter.IsEnabled;
-
-            updateErrorInfo = new BehaviourParameter.ErrorInfo();
-        }
-
-        public override void UpdateForCommandGeneration()
-        {
-            UpdateUsageStateForCommandGeneration();
-
-            Parameter.Status = UsageState.Enabled;
-        }
-    }
-}

Ryujinx.Audio/Renderer/Server/StateUpdater.cs

@@ -1,636 +0,0 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Audio.Renderer.Parameter.Performance;
-using Ryujinx.Audio.Renderer.Server.Effect;
-using Ryujinx.Audio.Renderer.Server.MemoryPool;
-using Ryujinx.Audio.Renderer.Server.Mix;
-using Ryujinx.Audio.Renderer.Server.Performance;
-using Ryujinx.Audio.Renderer.Server.Sink;
-using Ryujinx.Audio.Renderer.Server.Splitter;
-using Ryujinx.Audio.Renderer.Server.Voice;
-using Ryujinx.Audio.Renderer.Utils;
-using Ryujinx.Common.Logging;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using static Ryujinx.Audio.Renderer.Common.BehaviourParameter;
-
-namespace Ryujinx.Audio.Renderer.Server
-{
-    public class StateUpdater
-    {
-        private readonly ReadOnlyMemory<byte> _inputOrigin;
-        private ReadOnlyMemory<byte> _outputOrigin;
-        private ReadOnlyMemory<byte> _input;
-
-        private Memory<byte> _output;
-        private uint _processHandle;
-        private BehaviourContext _behaviourContext;
-
-        private UpdateDataHeader _inputHeader;
-        private Memory<UpdateDataHeader> _outputHeader;
-
-        private ref UpdateDataHeader OutputHeader => ref _outputHeader.Span[0];
-
-        public StateUpdater(ReadOnlyMemory<byte> input, Memory<byte> output, uint processHandle, BehaviourContext behaviourContext)
-        {
-            _input = input;
-            _inputOrigin = _input;
-            _output = output;
-            _outputOrigin = _output;
-            _processHandle = processHandle;
-            _behaviourContext = behaviourContext;
-
-            _inputHeader = SpanIOHelper.Read<UpdateDataHeader>(ref _input);
-
-            _outputHeader = SpanMemoryManager<UpdateDataHeader>.Cast(_output.Slice(0, Unsafe.SizeOf<UpdateDataHeader>()));
-            OutputHeader.Initialize(_behaviourContext.UserRevision);
-            _output = _output.Slice(Unsafe.SizeOf<UpdateDataHeader>());
-        }
-
-        public ResultCode UpdateBehaviourContext()
-        {
-            BehaviourParameter parameter = SpanIOHelper.Read<BehaviourParameter>(ref _input);
-
-            if (!BehaviourContext.CheckValidRevision(parameter.UserRevision) || parameter.UserRevision != _behaviourContext.UserRevision)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            _behaviourContext.ClearError();
-            _behaviourContext.UpdateFlags(parameter.Flags);
-
-            if (_inputHeader.BehaviourSize != Unsafe.SizeOf<BehaviourParameter>())
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateMemoryPools(Span<MemoryPoolState> memoryPools)
-        {
-            PoolMapper mapper = new PoolMapper(_processHandle, _behaviourContext.IsMemoryPoolForceMappingEnabled());
-
-            if (memoryPools.Length * Unsafe.SizeOf<MemoryPoolInParameter>() != _inputHeader.MemoryPoolsSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            foreach (ref MemoryPoolState memoryPool in memoryPools)
-            {
-                MemoryPoolInParameter parameter = SpanIOHelper.Read<MemoryPoolInParameter>(ref _input);
-
-                ref MemoryPoolOutStatus outStatus = ref SpanIOHelper.GetWriteRef<MemoryPoolOutStatus>(ref _output)[0];
-
-                PoolMapper.UpdateResult updateResult = mapper.Update(ref memoryPool, ref parameter, ref outStatus);
-
-                if (updateResult != PoolMapper.UpdateResult.Success &&
-                    updateResult != PoolMapper.UpdateResult.MapError &&
-                    updateResult != PoolMapper.UpdateResult.UnmapError)
-                {
-                    if (updateResult != PoolMapper.UpdateResult.InvalidParameter)
-                    {
-                        throw new InvalidOperationException($"{updateResult}");
-                    }
-
-                    return ResultCode.InvalidUpdateInfo;
-                }
-            }
-
-            OutputHeader.MemoryPoolsSize = (uint)(Unsafe.SizeOf<MemoryPoolOutStatus>() * memoryPools.Length);
-            OutputHeader.TotalSize += OutputHeader.MemoryPoolsSize;
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateVoiceChannelResources(VoiceContext context)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<VoiceChannelResourceInParameter>() != _inputHeader.VoiceResourcesSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                VoiceChannelResourceInParameter parameter = SpanIOHelper.Read<VoiceChannelResourceInParameter>(ref _input);
-
-                ref VoiceChannelResource resource = ref context.GetChannelResource(i);
-
-                resource.Id = parameter.Id;
-                parameter.Mix.AsSpan().CopyTo(resource.Mix.AsSpan());
-                resource.IsUsed = parameter.IsUsed;
-            }
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateVoices(VoiceContext context, Memory<MemoryPoolState> memoryPools)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter>() != _inputHeader.VoicesSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            ReadOnlySpan<VoiceInParameter> parameters = MemoryMarshal.Cast<byte, VoiceInParameter>(_input.Slice(0, (int)_inputHeader.VoicesSize).Span);
-
-            _input = _input.Slice((int)_inputHeader.VoicesSize);
-
-            PoolMapper mapper = new PoolMapper(_processHandle, memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
-
-            // First make everything not in use.
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                ref VoiceState state = ref context.GetState(i);
-
-                state.InUse = false;
-            }
-
-            // Start processing
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                VoiceInParameter parameter = parameters[i];
-
-                Memory<VoiceUpdateState>[] voiceUpdateStates = new Memory<VoiceUpdateState>[Constants.VoiceChannelCountMax];
-
-                ref VoiceOutStatus outStatus = ref SpanIOHelper.GetWriteRef<VoiceOutStatus>(ref _output)[0];
-
-                if (parameter.InUse)
-                {
-                    ref VoiceState currentVoiceState = ref context.GetState(i);
-
-                    for (int channelResourceIndex = 0; channelResourceIndex < parameter.ChannelCount; channelResourceIndex++)
-                    {
-                        int channelId = parameter.ChannelResourceIds[channelResourceIndex];
-
-                        Debug.Assert(channelId >= 0 && channelId < context.GetCount());
-
-                        voiceUpdateStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
-                    }
-
-                    if (parameter.IsNew)
-                    {
-                        currentVoiceState.Initialize();
-                    }
-
-                    currentVoiceState.UpdateParameters(out ErrorInfo updateParameterError, ref parameter, ref mapper, ref _behaviourContext);
-
-                    if (updateParameterError.ErrorCode != ResultCode.Success)
-                    {
-                        _behaviourContext.AppendError(ref updateParameterError);
-                    }
-
-                    currentVoiceState.UpdateWaveBuffers(out ErrorInfo[] waveBufferUpdateErrorInfos, ref parameter, voiceUpdateStates, ref mapper, ref _behaviourContext);
-
-                    foreach (ref ErrorInfo errorInfo in waveBufferUpdateErrorInfos.AsSpan())
-                    {
-                        if (errorInfo.ErrorCode != ResultCode.Success)
-                        {
-                            _behaviourContext.AppendError(ref errorInfo);
-                        }
-                    }
-
-                    currentVoiceState.WriteOutStatus(ref outStatus, ref parameter, voiceUpdateStates);
-                }
-            }
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.VoicesSize = (uint)(Unsafe.SizeOf<VoiceOutStatus>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.VoicesSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.VoicesSize);
-
-            return ResultCode.Success;
-        }
-
-        private static void ResetEffect<T>(ref BaseEffect effect, ref T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
-        {
-            effect.ForceUnmapBuffers(mapper);
-
-            switch (parameter.Type)
-            {
-                case EffectType.Invalid:
-                    effect = new BaseEffect();
-                    break;
-                case EffectType.BufferMix:
-                    effect = new BufferMixEffect();
-                    break;
-                case EffectType.AuxiliaryBuffer:
-                    effect = new AuxiliaryBufferEffect();
-                    break;
-                case EffectType.Delay:
-                    effect = new DelayEffect();
-                    break;
-                case EffectType.Reverb:
-                    effect = new ReverbEffect();
-                    break;
-                case EffectType.Reverb3d:
-                    effect = new Reverb3dEffect();
-                    break;
-                case EffectType.BiquadFilter:
-                    effect = new BiquadFilterEffect();
-                    break;
-                case EffectType.Limiter:
-                    effect = new LimiterEffect();
-                    break;
-                case EffectType.CaptureBuffer:
-                    effect = new CaptureBufferEffect();
-                    break;
-                case EffectType.Compressor:
-                    effect = new CompressorEffect();
-                    break;
-
-                default:
-                    throw new NotImplementedException($"EffectType {parameter.Type} not implemented!");
-            }
-        }
-
-        public ResultCode UpdateEffects(EffectContext context, bool isAudioRendererActive, Memory<MemoryPoolState> memoryPools)
-        {
-            if (_behaviourContext.IsEffectInfoVersion2Supported())
-            {
-                return UpdateEffectsVersion2(context, isAudioRendererActive, memoryPools);
-            }
-            else
-            {
-                return UpdateEffectsVersion1(context, isAudioRendererActive, memoryPools);
-            }
-        }
-
-        public ResultCode UpdateEffectsVersion2(EffectContext context, bool isAudioRendererActive, Memory<MemoryPoolState> memoryPools)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<EffectInParameterVersion2>() != _inputHeader.EffectsSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            ReadOnlySpan<EffectInParameterVersion2> parameters = MemoryMarshal.Cast<byte, EffectInParameterVersion2>(_input.Slice(0, (int)_inputHeader.EffectsSize).Span);
-
-            _input = _input.Slice((int)_inputHeader.EffectsSize);
-
-            PoolMapper mapper = new PoolMapper(_processHandle, memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
-
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                EffectInParameterVersion2 parameter = parameters[i];
-
-                ref EffectOutStatusVersion2 outStatus = ref SpanIOHelper.GetWriteRef<EffectOutStatusVersion2>(ref _output)[0];
-
-                ref BaseEffect effect = ref context.GetEffect(i);
-
-                if (!effect.IsTypeValid(ref parameter))
-                {
-                    ResetEffect(ref effect, ref parameter, mapper);
-                }
-
-                effect.Update(out ErrorInfo updateErrorInfo, ref parameter, mapper);
-
-                if (updateErrorInfo.ErrorCode != ResultCode.Success)
-                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
-                }
-
-                effect.StoreStatus(ref outStatus, isAudioRendererActive);
-
-                if (parameter.IsNew)
-                {
-                    effect.InitializeResultState(ref context.GetDspState(i));
-                    effect.InitializeResultState(ref context.GetState(i));
-                }
-
-                effect.UpdateResultState(ref outStatus.ResultState, ref context.GetState(i));
-            }
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.EffectsSize = (uint)(Unsafe.SizeOf<EffectOutStatusVersion2>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.EffectsSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.EffectsSize);
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateEffectsVersion1(EffectContext context, bool isAudioRendererActive, Memory<MemoryPoolState> memoryPools)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<EffectInParameterVersion1>() != _inputHeader.EffectsSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            ReadOnlySpan<EffectInParameterVersion1> parameters = MemoryMarshal.Cast<byte, EffectInParameterVersion1>(_input.Slice(0, (int)_inputHeader.EffectsSize).Span);
-
-            _input = _input.Slice((int)_inputHeader.EffectsSize);
-
-            PoolMapper mapper = new PoolMapper(_processHandle, memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
-
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                EffectInParameterVersion1 parameter = parameters[i];
-
-                ref EffectOutStatusVersion1 outStatus = ref SpanIOHelper.GetWriteRef<EffectOutStatusVersion1>(ref _output)[0];
-
-                ref BaseEffect effect = ref context.GetEffect(i);
-
-                if (!effect.IsTypeValid(ref parameter))
-                {
-                    ResetEffect(ref effect, ref parameter, mapper);
-                }
-
-                effect.Update(out ErrorInfo updateErrorInfo, ref parameter, mapper);
-
-                if (updateErrorInfo.ErrorCode != ResultCode.Success)
-                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
-                }
-
-                effect.StoreStatus(ref outStatus, isAudioRendererActive);
-            }
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.EffectsSize = (uint)(Unsafe.SizeOf<EffectOutStatusVersion1>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.EffectsSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.EffectsSize);
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateSplitter(SplitterContext context)
-        {
-            if (context.Update(_input.Span, out int consumedSize))
-            {
-                _input = _input.Slice(consumedSize);
-
-                return ResultCode.Success;
-            }
-            else
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-        }
-
-        private bool CheckMixParametersValidity(MixContext mixContext, uint mixBufferCount, uint inputMixCount, ReadOnlySpan<MixParameter> parameters)
-        {
-            uint maxMixStateCount = mixContext.GetCount();
-            uint totalRequiredMixBufferCount = 0;
-
-            for (int i = 0; i < inputMixCount; i++)
-            {
-                if (parameters[i].IsUsed)
-                {
-                    if (parameters[i].DestinationMixId != Constants.UnusedMixId &&
-                        parameters[i].DestinationMixId > maxMixStateCount &&
-                        parameters[i].MixId != Constants.FinalMixId)
-                    {
-                        return true;
-                    }
-
-                    totalRequiredMixBufferCount += parameters[i].BufferCount;
-                }
-            }
-
-            return totalRequiredMixBufferCount > mixBufferCount;
-        }
-
-        public ResultCode UpdateMixes(MixContext mixContext, uint mixBufferCount, EffectContext effectContext, SplitterContext splitterContext)
-        {
-            uint mixCount;
-            uint inputMixSize;
-            uint inputSize = 0;
-
-            if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
-            {
-                MixInParameterDirtyOnlyUpdate parameter = MemoryMarshal.Cast<byte, MixInParameterDirtyOnlyUpdate>(_input.Span)[0];
-
-                mixCount = parameter.MixCount;
-
-                inputSize += (uint)Unsafe.SizeOf<MixInParameterDirtyOnlyUpdate>();
-            }
-            else
-            {
-                mixCount = mixContext.GetCount();
-            }
-
-            inputMixSize = mixCount * (uint)Unsafe.SizeOf<MixParameter>();
-
-            inputSize += inputMixSize;
-
-            if (inputSize != _inputHeader.MixesSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
-            {
-                _input = _input.Slice(Unsafe.SizeOf<MixInParameterDirtyOnlyUpdate>());
-            }
-
-            ReadOnlySpan<MixParameter> parameters = MemoryMarshal.Cast<byte, MixParameter>(_input.Span.Slice(0, (int)inputMixSize));
-
-            _input = _input.Slice((int)inputMixSize);
-
-            if (CheckMixParametersValidity(mixContext, mixBufferCount, mixCount, parameters))
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            bool isMixContextDirty = false;
-
-            for (int i = 0; i < parameters.Length; i++)
-            {
-                MixParameter parameter = parameters[i];
-
-                int mixId = i;
-
-                if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
-                {
-                    mixId = parameter.MixId;
-                }
-
-                ref MixState mix = ref mixContext.GetState(mixId);
-
-                if (parameter.IsUsed != mix.IsUsed)
-                {
-                    mix.IsUsed = parameter.IsUsed;
-
-                    if (parameter.IsUsed)
-                    {
-                        mix.ClearEffectProcessingOrder();
-                    }
-
-                    isMixContextDirty = true;
-                }
-
-                if (mix.IsUsed)
-                {
-                    isMixContextDirty |= mix.Update(mixContext.EdgeMatrix, ref parameter, effectContext, splitterContext, _behaviourContext);
-                }
-            }
-
-            if (isMixContextDirty)
-            {
-                if (_behaviourContext.IsSplitterSupported() && splitterContext.UsingSplitter())
-                {
-                    if (!mixContext.Sort(splitterContext))
-                    {
-                        return ResultCode.InvalidMixSorting;
-                    }
-                }
-                else
-                {
-                    mixContext.Sort();
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        private static void ResetSink(ref BaseSink sink, ref SinkInParameter parameter)
-        {
-            sink.CleanUp();
-
-            switch (parameter.Type)
-            {
-                case SinkType.Invalid:
-                    sink = new BaseSink();
-                    break;
-                case SinkType.CircularBuffer:
-                    sink = new CircularBufferSink();
-                    break;
-                case SinkType.Device:
-                    sink = new DeviceSink();
-                    break;
-                default:
-                    throw new NotImplementedException($"SinkType {parameter.Type} not implemented!");
-            }
-        }
-
-        public ResultCode UpdateSinks(SinkContext context, Memory<MemoryPoolState> memoryPools)
-        {
-            PoolMapper mapper = new PoolMapper(_processHandle, memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
-
-            if (context.GetCount() * Unsafe.SizeOf<SinkInParameter>() != _inputHeader.SinksSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            ReadOnlySpan<SinkInParameter> parameters = MemoryMarshal.Cast<byte, SinkInParameter>(_input.Slice(0, (int)_inputHeader.SinksSize).Span);
-
-            _input = _input.Slice((int)_inputHeader.SinksSize);
-
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                SinkInParameter parameter = parameters[i];
-                ref SinkOutStatus outStatus = ref SpanIOHelper.GetWriteRef<SinkOutStatus>(ref _output)[0];
-                ref BaseSink sink = ref context.GetSink(i);
-
-                if (!sink.IsTypeValid(ref parameter))
-                {
-                    ResetSink(ref sink, ref parameter);
-                }
-
-                sink.Update(out ErrorInfo updateErrorInfo, ref parameter, ref outStatus, mapper);
-
-                if (updateErrorInfo.ErrorCode != ResultCode.Success)
-                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
-                }
-            }
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.SinksSize = (uint)(Unsafe.SizeOf<SinkOutStatus>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.SinksSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.SinksSize);
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdatePerformanceBuffer(PerformanceManager manager, Span<byte> performanceOutput)
-        {
-            if (Unsafe.SizeOf<PerformanceInParameter>() != _inputHeader.PerformanceBufferSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            PerformanceInParameter parameter = SpanIOHelper.Read<PerformanceInParameter>(ref _input);
-
-            ref PerformanceOutStatus outStatus = ref SpanIOHelper.GetWriteRef<PerformanceOutStatus>(ref _output)[0];
-
-            if (manager != null)
-            {
-                outStatus.HistorySize = manager.CopyHistories(performanceOutput);
-
-                manager.SetTargetNodeId(parameter.TargetNodeId);
-            }
-            else
-            {
-                outStatus.HistorySize = 0;
-            }
-
-            OutputHeader.PerformanceBufferSize = (uint)Unsafe.SizeOf<PerformanceOutStatus>();
-            OutputHeader.TotalSize += OutputHeader.PerformanceBufferSize;
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateErrorInfo()
-        {
-            ref BehaviourErrorInfoOutStatus outStatus = ref SpanIOHelper.GetWriteRef<BehaviourErrorInfoOutStatus>(ref _output)[0];
-
-            _behaviourContext.CopyErrorInfo(outStatus.ErrorInfos.AsSpan(), out outStatus.ErrorInfosCount);
-
-            OutputHeader.BehaviourSize = (uint)Unsafe.SizeOf<BehaviourErrorInfoOutStatus>();
-            OutputHeader.TotalSize += OutputHeader.BehaviourSize;
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateRendererInfo(ulong elapsedFrameCount)
-        {
-            ref RendererInfoOutStatus outStatus = ref SpanIOHelper.GetWriteRef<RendererInfoOutStatus>(ref _output)[0];
-
-            outStatus.ElapsedFrameCount = elapsedFrameCount;
-
-            OutputHeader.RenderInfoSize = (uint)Unsafe.SizeOf<RendererInfoOutStatus>();
-            OutputHeader.TotalSize += OutputHeader.RenderInfoSize;
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode CheckConsumedSize()
-        {
-            int consumedInputSize = _inputOrigin.Length - _input.Length;
-            int consumedOutputSize = _outputOrigin.Length - _output.Length;
-
-            if (consumedInputSize != _inputHeader.TotalSize)
-            {
-                Logger.Error?.Print(LogClass.AudioRenderer, $"Consumed input size mismatch (got {consumedInputSize} expected {_inputHeader.TotalSize})");
-
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            if (consumedOutputSize != OutputHeader.TotalSize)
-            {
-                Logger.Error?.Print(LogClass.AudioRenderer, $"Consumed output size mismatch (got {consumedOutputSize} expected {OutputHeader.TotalSize})");
-
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            return ResultCode.Success;
-        }
-    }
-}

Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs

@@ -1,699 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Audio.Renderer.Server.MemoryPool;
-using Ryujinx.Common.Memory;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using static Ryujinx.Audio.Renderer.Common.BehaviourParameter;
-using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
-
-namespace Ryujinx.Audio.Renderer.Server.Voice
-{
-    [StructLayout(LayoutKind.Sequential, Pack = Alignment)]
-    public struct VoiceState
-    {
-        public const int Alignment = 0x10;
-
-        /// <summary>
-        /// Set to true if the voice is used.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool InUse;
-
-        /// <summary>
-        /// Set to true if the voice is new.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsNew;
-
-        [MarshalAs(UnmanagedType.I1)]
-        public bool WasPlaying;
-
-        /// <summary>
-        /// The <see cref="SampleFormat"/> of the voice.
-        /// </summary>
-        public SampleFormat SampleFormat;
-
-        /// <summary>
-        /// The sample rate of the voice.
-        /// </summary>
-        public uint SampleRate;
-
-        /// <summary>
-        /// The total channel count used.
-        /// </summary>
-        public uint ChannelsCount;
-
-        /// <summary>
-        /// Id of the voice.
-        /// </summary>
-        public int Id;
-
-        /// <summary>
-        /// Node id of the voice.
-        /// </summary>
-        public int NodeId;
-
-        /// <summary>
-        /// The target mix id of the voice.
-        /// </summary>
-        public int MixId;
-
-        /// <summary>
-        /// The current voice <see cref="Types.PlayState"/>.
-        /// </summary>
-        public Types.PlayState PlayState;
-
-        /// <summary>
-        /// The previous voice <see cref="Types.PlayState"/>.
-        /// </summary>
-        public Types.PlayState PreviousPlayState;
-
-        /// <summary>
-        /// The priority of the voice.
-        /// </summary>
-        public uint Priority;
-
-        /// <summary>
-        /// Target sorting position of the voice. (used to sort voice with the same <see cref="Priority"/>)
-        /// </summary>
-        public uint SortingOrder;
-
-        /// <summary>
-        /// The pitch used on the voice.
-        /// </summary>
-        public float Pitch;
-
-        /// <summary>
-        /// The output volume of the voice.
-        /// </summary>
-        public float Volume;
-
-        /// <summary>
-        /// The previous output volume of the voice.
-        /// </summary>
-        public float PreviousVolume;
-
-        /// <summary>
-        /// Biquad filters to apply to the output of the voice.
-        /// </summary>
-        public Array2<BiquadFilterParameter> BiquadFilters;
-
-        /// <summary>
-        /// Total count of <see cref="WaveBufferInternal"/> of the voice.
-        /// </summary>
-        public uint WaveBuffersCount;
-
-        /// <summary>
-        /// Current playing <see cref="WaveBufferInternal"/> of the voice.
-        /// </summary>
-        public uint WaveBuffersIndex;
-
-        /// <summary>
-        /// Change the behaviour of the voice.
-        /// </summary>
-        /// <remarks>This was added on REV5.</remarks>
-        public DecodingBehaviour DecodingBehaviour;
-
-        /// <summary>
-        /// User state <see cref="AddressInfo"/> required by the data source.
-        /// </summary>
-        /// <remarks>Only used for <see cref="SampleFormat.Adpcm"/> as the GC-ADPCM coefficients.</remarks>
-        public AddressInfo DataSourceStateAddressInfo;
-
-        /// <summary>
-        /// The wavebuffers of this voice.
-        /// </summary>
-        public Array4<WaveBuffer> WaveBuffers;
-
-        /// <summary>
-        /// The channel resource ids associated to the voice.
-        /// </summary>
-        public Array6<int> ChannelResourceIds;
-
-        /// <summary>
-        /// The target splitter id of the voice.
-        /// </summary>
-        public uint SplitterId;
-
-        /// <summary>
-        /// Change the Sample Rate Conversion (SRC) quality of the voice.
-        /// </summary>
-        /// <remarks>This was added on REV8.</remarks>
-        public SampleRateConversionQuality SrcQuality;
-
-        /// <summary>
-        /// If set to true, the voice was dropped.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool VoiceDropFlag;
-
-        /// <summary>
-        /// Set to true if the data source state work buffer wasn't mapped.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool DataSourceStateUnmapped;
-
-        /// <summary>
-        /// Set to true if any of the <see cref="WaveBuffer.BufferAddressInfo"/> work buffer wasn't mapped.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool BufferInfoUnmapped;
-
-        /// <summary>
-        /// The biquad filter initialization state storage.
-        /// </summary>
-        private BiquadFilterNeedInitializationArrayStruct _biquadFilterNeedInitialization;
-
-        /// <summary>
-        /// Flush the amount of wavebuffer specified. This will result in the wavebuffer being skipped and marked played.
-        /// </summary>
-        /// <remarks>This was added on REV5.</remarks>
-        public byte FlushWaveBufferCount;
-
-        [StructLayout(LayoutKind.Sequential, Size = Constants.VoiceBiquadFilterCount)]
-        private struct BiquadFilterNeedInitializationArrayStruct { }
-
-        /// <summary>
-        /// The biquad filter initialization state array.
-        /// </summary>
-        public Span<bool> BiquadFilterNeedInitialization => SpanHelpers.AsSpan<BiquadFilterNeedInitializationArrayStruct, bool>(ref _biquadFilterNeedInitialization);
-
-        /// <summary>
-        /// Initialize the <see cref="VoiceState"/>.
-        /// </summary>
-        public void Initialize()
-        {
-            IsNew = false;
-            VoiceDropFlag = false;
-            DataSourceStateUnmapped = false;
-            BufferInfoUnmapped = false;
-            FlushWaveBufferCount = 0;
-            PlayState = Types.PlayState.Stopped;
-            Priority = Constants.VoiceLowestPriority;
-            Id = 0;
-            NodeId = 0;
-            SampleRate = 0;
-            SampleFormat = SampleFormat.Invalid;
-            ChannelsCount = 0;
-            Pitch = 0.0f;
-            Volume = 0.0f;
-            PreviousVolume = 0.0f;
-            BiquadFilters.AsSpan().Fill(new BiquadFilterParameter());
-            WaveBuffersCount = 0;
-            WaveBuffersIndex = 0;
-            MixId = Constants.UnusedMixId;
-            SplitterId = Constants.UnusedSplitterId;
-            DataSourceStateAddressInfo.Setup(0, 0);
-
-            InitializeWaveBuffers();
-        }
-
-        /// <summary>
-        /// Initialize the <see cref="WaveBuffer"/> in this <see cref="VoiceState"/>.
-        /// </summary>
-        private void InitializeWaveBuffers()
-        {
-            for (int i = 0; i < WaveBuffers.Length; i++)
-            {
-                WaveBuffers[i].StartSampleOffset = 0;
-                WaveBuffers[i].EndSampleOffset = 0;
-                WaveBuffers[i].ShouldLoop = false;
-                WaveBuffers[i].IsEndOfStream = false;
-                WaveBuffers[i].BufferAddressInfo.Setup(0, 0);
-                WaveBuffers[i].ContextAddressInfo.Setup(0, 0);
-                WaveBuffers[i].IsSendToAudioProcessor = true;
-            }
-        }
-
-        /// <summary>
-        /// Check if the voice needs to be skipped.
-        /// </summary>
-        /// <returns>Returns true if the voice needs to be skipped.</returns>
-        public bool ShouldSkip()
-        {
-            return !InUse || WaveBuffersCount == 0 || DataSourceStateUnmapped || BufferInfoUnmapped || VoiceDropFlag;
-        }
-
-        /// <summary>
-        /// Return true if the mix has any destinations.
-        /// </summary>
-        /// <returns>True if the mix has any destinations.</returns>
-        public bool HasAnyDestination()
-        {
-            return MixId != Constants.UnusedMixId || SplitterId != Constants.UnusedSplitterId;
-        }
-
-        /// <summary>
-        /// Indicate if the server voice information needs to be updated.
-        /// </summary>
-        /// <param name="parameter">The user parameter.</param>
-        /// <returns>Return true, if the server voice information needs to be updated.</returns>
-        private bool ShouldUpdateParameters(ref VoiceInParameter parameter)
-        {
-            if (DataSourceStateAddressInfo.CpuAddress == parameter.DataSourceStateAddress)
-            {
-                return DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize;
-            }
-
-            return DataSourceStateAddressInfo.CpuAddress != parameter.DataSourceStateAddress ||
-                   DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize ||
-                   DataSourceStateUnmapped;
-        }
-
-        /// <summary>
-        /// Update the internal state from a user parameter.
-        /// </summary>
-        /// <param name="outErrorInfo">The possible <see cref="ErrorInfo"/> that was generated.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="poolMapper">The mapper to use.</param>
-        /// <param name="behaviourContext">The behaviour context.</param>
-        public void UpdateParameters(out ErrorInfo outErrorInfo, ref VoiceInParameter parameter, ref PoolMapper poolMapper, ref BehaviourContext behaviourContext)
-        {
-            InUse = parameter.InUse;
-            Id = parameter.Id;
-            NodeId = parameter.NodeId;
-
-            UpdatePlayState(parameter.PlayState);
-
-            SrcQuality = parameter.SrcQuality;
-
-            Priority = parameter.Priority;
-            SortingOrder = parameter.SortingOrder;
-            SampleRate = parameter.SampleRate;
-            SampleFormat = parameter.SampleFormat;
-            ChannelsCount = parameter.ChannelCount;
-            Pitch = parameter.Pitch;
-            Volume = parameter.Volume;
-            parameter.BiquadFilters.AsSpan().CopyTo(BiquadFilters.AsSpan());
-            WaveBuffersCount = parameter.WaveBuffersCount;
-            WaveBuffersIndex = parameter.WaveBuffersIndex;
-
-            if (behaviourContext.IsFlushVoiceWaveBuffersSupported())
-            {
-                FlushWaveBufferCount += parameter.FlushWaveBufferCount;
-            }
-
-            MixId = parameter.MixId;
-
-            if (behaviourContext.IsSplitterSupported())
-            {
-                SplitterId = parameter.SplitterId;
-            }
-            else
-            {
-                SplitterId = Constants.UnusedSplitterId;
-            }
-
-            parameter.ChannelResourceIds.AsSpan().CopyTo(ChannelResourceIds.AsSpan());
-
-            DecodingBehaviour behaviour = DecodingBehaviour.Default;
-
-            if (behaviourContext.IsDecodingBehaviourFlagSupported())
-            {
-                behaviour = parameter.DecodingBehaviourFlags;
-            }
-
-            DecodingBehaviour = behaviour;
-
-            if (parameter.ResetVoiceDropFlag)
-            {
-                VoiceDropFlag = false;
-            }
-
-            if (ShouldUpdateParameters(ref parameter))
-            {
-                DataSourceStateUnmapped = !poolMapper.TryAttachBuffer(out outErrorInfo, ref DataSourceStateAddressInfo, parameter.DataSourceStateAddress, parameter.DataSourceStateSize);
-            }
-            else
-            {
-                outErrorInfo = new ErrorInfo();
-            }
-        }
-
-        /// <summary>
-        /// Update the internal play state from user play state.
-        /// </summary>
-        /// <param name="userPlayState">The target user play state.</param>
-        public void UpdatePlayState(PlayState userPlayState)
-        {
-            Types.PlayState oldServerPlayState = PlayState;
-
-            PreviousPlayState = oldServerPlayState;
-
-            Types.PlayState newServerPlayState;
-
-            switch (userPlayState)
-            {
-                case Common.PlayState.Start:
-                    newServerPlayState = Types.PlayState.Started;
-                    break;
-
-                case Common.PlayState.Stop:
-                    if (oldServerPlayState == Types.PlayState.Stopped)
-                    {
-                        return;
-                    }
-
-                    newServerPlayState = Types.PlayState.Stopping;
-                    break;
-
-                case Common.PlayState.Pause:
-                    newServerPlayState = Types.PlayState.Paused;
-                    break;
-
-                default:
-                    throw new NotImplementedException($"Unhandled PlayState.{userPlayState}");
-            }
-
-            PlayState = newServerPlayState;
-        }
-
-        /// <summary>
-        /// Write the status of the voice to the given user output.
-        /// </summary>
-        /// <param name="outStatus">The given user output.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
-        public void WriteOutStatus(ref VoiceOutStatus outStatus, ref VoiceInParameter parameter, Memory<VoiceUpdateState>[] voiceUpdateStates)
-        {
-#if DEBUG
-            // Sanity check in debug mode of the internal state
-            if (!parameter.IsNew && !IsNew)
-            {
-                for (int i = 1; i < ChannelsCount; i++)
-                {
-                    ref VoiceUpdateState stateA = ref voiceUpdateStates[i - 1].Span[0];
-                    ref VoiceUpdateState stateB = ref voiceUpdateStates[i].Span[0];
-
-                    Debug.Assert(stateA.WaveBufferConsumed == stateB.WaveBufferConsumed);
-                    Debug.Assert(stateA.PlayedSampleCount == stateB.PlayedSampleCount);
-                    Debug.Assert(stateA.Offset == stateB.Offset);
-                    Debug.Assert(stateA.WaveBufferIndex == stateB.WaveBufferIndex);
-                    Debug.Assert(stateA.Fraction == stateB.Fraction);
-                    Debug.Assert(stateA.IsWaveBufferValid.SequenceEqual(stateB.IsWaveBufferValid));
-                }
-            }
-#endif
-            if (parameter.IsNew || IsNew)
-            {
-                IsNew = true;
-
-                outStatus.VoiceDropFlag = false;
-                outStatus.PlayedWaveBuffersCount = 0;
-                outStatus.PlayedSampleCount = 0;
-            }
-            else
-            {
-                ref VoiceUpdateState state = ref voiceUpdateStates[0].Span[0];
-
-                outStatus.VoiceDropFlag = VoiceDropFlag;
-                outStatus.PlayedWaveBuffersCount = state.WaveBufferConsumed;
-                outStatus.PlayedSampleCount = state.PlayedSampleCount;
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state of all the <see cref="WaveBuffer"/> of the <see cref="VoiceState"/>.
-        /// </summary>
-        /// <param name="errorInfos">An array of <see cref="ErrorInfo"/> used to report errors when mapping any of the <see cref="WaveBuffer"/>.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
-        /// <param name="mapper">The mapper to use.</param>
-        /// <param name="behaviourContext">The behaviour context.</param>
-        public void UpdateWaveBuffers(out ErrorInfo[] errorInfos, ref VoiceInParameter parameter, Memory<VoiceUpdateState>[] voiceUpdateStates, ref PoolMapper mapper, ref BehaviourContext behaviourContext)
-        {
-            errorInfos = new ErrorInfo[Constants.VoiceWaveBufferCount * 2];
-
-            if (parameter.IsNew)
-            {
-                InitializeWaveBuffers();
-
-                for (int i = 0; i < parameter.ChannelCount; i++)
-                {
-                    voiceUpdateStates[i].Span[0].IsWaveBufferValid.Fill(false);
-                }
-            }
-
-            ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[0].Span[0];
-
-            for (int i = 0; i < Constants.VoiceWaveBufferCount; i++)
-            {
-                UpdateWaveBuffer(errorInfos.AsSpan(i * 2, 2), ref WaveBuffers[i], ref parameter.WaveBuffers[i], parameter.SampleFormat, voiceUpdateState.IsWaveBufferValid[i], ref mapper, ref behaviourContext);
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state of one of the <see cref="WaveBuffer"/> of the <see cref="VoiceState"/>.
-        /// </summary>
-        /// <param name="errorInfos">A <see cref="Span{ErrorInfo}"/> used to report errors when mapping the <see cref="WaveBuffer"/>.</param>
-        /// <param name="waveBuffer">The <see cref="WaveBuffer"/> to update.</param>
-        /// <param name="inputWaveBuffer">The <see cref="WaveBufferInternal"/> from the user input.</param>
-        /// <param name="sampleFormat">The <see cref="SampleFormat"/> from the user input.</param>
-        /// <param name="isValid">If set to true, the server side wavebuffer is considered valid.</param>
-        /// <param name="mapper">The mapper to use.</param>
-        /// <param name="behaviourContext">The behaviour context.</param>
-        private void UpdateWaveBuffer(Span<ErrorInfo> errorInfos, ref WaveBuffer waveBuffer, ref WaveBufferInternal inputWaveBuffer, SampleFormat sampleFormat, bool isValid, ref PoolMapper mapper, ref BehaviourContext behaviourContext)
-        {
-            if (!isValid && waveBuffer.IsSendToAudioProcessor && waveBuffer.BufferAddressInfo.CpuAddress != 0)
-            {
-                mapper.ForceUnmap(ref waveBuffer.BufferAddressInfo);
-                waveBuffer.BufferAddressInfo.Setup(0, 0);
-            }
-
-            if (!inputWaveBuffer.SentToServer || BufferInfoUnmapped)
-            {
-                if (inputWaveBuffer.IsSampleOffsetValid(sampleFormat))
-                {
-                    Debug.Assert(waveBuffer.IsSendToAudioProcessor);
-
-                    waveBuffer.IsSendToAudioProcessor = false;
-                    waveBuffer.StartSampleOffset = inputWaveBuffer.StartSampleOffset;
-                    waveBuffer.EndSampleOffset = inputWaveBuffer.EndSampleOffset;
-                    waveBuffer.ShouldLoop = inputWaveBuffer.ShouldLoop;
-                    waveBuffer.IsEndOfStream = inputWaveBuffer.IsEndOfStream;
-                    waveBuffer.LoopStartSampleOffset = inputWaveBuffer.LoopFirstSampleOffset;
-                    waveBuffer.LoopEndSampleOffset = inputWaveBuffer.LoopLastSampleOffset;
-                    waveBuffer.LoopCount = inputWaveBuffer.LoopCount;
-
-                    BufferInfoUnmapped = !mapper.TryAttachBuffer(out ErrorInfo bufferInfoError, ref waveBuffer.BufferAddressInfo, inputWaveBuffer.Address, inputWaveBuffer.Size);
-
-                    errorInfos[0] = bufferInfoError;
-
-                    if (sampleFormat == SampleFormat.Adpcm && behaviourContext.IsAdpcmLoopContextBugFixed() && inputWaveBuffer.ContextAddress != 0)
-                    {
-                        bool adpcmLoopContextMapped = mapper.TryAttachBuffer(out ErrorInfo adpcmLoopContextInfoError,
-                                                                             ref waveBuffer.ContextAddressInfo,
-                                                                             inputWaveBuffer.ContextAddress,
-                                                                             inputWaveBuffer.ContextSize);
-
-                        errorInfos[1] = adpcmLoopContextInfoError;
-
-                        if (adpcmLoopContextMapped)
-                        {
-                            BufferInfoUnmapped = DataSourceStateUnmapped;
-                        }
-                        else
-                        {
-                            BufferInfoUnmapped = true;
-                        }
-                    }
-                    else
-                    {
-                        waveBuffer.ContextAddressInfo.Setup(0, 0);
-                    }
-                }
-                else
-                {
-                    errorInfos[0].ErrorCode = ResultCode.InvalidAddressInfo;
-                    errorInfos[0].ExtraErrorInfo = inputWaveBuffer.Address;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reset the resources associated to this <see cref="VoiceState"/>.
-        /// </summary>
-        /// <param name="context">The voice context.</param>
-        private void ResetResources(VoiceContext context)
-        {
-            for (int i = 0; i < ChannelsCount; i++)
-            {
-                int channelResourceId = ChannelResourceIds[i];
-
-                ref VoiceChannelResource voiceChannelResource = ref context.GetChannelResource(channelResourceId);
-
-                Debug.Assert(voiceChannelResource.IsUsed);
-
-                Memory<VoiceUpdateState> dspSharedState = context.GetUpdateStateForDsp(channelResourceId);
-
-                MemoryMarshal.Cast<VoiceUpdateState, byte>(dspSharedState.Span).Fill(0);
-
-                voiceChannelResource.UpdateState();
-            }
-        }
-
-        /// <summary>
-        /// Flush a certain amount of <see cref="WaveBuffer"/>.
-        /// </summary>
-        /// <param name="waveBufferCount">The amount of wavebuffer to flush.</param>
-        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
-        /// <param name="channelCount">The channel count from user input.</param>
-        private void FlushWaveBuffers(uint waveBufferCount, Memory<VoiceUpdateState>[] voiceUpdateStates, uint channelCount)
-        {
-            uint waveBufferIndex = WaveBuffersIndex;
-
-            for (int i = 0; i < waveBufferCount; i++)
-            {
-                WaveBuffers[(int)waveBufferIndex].IsSendToAudioProcessor = true;
-
-                for (int j = 0; j < channelCount; j++)
-                {
-                    ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[j].Span[0];
-
-                    voiceUpdateState.WaveBufferIndex = (voiceUpdateState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
-                    voiceUpdateState.WaveBufferConsumed++;
-                    voiceUpdateState.IsWaveBufferValid[(int)waveBufferIndex] = false;
-                }
-
-                waveBufferIndex = (waveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
-            }
-        }
-
-        /// <summary>
-        /// Update the internal parameters for command generation.
-        /// </summary>
-        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
-        /// <returns>Return true if this voice should be played.</returns>
-        public bool UpdateParametersForCommandGeneration(Memory<VoiceUpdateState>[] voiceUpdateStates)
-        {
-            if (FlushWaveBufferCount != 0)
-            {
-                FlushWaveBuffers(FlushWaveBufferCount, voiceUpdateStates, ChannelsCount);
-
-                FlushWaveBufferCount = 0;
-            }
-
-            switch (PlayState)
-            {
-                case Types.PlayState.Started:
-                    for (int i = 0; i < WaveBuffers.Length; i++)
-                    {
-                        ref WaveBuffer wavebuffer = ref WaveBuffers[i];
-
-                        if (!wavebuffer.IsSendToAudioProcessor)
-                        {
-                            for (int y = 0; y < ChannelsCount; y++)
-                            {
-                                Debug.Assert(!voiceUpdateStates[y].Span[0].IsWaveBufferValid[i]);
-
-                                voiceUpdateStates[y].Span[0].IsWaveBufferValid[i] = true;
-                            }
-
-                            wavebuffer.IsSendToAudioProcessor = true;
-                        }
-                    }
-
-                    WasPlaying = false;
-
-                    ref VoiceUpdateState primaryVoiceUpdateState = ref voiceUpdateStates[0].Span[0];
-
-                    for (int i = 0; i < primaryVoiceUpdateState.IsWaveBufferValid.Length; i++)
-                    {
-                        if (primaryVoiceUpdateState.IsWaveBufferValid[i])
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-
-                case Types.PlayState.Stopping:
-                    for (int i = 0; i < WaveBuffers.Length; i++)
-                    {
-                        ref WaveBuffer wavebuffer = ref WaveBuffers[i];
-
-                        wavebuffer.IsSendToAudioProcessor = true;
-
-                        for (int j = 0; j < ChannelsCount; j++)
-                        {
-                            ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[j].Span[0];
-
-                            if (voiceUpdateState.IsWaveBufferValid[i])
-                            {
-                                voiceUpdateState.WaveBufferIndex = (voiceUpdateState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
-                                voiceUpdateState.WaveBufferConsumed++;
-                            }
-
-                            voiceUpdateState.IsWaveBufferValid[i] = false;
-                        }
-                    }
-
-                    for (int i = 0; i < ChannelsCount; i++)
-                    {
-                        ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[i].Span[0];
-
-                        voiceUpdateState.Offset = 0;
-                        voiceUpdateState.PlayedSampleCount = 0;
-                        voiceUpdateState.Pitch.AsSpan().Fill(0);
-                        voiceUpdateState.Fraction = 0;
-                        voiceUpdateState.LoopContext = new Dsp.State.AdpcmLoopContext();
-                    }
-
-                    PlayState = Types.PlayState.Stopped;
-                    WasPlaying = PreviousPlayState == Types.PlayState.Started;
-
-                    return WasPlaying;
-
-                case Types.PlayState.Stopped:
-                case Types.PlayState.Paused:
-                    foreach (ref WaveBuffer wavebuffer in WaveBuffers.AsSpan())
-                    {
-                        wavebuffer.BufferAddressInfo.GetReference(true);
-                        wavebuffer.ContextAddressInfo.GetReference(true);
-                    }
-
-                    if (SampleFormat == SampleFormat.Adpcm)
-                    {
-                        if (DataSourceStateAddressInfo.CpuAddress != 0)
-                        {
-                            DataSourceStateAddressInfo.GetReference(true);
-                        }
-                    }
-
-                    WasPlaying = PreviousPlayState == Types.PlayState.Started;
-
-                    return WasPlaying;
-                default:
-                    throw new NotImplementedException($"{PlayState}");
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state for command generation.
-        /// </summary>
-        /// <param name="context">The voice context.</param>
-        /// <returns>Return true if this voice should be played.</returns>
-        public bool UpdateForCommandGeneration(VoiceContext context)
-        {
-            if (IsNew)
-            {
-                ResetResources(context);
-                PreviousVolume = Volume;
-                IsNew = false;
-            }
-
-            Memory<VoiceUpdateState>[] voiceUpdateStates = new Memory<VoiceUpdateState>[Constants.VoiceChannelCountMax];
-
-            for (int i = 0; i < ChannelsCount; i++)
-            {
-                voiceUpdateStates[i] = context.GetUpdateStateForDsp(ChannelResourceIds[i]);
-            }
-
-            return UpdateParametersForCommandGeneration(voiceUpdateStates);
-        }
-    }
-}

Ryujinx.Ava/Assets/Locales/en_US.json

@@ -1,631 +0,0 @@
-{
-  "Language": "English (US)",
-  "MenuBarFileOpenApplet": "Open Applet",
-  "MenuBarFileOpenAppletOpenMiiAppletToolTip": "Open Mii Editor Applet in Standalone mode",
-  "SettingsTabInputDirectMouseAccess": "Direct Mouse Access",
-  "SettingsTabSystemMemoryManagerMode": "Memory Manager Mode:",
-  "SettingsTabSystemMemoryManagerModeSoftware": "Software",
-  "SettingsTabSystemMemoryManagerModeHost": "Host (fast)",
-  "SettingsTabSystemMemoryManagerModeHostUnchecked": "Host Unchecked (fastest, unsafe)",
-  "SettingsTabSystemUseHypervisor": "Use Hypervisor",
-  "MenuBarFile": "_File",
-  "MenuBarFileOpenFromFile": "_Load Application From File",
-  "MenuBarFileOpenUnpacked": "Load _Unpacked Game",
-  "MenuBarFileOpenEmuFolder": "Open Ryujinx Folder",
-  "MenuBarFileOpenLogsFolder": "Open Logs Folder",
-  "MenuBarFileExit": "_Exit",
-  "MenuBarOptions": "Options",
-  "MenuBarOptionsToggleFullscreen": "Toggle Fullscreen",
-  "MenuBarOptionsStartGamesInFullscreen": "Start Games in Fullscreen Mode",
-  "MenuBarOptionsStopEmulation": "Stop Emulation",
-  "MenuBarOptionsSettings": "_Settings",
-  "MenuBarOptionsManageUserProfiles": "_Manage User Profiles",
-  "MenuBarActions": "_Actions",
-  "MenuBarOptionsSimulateWakeUpMessage": "Simulate Wake-up message",
-  "MenuBarActionsScanAmiibo": "Scan An Amiibo",
-  "MenuBarTools": "_Tools",
-  "MenuBarToolsInstallFirmware": "Install Firmware",
-  "MenuBarFileToolsInstallFirmwareFromFile": "Install a firmware from XCI or ZIP",
-  "MenuBarFileToolsInstallFirmwareFromDirectory": "Install a firmware from a directory",
-  "MenuBarToolsManageFileTypes": "Manage file types",
-  "MenuBarToolsInstallFileTypes": "Install file types",
-  "MenuBarToolsUninstallFileTypes": "Uninstall file types",
-  "MenuBarHelp": "Help",
-  "MenuBarHelpCheckForUpdates": "Check for Updates",
-  "MenuBarHelpAbout": "About",
-  "MenuSearch": "Search...",
-  "GameListHeaderFavorite": "Fav",
-  "GameListHeaderIcon": "Icon",
-  "GameListHeaderApplication": "Name",
-  "GameListHeaderDeveloper": "Developer",
-  "GameListHeaderVersion": "Version",
-  "GameListHeaderTimePlayed": "Play Time",
-  "GameListHeaderLastPlayed": "Last Played",
-  "GameListHeaderFileExtension": "File Ext",
-  "GameListHeaderFileSize": "File Size",
-  "GameListHeaderPath": "Path",
-  "GameListContextMenuOpenUserSaveDirectory": "Open User Save Directory",
-  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Opens the directory which contains Application's User Save",
-  "GameListContextMenuOpenDeviceSaveDirectory": "Open Device Save Directory",
-  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Opens the directory which contains Application's Device Save",
-  "GameListContextMenuOpenBcatSaveDirectory": "Open BCAT Save Directory",
-  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Opens the directory which contains Application's BCAT Save",
-  "GameListContextMenuManageTitleUpdates": "Manage Title Updates",
-  "GameListContextMenuManageTitleUpdatesToolTip": "Opens the Title Update management window",
-  "GameListContextMenuManageDlc": "Manage DLC",
-  "GameListContextMenuManageDlcToolTip": "Opens the DLC management window",
-  "GameListContextMenuOpenModsDirectory": "Open Mods Directory",
-  "GameListContextMenuOpenModsDirectoryToolTip": "Opens the directory which contains Application's Mods",
-  "GameListContextMenuCacheManagement": "Cache Management",
-  "GameListContextMenuCacheManagementPurgePptc": "Queue PPTC Rebuild",
-  "GameListContextMenuCacheManagementPurgePptcToolTip": "Trigger PPTC to rebuild at boot time on the next game launch",
-  "GameListContextMenuCacheManagementPurgeShaderCache": "Purge Shader Cache",
-  "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "Deletes Application's shader cache",
-  "GameListContextMenuCacheManagementOpenPptcDirectory": "Open PPTC Directory",
-  "GameListContextMenuCacheManagementOpenPptcDirectoryToolTip": "Opens the directory which contains Application's PPTC cache",
-  "GameListContextMenuCacheManagementOpenShaderCacheDirectory": "Open Shader Cache Directory",
-  "GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip": "Opens the directory which contains Application's shader cache",
-  "GameListContextMenuExtractData": "Extract Data",
-  "GameListContextMenuExtractDataExeFS": "ExeFS",
-  "GameListContextMenuExtractDataExeFSToolTip": "Extract the ExeFS section from Application's current config (including updates)",
-  "GameListContextMenuExtractDataRomFS": "RomFS",
-  "GameListContextMenuExtractDataRomFSToolTip": "Extract the RomFS section from Application's current config (including updates)",
-  "GameListContextMenuExtractDataLogo": "Logo",
-  "GameListContextMenuExtractDataLogoToolTip": "Extract the Logo section from Application's current config (including updates)",
-  "StatusBarGamesLoaded": "{0}/{1} Games Loaded",
-  "StatusBarSystemVersion": "System Version: {0}",
-  "Settings": "Settings",
-  "SettingsTabGeneral": "User Interface",
-  "SettingsTabGeneralGeneral": "General",
-  "SettingsTabGeneralEnableDiscordRichPresence": "Enable Discord Rich Presence",
-  "SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch",
-  "SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog",
-  "SettingsTabGeneralHideCursorOnIdle": "Hide Cursor on Idle",
-  "SettingsTabGeneralGameDirectories": "Game Directories",
-  "SettingsTabGeneralAdd": "Add",
-  "SettingsTabGeneralRemove": "Remove",
-  "SettingsTabSystem": "System",
-  "SettingsTabSystemCore": "Core",
-  "SettingsTabSystemSystemRegion": "System Region:",
-  "SettingsTabSystemSystemRegionJapan": "Japan",
-  "SettingsTabSystemSystemRegionUSA": "USA",
-  "SettingsTabSystemSystemRegionEurope": "Europe",
-  "SettingsTabSystemSystemRegionAustralia": "Australia",
-  "SettingsTabSystemSystemRegionChina": "China",
-  "SettingsTabSystemSystemRegionKorea": "Korea",
-  "SettingsTabSystemSystemRegionTaiwan": "Taiwan",
-  "SettingsTabSystemSystemLanguage": "System Language:",
-  "SettingsTabSystemSystemLanguageJapanese": "Japanese",
-  "SettingsTabSystemSystemLanguageAmericanEnglish": "American English",
-  "SettingsTabSystemSystemLanguageFrench": "French",
-  "SettingsTabSystemSystemLanguageGerman": "German",
-  "SettingsTabSystemSystemLanguageItalian": "Italian",
-  "SettingsTabSystemSystemLanguageSpanish": "Spanish",
-  "SettingsTabSystemSystemLanguageChinese": "Chinese",
-  "SettingsTabSystemSystemLanguageKorean": "Korean",
-  "SettingsTabSystemSystemLanguageDutch": "Dutch",
-  "SettingsTabSystemSystemLanguagePortuguese": "Portuguese",
-  "SettingsTabSystemSystemLanguageRussian": "Russian",
-  "SettingsTabSystemSystemLanguageTaiwanese": "Taiwanese",
-  "SettingsTabSystemSystemLanguageBritishEnglish": "British English",
-  "SettingsTabSystemSystemLanguageCanadianFrench": "Canadian French",
-  "SettingsTabSystemSystemLanguageLatinAmericanSpanish": "Latin American Spanish",
-  "SettingsTabSystemSystemLanguageSimplifiedChinese": "Simplified Chinese",
-  "SettingsTabSystemSystemLanguageTraditionalChinese": "Traditional Chinese",
-  "SettingsTabSystemSystemTimeZone": "System TimeZone:",
-  "SettingsTabSystemSystemTime": "System Time:",
-  "SettingsTabSystemEnableVsync": "VSync",
-  "SettingsTabSystemEnablePptc": "PPTC (Profiled Persistent Translation Cache)",
-  "SettingsTabSystemEnableFsIntegrityChecks": "FS Integrity Checks",
-  "SettingsTabSystemAudioBackend": "Audio Backend:",
-  "SettingsTabSystemAudioBackendDummy": "Dummy",
-  "SettingsTabSystemAudioBackendOpenAL": "OpenAL",
-  "SettingsTabSystemAudioBackendSoundIO": "SoundIO",
-  "SettingsTabSystemAudioBackendSDL2": "SDL2",
-  "SettingsTabSystemHacks": "Hacks",
-  "SettingsTabSystemHacksNote": "May cause instability",
-  "SettingsTabSystemExpandDramSize": "Use alternative memory layout (Developers)",
-  "SettingsTabSystemIgnoreMissingServices": "Ignore Missing Services",
-  "SettingsTabGraphics": "Graphics",
-  "SettingsTabGraphicsAPI": "Graphics API",
-  "SettingsTabGraphicsEnableShaderCache": "Enable Shader Cache",
-  "SettingsTabGraphicsAnisotropicFiltering": "Anisotropic Filtering:",
-  "SettingsTabGraphicsAnisotropicFilteringAuto": "Auto",
-  "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
-  "SettingsTabGraphicsAnisotropicFiltering4x": "4x",
-  "SettingsTabGraphicsAnisotropicFiltering8x": "8x",
-  "SettingsTabGraphicsAnisotropicFiltering16x": "16x",
-  "SettingsTabGraphicsResolutionScale": "Resolution Scale:",
-  "SettingsTabGraphicsResolutionScaleCustom": "Custom (Not recommended)",
-  "SettingsTabGraphicsResolutionScaleNative": "Native (720p/1080p)",
-  "SettingsTabGraphicsResolutionScale2x": "2x (1440p/2160p)",
-  "SettingsTabGraphicsResolutionScale3x": "3x (2160p/3240p)",
-  "SettingsTabGraphicsResolutionScale4x": "4x (2880p/4320p)",
-  "SettingsTabGraphicsAspectRatio": "Aspect Ratio:",
-  "SettingsTabGraphicsAspectRatio4x3": "4:3",
-  "SettingsTabGraphicsAspectRatio16x9": "16:9",
-  "SettingsTabGraphicsAspectRatio16x10": "16:10",
-  "SettingsTabGraphicsAspectRatio21x9": "21:9",
-  "SettingsTabGraphicsAspectRatio32x9": "32:9",
-  "SettingsTabGraphicsAspectRatioStretch": "Stretch to Fit Window",
-  "SettingsTabGraphicsDeveloperOptions": "Developer Options",
-  "SettingsTabGraphicsShaderDumpPath": "Graphics Shader Dump Path:",
-  "SettingsTabLogging": "Logging",
-  "SettingsTabLoggingLogging": "Logging",
-  "SettingsTabLoggingEnableLoggingToFile": "Enable Logging to File",
-  "SettingsTabLoggingEnableStubLogs": "Enable Stub Logs",
-  "SettingsTabLoggingEnableInfoLogs": "Enable Info Logs",
-  "SettingsTabLoggingEnableWarningLogs": "Enable Warning Logs",
-  "SettingsTabLoggingEnableErrorLogs": "Enable Error Logs",
-  "SettingsTabLoggingEnableTraceLogs": "Enable Trace Logs",
-  "SettingsTabLoggingEnableGuestLogs": "Enable Guest Logs",
-  "SettingsTabLoggingEnableFsAccessLogs": "Enable Fs Access Logs",
-  "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Global Access Log Mode:",
-  "SettingsTabLoggingDeveloperOptions": "Developer Options",
-  "SettingsTabLoggingDeveloperOptionsNote": "WARNING: Will reduce performance",
-  "SettingsTabLoggingGraphicsBackendLogLevel": "Graphics Backend Log Level:",
-  "SettingsTabLoggingGraphicsBackendLogLevelNone": "None",
-  "SettingsTabLoggingGraphicsBackendLogLevelError": "Error",
-  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Slowdowns",
-  "SettingsTabLoggingGraphicsBackendLogLevelAll": "All",
-  "SettingsTabLoggingEnableDebugLogs": "Enable Debug Logs",
-  "SettingsTabInput": "Input",
-  "SettingsTabInputEnableDockedMode": "Docked Mode",
-  "SettingsTabInputDirectKeyboardAccess": "Direct Keyboard Access",
-  "SettingsButtonSave": "Save",
-  "SettingsButtonClose": "Close",
-  "SettingsButtonOk": "OK",
-  "SettingsButtonCancel": "Cancel",
-  "SettingsButtonApply": "Apply",
-  "ControllerSettingsPlayer": "Player",
-  "ControllerSettingsPlayer1": "Player 1",
-  "ControllerSettingsPlayer2": "Player 2",
-  "ControllerSettingsPlayer3": "Player 3",
-  "ControllerSettingsPlayer4": "Player 4",
-  "ControllerSettingsPlayer5": "Player 5",
-  "ControllerSettingsPlayer6": "Player 6",
-  "ControllerSettingsPlayer7": "Player 7",
-  "ControllerSettingsPlayer8": "Player 8",
-  "ControllerSettingsHandheld": "Handheld",
-  "ControllerSettingsInputDevice": "Input Device",
-  "ControllerSettingsRefresh": "Refresh",
-  "ControllerSettingsDeviceDisabled": "Disabled",
-  "ControllerSettingsControllerType": "Controller Type",
-  "ControllerSettingsControllerTypeHandheld": "Handheld",
-  "ControllerSettingsControllerTypeProController": "Pro Controller",
-  "ControllerSettingsControllerTypeJoyConPair": "JoyCon Pair",
-  "ControllerSettingsControllerTypeJoyConLeft": "JoyCon Left",
-  "ControllerSettingsControllerTypeJoyConRight": "JoyCon Right",
-  "ControllerSettingsProfile": "Profile",
-  "ControllerSettingsProfileDefault": "Default",
-  "ControllerSettingsLoad": "Load",
-  "ControllerSettingsAdd": "Add",
-  "ControllerSettingsRemove": "Remove",
-  "ControllerSettingsButtons": "Buttons",
-  "ControllerSettingsButtonA": "A",
-  "ControllerSettingsButtonB": "B",
-  "ControllerSettingsButtonX": "X",
-  "ControllerSettingsButtonY": "Y",
-  "ControllerSettingsButtonPlus": "+",
-  "ControllerSettingsButtonMinus": "-",
-  "ControllerSettingsDPad": "Directional Pad",
-  "ControllerSettingsDPadUp": "Up",
-  "ControllerSettingsDPadDown": "Down",
-  "ControllerSettingsDPadLeft": "Left",
-  "ControllerSettingsDPadRight": "Right",
-  "ControllerSettingsLStick": "Left Stick",
-  "ControllerSettingsLStickButton": "Button",
-  "ControllerSettingsLStickUp": "Up",
-  "ControllerSettingsLStickDown": "Down",
-  "ControllerSettingsLStickLeft": "Left",
-  "ControllerSettingsLStickRight": "Right",
-  "ControllerSettingsLStickStick": "Stick",
-  "ControllerSettingsLStickInvertXAxis": "Invert Stick X",
-  "ControllerSettingsLStickInvertYAxis": "Invert Stick Y",
-  "ControllerSettingsLStickDeadzone": "Deadzone:",
-  "ControllerSettingsRStick": "Right Stick",
-  "ControllerSettingsRStickButton": "Button",
-  "ControllerSettingsRStickUp": "Up",
-  "ControllerSettingsRStickDown": "Down",
-  "ControllerSettingsRStickLeft": "Left",
-  "ControllerSettingsRStickRight": "Right",
-  "ControllerSettingsRStickStick": "Stick",
-  "ControllerSettingsRStickInvertXAxis": "Invert Stick X",
-  "ControllerSettingsRStickInvertYAxis": "Invert Stick Y",
-  "ControllerSettingsRStickDeadzone": "Deadzone:",
-  "ControllerSettingsTriggersLeft": "Triggers Left",
-  "ControllerSettingsTriggersRight": "Triggers Right",
-  "ControllerSettingsTriggersButtonsLeft": "Trigger Buttons Left",
-  "ControllerSettingsTriggersButtonsRight": "Trigger Buttons Right",
-  "ControllerSettingsTriggers": "Triggers",
-  "ControllerSettingsTriggerL": "L",
-  "ControllerSettingsTriggerR": "R",
-  "ControllerSettingsTriggerZL": "ZL",
-  "ControllerSettingsTriggerZR": "ZR",
-  "ControllerSettingsLeftSL": "SL",
-  "ControllerSettingsLeftSR": "SR",
-  "ControllerSettingsRightSL": "SL",
-  "ControllerSettingsRightSR": "SR",
-  "ControllerSettingsExtraButtonsLeft": "Buttons Left",
-  "ControllerSettingsExtraButtonsRight": "Buttons Right",
-  "ControllerSettingsMisc": "Miscellaneous",
-  "ControllerSettingsTriggerThreshold": "Trigger Threshold:",
-  "ControllerSettingsMotion": "Motion",
-  "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Use CemuHook compatible motion",
-  "ControllerSettingsMotionControllerSlot": "Controller Slot:",
-  "ControllerSettingsMotionMirrorInput": "Mirror Input",
-  "ControllerSettingsMotionRightJoyConSlot": "Right JoyCon Slot:",
-  "ControllerSettingsMotionServerHost": "Server Host:",
-  "ControllerSettingsMotionGyroSensitivity": "Gyro Sensitivity:",
-  "ControllerSettingsMotionGyroDeadzone": "Gyro Deadzone:",
-  "ControllerSettingsSave": "Save",
-  "ControllerSettingsClose": "Close",
-  "UserProfilesSelectedUserProfile": "Selected User Profile:",
-  "UserProfilesSaveProfileName": "Save Profile Name",
-  "UserProfilesChangeProfileImage": "Change Profile Image",
-  "UserProfilesAvailableUserProfiles": "Available User Profiles:",
-  "UserProfilesAddNewProfile": "Create Profile",
-  "UserProfilesDelete": "Delete",
-  "UserProfilesClose": "Close",
-  "ProfileNameSelectionWatermark": "Choose a nickname",
-  "ProfileImageSelectionTitle": "Profile Image Selection",
-  "ProfileImageSelectionHeader": "Choose a profile Image",
-  "ProfileImageSelectionNote": "You may import a custom profile image, or select an avatar from system firmware",
-  "ProfileImageSelectionImportImage": "Import Image File",
-  "ProfileImageSelectionSelectAvatar": "Select Firmware Avatar",
-  "InputDialogTitle": "Input Dialog",
-  "InputDialogOk": "OK",
-  "InputDialogCancel": "Cancel",
-  "InputDialogAddNewProfileTitle": "Choose the Profile Name",
-  "InputDialogAddNewProfileHeader": "Please Enter a Profile Name",
-  "InputDialogAddNewProfileSubtext": "(Max Length: {0})",
-  "AvatarChoose": "Choose Avatar",
-  "AvatarSetBackgroundColor": "Set Background Color",
-  "AvatarClose": "Close",
-  "ControllerSettingsLoadProfileToolTip": "Load Profile",
-  "ControllerSettingsAddProfileToolTip": "Add Profile",
-  "ControllerSettingsRemoveProfileToolTip": "Remove Profile",
-  "ControllerSettingsSaveProfileToolTip": "Save Profile",
-  "MenuBarFileToolsTakeScreenshot": "Take Screenshot",
-  "MenuBarFileToolsHideUi": "Hide UI",
-  "GameListContextMenuToggleFavorite": "Toggle Favorite",
-  "GameListContextMenuToggleFavoriteToolTip": "Toggle Favorite status of Game",
-  "SettingsTabGeneralTheme": "Theme",
-  "SettingsTabGeneralThemeCustomTheme": "Custom Theme Path",
-  "SettingsTabGeneralThemeBaseStyle": "Base Style",
-  "SettingsTabGeneralThemeBaseStyleDark": "Dark",
-  "SettingsTabGeneralThemeBaseStyleLight": "Light",
-  "SettingsTabGeneralThemeEnableCustomTheme": "Enable Custom Theme",
-  "ButtonBrowse": "Browse",
-  "ControllerSettingsConfigureGeneral": "Configure",
-  "ControllerSettingsRumble": "Rumble",
-  "ControllerSettingsRumbleStrongMultiplier": "Strong Rumble Multiplier",
-  "ControllerSettingsRumbleWeakMultiplier": "Weak Rumble Multiplier",
-  "DialogMessageSaveNotAvailableMessage": "There is no savedata for {0} [{1:x16}]",
-  "DialogMessageSaveNotAvailableCreateSaveMessage": "Would you like to create savedata for this game?",
-  "DialogConfirmationTitle": "Ryujinx - Confirmation",
-  "DialogUpdaterTitle": "Ryujinx - Updater",
-  "DialogErrorTitle": "Ryujinx - Error",
-  "DialogWarningTitle": "Ryujinx - Warning",
-  "DialogExitTitle": "Ryujinx - Exit",
-  "DialogErrorMessage": "Ryujinx has encountered an error",
-  "DialogExitMessage": "Are you sure you want to close Ryujinx?",
-  "DialogExitSubMessage": "All unsaved data will be lost!",
-  "DialogMessageCreateSaveErrorMessage": "There was an error creating the specified savedata: {0}",
-  "DialogMessageFindSaveErrorMessage": "There was an error finding the specified savedata: {0}",
-  "FolderDialogExtractTitle": "Choose the folder to extract into",
-  "DialogNcaExtractionMessage": "Extracting {0} section from {1}...",
-  "DialogNcaExtractionTitle": "Ryujinx - NCA Section Extractor",
-  "DialogNcaExtractionMainNcaNotFoundErrorMessage": "Extraction failure. The main NCA was not present in the selected file.",
-  "DialogNcaExtractionCheckLogErrorMessage": "Extraction failure. Read the log file for further information.",
-  "DialogNcaExtractionSuccessMessage": "Extraction completed successfully.",
-  "DialogUpdaterConvertFailedMessage": "Failed to convert the current Ryujinx version.",
-  "DialogUpdaterCancelUpdateMessage": "Cancelling Update!",
-  "DialogUpdaterAlreadyOnLatestVersionMessage": "You are already using the most updated version of Ryujinx!",
-  "DialogUpdaterFailedToGetVersionMessage": "An error has occurred when trying to get release information from GitHub Release. This can be caused if a new release is being compiled by GitHub Actions. Try again in a few minutes.",
-  "DialogUpdaterConvertFailedGithubMessage": "Failed to convert the received Ryujinx version from Github Release.",
-  "DialogUpdaterDownloadingMessage": "Downloading Update...",
-  "DialogUpdaterExtractionMessage": "Extracting Update...",
-  "DialogUpdaterRenamingMessage": "Renaming Update...",
-  "DialogUpdaterAddingFilesMessage": "Adding New Update...",
-  "DialogUpdaterCompleteMessage": "Update Complete!",
-  "DialogUpdaterRestartMessage": "Do you want to restart Ryujinx now?",
-  "DialogUpdaterArchNotSupportedMessage": "You are not running a supported system architecture!",
-  "DialogUpdaterArchNotSupportedSubMessage": "(Only x64 systems are supported!)",
-  "DialogUpdaterNoInternetMessage": "You are not connected to the Internet!",
-  "DialogUpdaterNoInternetSubMessage": "Please verify that you have a working Internet connection!",
-  "DialogUpdaterDirtyBuildMessage": "You Cannot update a Dirty build of Ryujinx!",
-  "DialogUpdaterDirtyBuildSubMessage": "Please download Ryujinx at https://ryujinx.org/ if you are looking for a supported version.",
-  "DialogRestartRequiredMessage": "Restart Required",
-  "DialogThemeRestartMessage": "Theme has been saved. A restart is needed to apply the theme.",
-  "DialogThemeRestartSubMessage": "Do you want to restart",
-  "DialogFirmwareInstallEmbeddedMessage": "Would you like to install the firmware embedded in this game? (Firmware {0})",
-  "DialogFirmwareInstallEmbeddedSuccessMessage": "No installed firmware was found but Ryujinx was able to install firmware {0} from the provided game.\\nThe emulator will now start.",
-  "DialogFirmwareNoFirmwareInstalledMessage": "No Firmware Installed",
-  "DialogFirmwareInstalledMessage": "Firmware {0} was installed",
-  "DialogInstallFileTypesSuccessMessage": "Successfully installed file types!",
-  "DialogInstallFileTypesErrorMessage": "Failed to install file types.",
-  "DialogUninstallFileTypesSuccessMessage": "Successfully uninstalled file types!",
-  "DialogUninstallFileTypesErrorMessage": "Failed to uninstall file types.",
-  "DialogOpenSettingsWindowLabel": "Open Settings Window",
-  "DialogControllerAppletTitle": "Controller Applet",
-  "DialogMessageDialogErrorExceptionMessage": "Error displaying Message Dialog: {0}",
-  "DialogSoftwareKeyboardErrorExceptionMessage": "Error displaying Software Keyboard: {0}",
-  "DialogErrorAppletErrorExceptionMessage": "Error displaying ErrorApplet Dialog: {0}",
-  "DialogUserErrorDialogMessage": "{0}: {1}",
-  "DialogUserErrorDialogInfoMessage": "\nFor more information on how to fix this error, follow our Setup Guide.",
-  "DialogUserErrorDialogTitle": "Ryujinx Error ({0})",
-  "DialogAmiiboApiTitle": "Amiibo API",
-  "DialogAmiiboApiFailFetchMessage": "An error occured while fetching information from the API.",
-  "DialogAmiiboApiConnectErrorMessage": "Unable to connect to Amiibo API server. The service may be down or you may need to verify your internet connection is online.",
-  "DialogProfileInvalidProfileErrorMessage": "Profile {0} is incompatible with the current input configuration system.",
-  "DialogProfileDefaultProfileOverwriteErrorMessage": "Default Profile can not be overwritten",
-  "DialogProfileDeleteProfileTitle": "Deleting Profile",
-  "DialogProfileDeleteProfileMessage": "This action is irreversible, are you sure you want to continue?",
-  "DialogWarning": "Warning",
-  "DialogPPTCDeletionMessage": "You are about to queue a PPTC rebuild on the next boot of:\n\n{0}\n\nAre you sure you want to proceed?",
-  "DialogPPTCDeletionErrorMessage": "Error purging PPTC cache at {0}: {1}",
-  "DialogShaderDeletionMessage": "You are about to delete the Shader cache for :\n\n{0}\n\nAre you sure you want to proceed?",
-  "DialogShaderDeletionErrorMessage": "Error purging Shader cache at {0}: {1}",
-  "DialogRyujinxErrorMessage": "Ryujinx has encountered an error",
-  "DialogInvalidTitleIdErrorMessage": "UI error: The selected game did not have a valid title ID",
-  "DialogFirmwareInstallerFirmwareNotFoundErrorMessage": "A valid system firmware was not found in {0}.",
-  "DialogFirmwareInstallerFirmwareInstallTitle": "Install Firmware {0}",
-  "DialogFirmwareInstallerFirmwareInstallMessage": "System version {0} will be installed.",
-  "DialogFirmwareInstallerFirmwareInstallSubMessage": "\n\nThis will replace the current system version {0}.",
-  "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nDo you want to continue?",
-  "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Installing firmware...",
-  "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "System version {0} successfully installed.",
-  "DialogUserProfileDeletionWarningMessage": "There would be no other profiles to be opened if selected profile is deleted",
-  "DialogUserProfileDeletionConfirmMessage": "Do you want to delete the selected profile",
-  "DialogUserProfileUnsavedChangesTitle": "Warning - Unsaved Changes",
-  "DialogUserProfileUnsavedChangesMessage": "You have made changes to this user profile that have not been saved.",
-  "DialogUserProfileUnsavedChangesSubMessage": "Do you want to discard your changes?",
-  "DialogControllerSettingsModifiedConfirmMessage": "The current controller settings has been updated.",
-  "DialogControllerSettingsModifiedConfirmSubMessage": "Do you want to save?",
-  "DialogLoadNcaErrorMessage": "{0}. Errored File: {1}",
-  "DialogDlcNoDlcErrorMessage": "The specified file does not contain a DLC for the selected title!",
-  "DialogPerformanceCheckLoggingEnabledMessage": "You have trace logging enabled, which is designed to be used by developers only.",
-  "DialogPerformanceCheckLoggingEnabledConfirmMessage": "For optimal performance, it's recommended to disable trace logging. Would you like to disable trace logging now?",
-  "DialogPerformanceCheckShaderDumpEnabledMessage": "You have shader dumping enabled, which is designed to be used by developers only.",
-  "DialogPerformanceCheckShaderDumpEnabledConfirmMessage": "For optimal performance, it's recommended to disable shader dumping. Would you like to disable shader dumping now?",
-  "DialogLoadAppGameAlreadyLoadedMessage": "A game has already been loaded",
-  "DialogLoadAppGameAlreadyLoadedSubMessage": "Please stop emulation or close the emulator before launching another game.",
-  "DialogUpdateAddUpdateErrorMessage": "The specified file does not contain an update for the selected title!",
-  "DialogSettingsBackendThreadingWarningTitle": "Warning - Backend Threading",
-  "DialogSettingsBackendThreadingWarningMessage": "Ryujinx must be restarted after changing this option for it to apply fully. Depending on your platform, you may need to manually disable your driver's own multithreading when using Ryujinx's.",
-  "SettingsTabGraphicsFeaturesOptions": "Features",
-  "SettingsTabGraphicsBackendMultithreading": "Graphics Backend Multithreading:",
-  "CommonAuto": "Auto",
-  "CommonOff": "Off",
-  "CommonOn": "On",
-  "InputDialogYes": "Yes",
-  "InputDialogNo": "No",
-  "DialogProfileInvalidProfileNameErrorMessage": "The file name contains invalid characters. Please try again.",
-  "MenuBarOptionsPauseEmulation": "Pause",
-  "MenuBarOptionsResumeEmulation": "Resume",
-  "AboutUrlTooltipMessage": "Click to open the Ryujinx website in your default browser.",
-  "AboutDisclaimerMessage": "Ryujinx is not affiliated with Nintendo™,\nor any of its partners, in any way.",
-  "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) is used\nin our Amiibo emulation.",
-  "AboutPatreonUrlTooltipMessage": "Click to open the Ryujinx Patreon page in your default browser.",
-  "AboutGithubUrlTooltipMessage": "Click to open the Ryujinx GitHub page in your default browser.",
-  "AboutDiscordUrlTooltipMessage": "Click to open an invite to the Ryujinx Discord server in your default browser.",
-  "AboutTwitterUrlTooltipMessage": "Click to open the Ryujinx Twitter page in your default browser.",
-  "AboutRyujinxAboutTitle": "About:",
-  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nPlease support us on Patreon.\nGet all the latest news on our Twitter or Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
-  "AboutRyujinxMaintainersTitle": "Maintained By:",
-  "AboutRyujinxMaintainersContentTooltipMessage": "Click to open the Contributors page in your default browser.",
-  "AboutRyujinxSupprtersTitle": "Supported on Patreon By:",
-  "AmiiboSeriesLabel": "Amiibo Series",
-  "AmiiboCharacterLabel": "Character",
-  "AmiiboScanButtonLabel": "Scan It",
-  "AmiiboOptionsShowAllLabel": "Show All Amiibo",
-  "AmiiboOptionsUsRandomTagLabel": "Hack: Use Random tag Uuid",
-  "DlcManagerTableHeadingEnabledLabel": "Enabled",
-  "DlcManagerTableHeadingTitleIdLabel": "Title ID",
-  "DlcManagerTableHeadingContainerPathLabel": "Container Path",
-  "DlcManagerTableHeadingFullPathLabel": "Full Path",
-  "DlcManagerRemoveAllButton": "Remove All",
-  "DlcManagerEnableAllButton": "Enable All",
-  "DlcManagerDisableAllButton": "Disable All",
-  "MenuBarOptionsChangeLanguage": "Change Language",
-  "CommonSort": "Sort",
-  "CommonShowNames": "Show Names",
-  "CommonFavorite": "Favorite",
-  "OrderAscending": "Ascending",
-  "OrderDescending": "Descending",
-  "SettingsTabGraphicsFeatures": "Features & Enhancements",
-  "ErrorWindowTitle": "Error Window",
-  "ToggleDiscordTooltip": "Choose whether or not to display Ryujinx on your \"currently playing\" Discord activity",
-  "AddGameDirBoxTooltip": "Enter a game directory to add to the list",
-  "AddGameDirTooltip": "Add a game directory to the list",
-  "RemoveGameDirTooltip": "Remove selected game directory",
-  "CustomThemeCheckTooltip": "Use a custom Avalonia theme for the GUI to change the appearance of the emulator menus",
-  "CustomThemePathTooltip": "Path to custom GUI theme",
-  "CustomThemeBrowseTooltip": "Browse for a custom GUI theme",
-  "DockModeToggleTooltip": "Docked mode makes the emulated system behave as a docked Nintendo Switch. This improves graphical fidelity in most games. Conversely, disabling this will make the emulated system behave as a handheld Nintendo Switch, reducing graphics quality.\n\nConfigure player 1 controls if planning to use docked mode; configure handheld controls if planning to use handheld mode.\n\nLeave ON if unsure.",
-  "DirectKeyboardTooltip": "Direct keyboard access (HID) support. Provides games access to your keyboard as a text entry device.",
-  "DirectMouseTooltip": "Direct mouse access (HID) support. Provides games access to your mouse as a pointing device.",
-  "RegionTooltip": "Change System Region",
-  "LanguageTooltip": "Change System Language",
-  "TimezoneTooltip": "Change System TimeZone",
-  "TimeTooltip": "Change System Time",
-  "VSyncToggleTooltip": "Emulated console's Vertical Sync. Essentially a frame-limiter for the majority of games; disabling it may cause games to run at higher speed or make loading screens take longer or get stuck.\n\nCan be toggled in-game with a hotkey of your preference. We recommend doing this if you plan on disabling it.\n\nLeave ON if unsure.",
-  "PptcToggleTooltip": "Saves translated JIT functions so that they do not need to be translated every time the game loads.\n\nReduces stuttering and significantly speeds up boot times after the first boot of a game.\n\nLeave ON if unsure.",
-  "FsIntegrityToggleTooltip": "Checks for corrupt files when booting a game, and if corrupt files are detected, displays a hash error in the log.\n\nHas no impact on performance and is meant to help troubleshooting.\n\nLeave ON if unsure.",
-  "AudioBackendTooltip": "Changes the backend used to render audio.\n\nSDL2 is the preferred one, while OpenAL and SoundIO are used as fallbacks. Dummy will have no sound.\n\nSet to SDL2 if unsure.",
-  "MemoryManagerTooltip": "Change how guest memory is mapped and accessed. Greatly affects emulated CPU performance.\n\nSet to HOST UNCHECKED if unsure.",
-  "MemoryManagerSoftwareTooltip": "Use a software page table for address translation. Highest accuracy but slowest performance.",
-  "MemoryManagerHostTooltip": "Directly map memory in the host address space. Much faster JIT compilation and execution.",
-  "MemoryManagerUnsafeTooltip": "Directly map memory, but do not mask the address within the guest address space before access. Faster, but at the cost of safety. The guest application can access memory from anywhere in Ryujinx, so only run programs you trust with this mode.",
-  "UseHypervisorTooltip": "Use Hypervisor instead of JIT. Greatly improves performance when available, but can be unstable in its current state.",
-  "DRamTooltip": "Utilizes an alternative MemoryMode layout to mimic a Switch development model.\n\nThis is only useful for higher-resolution texture packs or 4k resolution mods. Does NOT improve performance.\n\nLeave OFF if unsure.",
-  "IgnoreMissingServicesTooltip": "Ignores unimplemented Horizon OS services. This may help in bypassing crashes when booting certain games.\n\nLeave OFF if unsure.",
-  "GraphicsBackendThreadingTooltip": "Executes graphics backend commands on a second thread.\n\nSpeeds up shader compilation, reduces stuttering, and improves performance on GPU drivers without multithreading support of their own. Slightly better performance on drivers with multithreading.\n\nSet to AUTO if unsure.",
-  "GalThreadingTooltip": "Executes graphics backend commands on a second thread.\n\nSpeeds up shader compilation, reduces stuttering, and improves performance on GPU drivers without multithreading support of their own. Slightly better performance on drivers with multithreading.\n\nSet to AUTO if unsure.",
-  "ShaderCacheToggleTooltip": "Saves a disk shader cache which reduces stuttering in subsequent runs.\n\nLeave ON if unsure.",
-  "ResolutionScaleTooltip": "Resolution Scale applied to applicable render targets",
-  "ResolutionScaleEntryTooltip": "Floating point resolution scale, such as 1.5. Non-integral scales are more likely to cause issues or crash.",
-  "AnisotropyTooltip": "Level of Anisotropic Filtering (set to Auto to use the value requested by the game)",
-  "AspectRatioTooltip": "Aspect Ratio applied to the renderer window.",
-  "ShaderDumpPathTooltip": "Graphics Shaders Dump Path",
-  "FileLogTooltip": "Saves console logging to a log file on disk. Does not affect performance.",
-  "StubLogTooltip": "Prints stub log messages in the console. Does not affect performance.",
-  "InfoLogTooltip": "Prints info log messages in the console. Does not affect performance.",
-  "WarnLogTooltip": "Prints warning log messages in the console. Does not affect performance.",
-  "ErrorLogTooltip": "Prints error log messages in the console. Does not affect performance.",
-  "TraceLogTooltip": "Prints trace log messages in the console. Does not affect performance.",
-  "GuestLogTooltip": "Prints guest log messages in the console. Does not affect performance.",
-  "FileAccessLogTooltip": "Prints file access log messages in the console.",
-  "FSAccessLogModeTooltip": "Enables FS access log output to the console. Possible modes are 0-3",
-  "DeveloperOptionTooltip": "Use with care",
-  "OpenGlLogLevel": "Requires appropriate log levels enabled",
-  "DebugLogTooltip": "Prints debug log messages in the console.\n\nOnly use this if specifically instructed by a staff member, as it will make logs difficult to read and worsen emulator performance.",
-  "LoadApplicationFileTooltip": "Open a file explorer to choose a Switch compatible file to load",
-  "LoadApplicationFolderTooltip": "Open a file explorer to choose a Switch compatible, unpacked application to load",
-  "OpenRyujinxFolderTooltip": "Open Ryujinx filesystem folder",
-  "OpenRyujinxLogsTooltip": "Opens the folder where logs are written to",
-  "ExitTooltip": "Exit Ryujinx",
-  "OpenSettingsTooltip": "Open settings window",
-  "OpenProfileManagerTooltip": "Open User Profiles Manager window",
-  "StopEmulationTooltip": "Stop emulation of the current game and return to game selection",
-  "CheckUpdatesTooltip": "Check for updates to Ryujinx",
-  "OpenAboutTooltip": "Open About Window",
-  "GridSize": "Grid Size",
-  "GridSizeTooltip": "Change the size of grid items",
-  "SettingsTabSystemSystemLanguageBrazilianPortuguese": "Brazilian Portuguese",
-  "AboutRyujinxContributorsButtonHeader": "See All Contributors",
-  "SettingsTabSystemAudioVolume": "Volume: ",
-  "AudioVolumeTooltip": "Change Audio Volume",
-  "SettingsTabSystemEnableInternetAccess": "Guest Internet Access/LAN Mode",
-  "EnableInternetAccessTooltip": "Allows the emulated application to connect to the Internet.\n\nGames with a LAN mode can connect to each other when this is enabled and the systems are connected to the same access point. This includes real consoles as well.\n\nDoes NOT allow connecting to Nintendo servers. May cause crashing in certain games that try to connect to the Internet.\n\nLeave OFF if unsure.",
-  "GameListContextMenuManageCheatToolTip": "Manage Cheats",
-  "GameListContextMenuManageCheat": "Manage Cheats",
-  "ControllerSettingsStickRange": "Range:",
-  "DialogStopEmulationTitle": "Ryujinx - Stop Emulation",
-  "DialogStopEmulationMessage": "Are you sure you want to stop emulation?",
-  "SettingsTabCpu": "CPU",
-  "SettingsTabAudio": "Audio",
-  "SettingsTabNetwork": "Network",
-  "SettingsTabNetworkConnection": "Network Connection",
-  "SettingsTabCpuCache": "CPU Cache",
-  "SettingsTabCpuMemory": "CPU Mode",
-  "DialogUpdaterFlatpakNotSupportedMessage": "Please update Ryujinx via FlatHub.",
-  "UpdaterDisabledWarningTitle": "Updater Disabled!",
-  "GameListContextMenuOpenSdModsDirectory": "Open Atmosphere Mods Directory",
-  "GameListContextMenuOpenSdModsDirectoryToolTip": "Opens the alternative SD card Atmosphere directory which contains Application's Mods. Useful for mods that are packaged for real hardware.",
-  "ControllerSettingsRotate90": "Rotate 90° Clockwise",
-  "IconSize": "Icon Size",
-  "IconSizeTooltip": "Change the size of game icons",
-  "MenuBarOptionsShowConsole": "Show Console",
-  "ShaderCachePurgeError": "Error purging shader cache at {0}: {1}",
-  "UserErrorNoKeys": "Keys not found",
-  "UserErrorNoFirmware": "Firmware not found",
-  "UserErrorFirmwareParsingFailed": "Firmware parsing error",
-  "UserErrorApplicationNotFound": "Application not found",
-  "UserErrorUnknown": "Unknown error",
-  "UserErrorUndefined": "Undefined error",
-  "UserErrorNoKeysDescription": "Ryujinx was unable to find your 'prod.keys' file",
-  "UserErrorNoFirmwareDescription": "Ryujinx was unable to find any firmwares installed",
-  "UserErrorFirmwareParsingFailedDescription": "Ryujinx was unable to parse the provided firmware. This is usually caused by outdated keys.",
-  "UserErrorApplicationNotFoundDescription": "Ryujinx couldn't find a valid application at the given path.",
-  "UserErrorUnknownDescription": "An unknown error occured!",
-  "UserErrorUndefinedDescription": "An undefined error occured! This shouldn't happen, please contact a dev!",
-  "OpenSetupGuideMessage": "Open the Setup Guide",
-  "NoUpdate": "No Update",
-  "TitleUpdateVersionLabel": "Version {0}",
-  "RyujinxInfo": "Ryujinx - Info",
-  "RyujinxConfirm": "Ryujinx - Confirmation",
-  "FileDialogAllTypes": "All types",
-  "Never": "Never",
-  "SwkbdMinCharacters": "Must be at least {0} characters long",
-  "SwkbdMinRangeCharacters": "Must be {0}-{1} characters long",
-  "SoftwareKeyboard": "Software Keyboard",
-  "DialogControllerAppletMessagePlayerRange": "Application requests {0} player(s) with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}Please open Settings and reconfigure Input now or press Close.",
-  "DialogControllerAppletMessage": "Application requests exactly {0} player(s) with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}Please open Settings and reconfigure Input now or press Close.",
-  "DialogControllerAppletDockModeSet": "Docked mode set. Handheld is also invalid.\n\n",
-  "UpdaterRenaming": "Renaming Old Files...",
-  "UpdaterRenameFailed": "Updater was unable to rename file: {0}",
-  "UpdaterAddingFiles": "Adding New Files...",
-  "UpdaterExtracting": "Extracting Update...",
-  "UpdaterDownloading": "Downloading Update...",
-  "Game": "Game",
-  "Docked": "Docked",
-  "Handheld": "Handheld",
-  "ConnectionError": "Connection Error.",
-  "AboutPageDeveloperListMore": "{0} and more...",
-  "ApiError": "API Error.",
-  "LoadingHeading": "Loading {0}",
-  "CompilingPPTC": "Compiling PTC",
-  "CompilingShaders": "Compiling Shaders",
-  "AllKeyboards": "All keyboards",
-  "OpenFileDialogTitle": "Select a supported file to open",
-  "OpenFolderDialogTitle": "Select a folder with an unpacked game",
-  "AllSupportedFormats": "All Supported Formats",
-  "RyujinxUpdater": "Ryujinx Updater",
-  "SettingsTabHotkeys": "Keyboard Hotkeys",
-  "SettingsTabHotkeysHotkeys": "Keyboard Hotkeys",
-  "SettingsTabHotkeysToggleVsyncHotkey": "Toggle VSync:",
-  "SettingsTabHotkeysScreenshotHotkey": "Screenshot:",
-  "SettingsTabHotkeysShowUiHotkey": "Show UI:",
-  "SettingsTabHotkeysPauseHotkey": "Pause:",
-  "SettingsTabHotkeysToggleMuteHotkey": "Mute:",
-  "ControllerMotionTitle": "Motion Control Settings",
-  "ControllerRumbleTitle": "Rumble Settings",
-  "SettingsSelectThemeFileDialogTitle": "Select Theme File",
-  "SettingsXamlThemeFile": "Xaml Theme File",
-  "AvatarWindowTitle": "Manage Accounts - Avatar",
-  "Amiibo": "Amiibo",
-  "Unknown": "Unknown",
-  "Usage": "Usage",
-  "Writable": "Writable",
-  "SelectDlcDialogTitle": "Select DLC files",
-  "SelectUpdateDialogTitle": "Select update files",
-  "UserProfileWindowTitle": "User Profiles Manager",
-  "CheatWindowTitle": "Cheats Manager",
-  "DlcWindowTitle": "Downloadable Content Manager",
-  "UpdateWindowTitle": "Title Update Manager",
-  "CheatWindowHeading": "Cheats Available for {0} [{1}]",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
-  "UserProfilesEditProfile": "Edit Selected",
-  "Cancel": "Cancel",
-  "Save": "Save",
-  "Discard": "Discard",
-  "UserProfilesSetProfileImage": "Set Profile Image",
-  "UserProfileEmptyNameError": "Name is required",
-  "UserProfileNoImageError": "Profile image must be set",
-  "GameUpdateWindowHeading": "Manage Updates for {0} ({1})",
-  "SettingsTabHotkeysResScaleUpHotkey": "Increase resolution:",
-  "SettingsTabHotkeysResScaleDownHotkey": "Decrease resolution:",
-  "UserProfilesName": "Name:",
-  "UserProfilesUserId": "User ID:",
-  "SettingsTabGraphicsBackend": "Graphics Backend",
-  "SettingsTabGraphicsBackendTooltip": "Graphics Backend to use",
-  "SettingsEnableTextureRecompression": "Enable Texture Recompression",
-  "SettingsEnableTextureRecompressionTooltip": "Compresses certain textures in order to reduce VRAM usage.\n\nRecommended for use with GPUs that have less than 4GiB VRAM.\n\nLeave OFF if unsure.",
-  "SettingsTabGraphicsPreferredGpu": "Preferred GPU",
-  "SettingsTabGraphicsPreferredGpuTooltip": "Select the graphics card that will be used with the Vulkan graphics backend.\n\nDoes not affect the GPU that OpenGL will use.\n\nSet to the GPU flagged as \"dGPU\" if unsure. If there isn't one, leave untouched.",
-  "SettingsAppRequiredRestartMessage": "Ryujinx Restart Required",
-  "SettingsGpuBackendRestartMessage": "Graphics Backend or GPU settings have been modified. This will require a restart to be applied",
-  "SettingsGpuBackendRestartSubMessage": "Do you want to restart now?",
-  "RyujinxUpdaterMessage": "Do you want to update Ryujinx to the latest version?",
-  "SettingsTabHotkeysVolumeUpHotkey": "Increase Volume:",
-  "SettingsTabHotkeysVolumeDownHotkey": "Decrease Volume:",
-  "SettingsEnableMacroHLE": "Enable Macro HLE",
-  "SettingsEnableMacroHLETooltip": "High-level emulation of GPU Macro code.\n\nImproves performance, but may cause graphical glitches in some games.\n\nLeave ON if unsure.",
-  "VolumeShort": "Vol",
-  "UserProfilesManageSaves": "Manage Saves",
-  "DeleteUserSave": "Do you want to delete user save for this game?",
-  "IrreversibleActionNote": "This action is not reversible.",
-  "SaveManagerHeading": "Manage Saves for {0} ({1})",
-  "SaveManagerTitle": "Save Manager",
-  "Name": "Name",
-  "Size": "Size",
-  "Search": "Search",
-  "UserProfilesRecoverLostAccounts": "Recover Lost Accounts",
-  "Recover": "Recover",
-  "UserProfilesRecoverHeading" : "Saves were found for the following accounts",
-  "UserProfilesRecoverEmptyList": "No profiles to recover",
-  "UserEditorTitle" : "Edit User",
-  "UserEditorTitleCreate" : "Create User"
-}

Ryujinx.Ava/Common/ApplicationHelper.cs

@@ -1,409 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Notifications;
-using Avalonia.Threading;
-using LibHac;
-using LibHac.Account;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.Fs.Shim;
-using LibHac.FsSystem;
-using LibHac.Ns;
-using LibHac.Tools.Fs;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.Ui.Common.Helper;
-using System;
-using System.Buffers;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Path = System.IO.Path;
-
-namespace Ryujinx.Ava.Common
-{
-    internal static class ApplicationHelper
-    {
-        private static HorizonClient _horizonClient;
-        private static AccountManager _accountManager;
-        private static VirtualFileSystem _virtualFileSystem;
-        private static StyleableWindow _owner;
-
-        public static void Initialize(VirtualFileSystem virtualFileSystem, AccountManager accountManager, HorizonClient horizonClient, StyleableWindow owner)
-        {
-            _owner = owner;
-            _virtualFileSystem = virtualFileSystem;
-            _horizonClient = horizonClient;
-            _accountManager = accountManager;
-        }
-
-        private static bool TryFindSaveData(string titleName, ulong titleId, BlitStruct<ApplicationControlProperty> controlHolder, in SaveDataFilter filter, out ulong saveDataId)
-        {
-            saveDataId = default;
-
-            Result result = _horizonClient.Fs.FindSaveDataWithFilter(out SaveDataInfo saveDataInfo, SaveDataSpaceId.User, in filter);
-            if (ResultFs.TargetNotFound.Includes(result))
-            {
-                ref ApplicationControlProperty control = ref controlHolder.Value;
-
-                Logger.Info?.Print(LogClass.Application, $"Creating save directory for Title: {titleName} [{titleId:x16}]");
-
-                if (Utilities.IsZeros(controlHolder.ByteSpan))
-                {
-                    // If the current application doesn't have a loaded control property, create a dummy one
-                    // and set the savedata sizes so a user savedata will be created.
-                    control = ref new BlitStruct<ApplicationControlProperty>(1).Value;
-
-                    // The set sizes don't actually matter as long as they're non-zero because we use directory savedata.
-                    control.UserAccountSaveDataSize = 0x4000;
-                    control.UserAccountSaveDataJournalSize = 0x4000;
-
-                    Logger.Warning?.Print(LogClass.Application, "No control file was found for this game. Using a dummy one instead. This may cause inaccuracies in some games.");
-                }
-
-                Uid user = new((ulong)_accountManager.LastOpenedUser.UserId.High, (ulong)_accountManager.LastOpenedUser.UserId.Low);
-
-                result = _horizonClient.Fs.EnsureApplicationSaveData(out _, new LibHac.Ncm.ApplicationId(titleId), in control, in user);
-                if (result.IsFailure())
-                {
-                    Dispatcher.UIThread.InvokeAsync(async () =>
-                    {
-                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogMessageCreateSaveErrorMessage, result.ToStringWithName()));
-                    });
-
-                    return false;
-                }
-
-                // Try to find the savedata again after creating it
-                result = _horizonClient.Fs.FindSaveDataWithFilter(out saveDataInfo, SaveDataSpaceId.User, in filter);
-            }
-
-            if (result.IsSuccess())
-            {
-                saveDataId = saveDataInfo.SaveDataId;
-
-                return true;
-            }
-
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogMessageFindSaveErrorMessage, result.ToStringWithName()));
-            });
-
-            return false;
-        }
-
-        public static void OpenSaveDir(in SaveDataFilter saveDataFilter, ulong titleId, BlitStruct<ApplicationControlProperty> controlData, string titleName)
-        {
-            if (!TryFindSaveData(titleName, titleId, controlData, in saveDataFilter, out ulong saveDataId))
-            {
-                return;
-            }
-
-            OpenSaveDir(saveDataId);
-        }
-
-        public static void OpenSaveDir(ulong saveDataId)
-        {
-            string saveRootPath = Path.Combine(_virtualFileSystem.GetNandPath(), $"user/save/{saveDataId:x16}");
-
-            if (!Directory.Exists(saveRootPath))
-            {
-                // Inconsistent state. Create the directory
-                Directory.CreateDirectory(saveRootPath);
-            }
-
-            string committedPath = Path.Combine(saveRootPath, "0");
-            string workingPath = Path.Combine(saveRootPath, "1");
-
-            // If the committed directory exists, that path will be loaded the next time the savedata is mounted
-            if (Directory.Exists(committedPath))
-            {
-                OpenHelper.OpenFolder(committedPath);
-            }
-            else
-            {
-                // If the working directory exists and the committed directory doesn't,
-                // the working directory will be loaded the next time the savedata is mounted
-                if (!Directory.Exists(workingPath))
-                {
-                    Directory.CreateDirectory(workingPath);
-                }
-
-                OpenHelper.OpenFolder(workingPath);
-            }
-        }
-
-        public static async Task ExtractSection(NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
-        {
-            OpenFolderDialog folderDialog = new()
-            {
-                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle]
-            };
-
-            string destination       = await folderDialog.ShowAsync(_owner);
-            var    cancellationToken = new CancellationTokenSource();
-
-            if (!string.IsNullOrWhiteSpace(destination))
-            {
-                Thread extractorThread = new(() =>
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                            LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
-                            "",
-                            "",
-                            LocaleManager.Instance[LocaleKeys.InputDialogCancel],
-                            LocaleManager.Instance[LocaleKeys.DialogNcaExtractionTitle]);
-
-                        if (result == UserResult.Cancel)
-                        {
-                            cancellationToken.Cancel();
-                        }
-                    });
-                    
-                    using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
-
-                    Nca mainNca  = null;
-                    Nca patchNca = null;
-
-                    string extension = Path.GetExtension(titleFilePath).ToLower();
-                    if (extension == ".nsp" || extension == ".pfs0" || extension == ".xci")
-                    {
-                        PartitionFileSystem pfs;
-
-                        if (extension == ".xci")
-                        {
-                            pfs = new Xci(_virtualFileSystem.KeySet, file.AsStorage()).OpenPartition(XciPartitionType.Secure);
-                        }
-                        else
-                        {
-                            pfs = new PartitionFileSystem(file.AsStorage());
-                        }
-
-                        foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
-                        {
-                            using var ncaFile = new UniqueRef<IFile>();
-
-                            pfs.OpenFile(ref ncaFile.Ref(), fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                            Nca nca = new(_virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
-                            if (nca.Header.ContentType == NcaContentType.Program)
-                            {
-                                int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, NcaContentType.Program);
-                                if (nca.Header.GetFsHeader(dataIndex).IsPatchSection())
-                                {
-                                    patchNca = nca;
-                                }
-                                else
-                                {
-                                    mainNca = nca;
-                                }
-                            }
-                        }
-                    }
-                    else if (extension == ".nca")
-                    {
-                        mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage());
-                    }
-
-                    if (mainNca == null)
-                    {
-                        Logger.Error?.Print(LogClass.Application, "Extraction failure. The main NCA was not present in the selected file");
-
-                        Dispatcher.UIThread.InvokeAsync(async () =>
-                        {
-                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionMainNcaNotFoundErrorMessage]);
-                        });
-
-                        return;
-                    }
-
-                    (Nca updatePatchNca, _) = ApplicationLoader.GetGameUpdateData(_virtualFileSystem, mainNca.Header.TitleId.ToString("x16"), programIndex, out _);
-                    if (updatePatchNca != null)
-                    {
-                        patchNca = updatePatchNca;
-                    }
-
-                    int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
-
-                    try
-                    {
-                        IFileSystem ncaFileSystem = patchNca != null
-                            ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
-                            : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
-
-                        FileSystemClient fsClient = _horizonClient.Fs;
-
-                        string source = DateTime.Now.ToFileTime().ToString()[10..];
-                        string output = DateTime.Now.ToFileTime().ToString()[10..];
-
-                        using var uniqueSourceFs = new UniqueRef<IFileSystem>(ncaFileSystem);
-                        using var uniqueOutputFs = new UniqueRef<IFileSystem>(new LocalFileSystem(destination));
-
-                        fsClient.Register(source.ToU8Span(), ref uniqueSourceFs.Ref());
-                        fsClient.Register(output.ToU8Span(), ref uniqueOutputFs.Ref());
-
-                        (Result? resultCode, bool canceled) = CopyDirectory(fsClient, $"{source}:/", $"{output}:/", cancellationToken.Token);
-
-                        if (!canceled)
-                        {
-                            if (resultCode.Value.IsFailure())
-                            {
-                                Logger.Error?.Print(LogClass.Application, $"LibHac returned error code: {resultCode.Value.ErrorCode}");
-
-                                Dispatcher.UIThread.InvokeAsync(async () =>
-                                {
-                                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionCheckLogErrorMessage]);
-                                });
-                            }
-                            else if (resultCode.Value.IsSuccess())
-                            {
-                                NotificationHelper.Show(
-                                    LocaleManager.Instance[LocaleKeys.DialogNcaExtractionTitle],
-                                    $"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}",
-                                    NotificationType.Information);
-                            }
-                        }
-
-                        fsClient.Unmount(source.ToU8Span());
-                        fsClient.Unmount(output.ToU8Span());
-                    }
-                    catch (ArgumentException ex)
-                    {
-                        Logger.Error?.Print(LogClass.Application, $"{ex.Message}");
-
-                        Dispatcher.UIThread.InvokeAsync(async () =>
-                        {
-                            await ContentDialogHelper.CreateErrorDialog(ex.Message);
-                        });
-                    }
-                });
-
-                extractorThread.Name = "GUI.NcaSectionExtractorThread";
-                extractorThread.IsBackground = true;
-                extractorThread.Start();
-            }
-        }
-
-        public static (Result? result, bool canceled) CopyDirectory(FileSystemClient fs, string sourcePath, string destPath, CancellationToken token)
-        {
-            Result rc = fs.OpenDirectory(out DirectoryHandle sourceHandle, sourcePath.ToU8Span(), OpenDirectoryMode.All);
-            if (rc.IsFailure())
-            {
-                return (rc, false);
-            }
-
-            using (sourceHandle)
-            {
-                foreach (DirectoryEntryEx entry in fs.EnumerateEntries(sourcePath, "*", SearchOptions.Default))
-                {
-                    if (token.IsCancellationRequested)
-                    {
-                        return (null, true);
-                    }
-
-                    string subSrcPath = PathTools.Normalize(PathTools.Combine(sourcePath, entry.Name));
-                    string subDstPath = PathTools.Normalize(PathTools.Combine(destPath, entry.Name));
-
-                    if (entry.Type == DirectoryEntryType.Directory)
-                    {
-                        fs.EnsureDirectoryExists(subDstPath);
-
-                        (Result? result, bool canceled) = CopyDirectory(fs, subSrcPath, subDstPath, token);
-                        if (canceled || result.Value.IsFailure())
-                        {
-                            return (result, canceled);
-                        }
-                    }
-
-                    if (entry.Type == DirectoryEntryType.File)
-                    {
-                        fs.CreateOrOverwriteFile(subDstPath, entry.Size);
-
-                        rc = CopyFile(fs, subSrcPath, subDstPath);
-                        if (rc.IsFailure())
-                        {
-                            return (rc, false);
-                        }
-                    }
-                }
-            }
-
-            return (Result.Success, false);
-        }
-
-        public static Result CopyFile(FileSystemClient fs, string sourcePath, string destPath)
-        {
-            Result rc = fs.OpenFile(out FileHandle sourceHandle, sourcePath.ToU8Span(), OpenMode.Read);
-            if (rc.IsFailure())
-            {
-                return rc;
-            }
-
-            using (sourceHandle)
-            {
-                rc = fs.OpenFile(out FileHandle destHandle, destPath.ToU8Span(), OpenMode.Write | OpenMode.AllowAppend);
-                if (rc.IsFailure())
-                {
-                    return rc;
-                }
-
-                using (destHandle)
-                {
-                    const int MaxBufferSize = 1024 * 1024;
-
-                    rc = fs.GetFileSize(out long fileSize, sourceHandle);
-                    if (rc.IsFailure())
-                    {
-                        return rc;
-                    }
-
-                    int bufferSize = (int)Math.Min(MaxBufferSize, fileSize);
-
-                    byte[] buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
-                    try
-                    {
-                        for (long offset = 0; offset < fileSize; offset += bufferSize)
-                        {
-                            int toRead = (int)Math.Min(fileSize - offset, bufferSize);
-                            Span<byte> buf = buffer.AsSpan(0, toRead);
-
-                            rc = fs.ReadFile(out long _, sourceHandle, offset, buf);
-                            if (rc.IsFailure())
-                            {
-                                return rc;
-                            }
-
-                            rc = fs.WriteFile(destHandle, offset, buf, WriteOption.None);
-                            if (rc.IsFailure())
-                            {
-                                return rc;
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        ArrayPool<byte>.Shared.Return(buffer);
-                    }
-
-                    rc = fs.FlushFile(destHandle);
-                    if (rc.IsFailure())
-                    {
-                        return rc;
-                    }
-                }
-            }
-
-            return Result.Success;
-        }
-    }
-}

Ryujinx.Ava/Common/Locale/LocaleManager.cs

@@ -1,146 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Common;
-using Ryujinx.Common.Utilities;
-using Ryujinx.Ui.Common.Configuration;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-
-namespace Ryujinx.Ava.Common.Locale
-{
-    class LocaleManager : BaseModel
-    {
-        private const string DefaultLanguageCode = "en_US";
-
-        private Dictionary<LocaleKeys, string>                      _localeStrings;
-        private Dictionary<LocaleKeys, string>                      _localeDefaultStrings;
-        private readonly ConcurrentDictionary<LocaleKeys, object[]> _dynamicValues;
-
-        public static LocaleManager Instance { get; } = new LocaleManager();
-
-        public LocaleManager()
-        {
-            _localeStrings        = new Dictionary<LocaleKeys, string>();
-            _localeDefaultStrings = new Dictionary<LocaleKeys, string>();
-            _dynamicValues        = new ConcurrentDictionary<LocaleKeys, object[]>();
-
-            Load();
-        }
-
-        public void Load()
-        {
-            // Load the system Language Code.
-            string localeLanguageCode = CultureInfo.CurrentCulture.Name.Replace('-', '_');
-
-            // If the view is loaded with the UI Previewer detached, then override it with the saved one or default.
-            if (Program.PreviewerDetached)
-            {
-                if (!string.IsNullOrEmpty(ConfigurationState.Instance.Ui.LanguageCode.Value))
-                {
-                    localeLanguageCode = ConfigurationState.Instance.Ui.LanguageCode.Value;
-                }
-                else
-                {
-                    localeLanguageCode = DefaultLanguageCode;
-                }
-            }
-
-            // Load en_US as default, if the target language translation is incomplete.
-            LoadDefaultLanguage();
-
-            LoadLanguage(localeLanguageCode);
-        }
-
-        public string this[LocaleKeys key]
-        {
-            get
-            {
-                // Check if the locale contains the key.
-                if (_localeStrings.TryGetValue(key, out string value))
-                {
-                    // Check if the localized string needs to be formatted.
-                    if (_dynamicValues.TryGetValue(key, out var dynamicValue))
-                    {
-                        try
-                        {
-                            return string.Format(value, dynamicValue);
-                        }
-                        catch (Exception)
-                        {
-                            // If formatting failed use the default text instead.
-                            if (_localeDefaultStrings.TryGetValue(key, out value))
-                            {
-                                try
-                                {
-                                    return string.Format(value, dynamicValue);
-                                }
-                                catch (Exception)
-                                {
-                                    // If formatting the default text failed return the key.
-                                    return key.ToString();
-                                }
-                            }
-                        }
-                    }
-
-                    return value;
-                }
-
-                // If the locale doesn't contain the key return the default one.
-                if (_localeDefaultStrings.TryGetValue(key, out string defaultValue))
-                {
-                    return defaultValue;
-                }
-
-                // If the locale text doesn't exist return the key.
-                return key.ToString();
-            }
-            set
-            {
-                _localeStrings[key] = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string UpdateAndGetDynamicValue(LocaleKeys key, params object[] values)
-        {
-            _dynamicValues[key] = values;
-
-            OnPropertyChanged("Item");
-
-            return this[key];
-        }
-
-        private void LoadDefaultLanguage()
-        {
-            _localeDefaultStrings = LoadJsonLanguage();
-        }
-
-        public void LoadLanguage(string languageCode)
-        {
-            foreach (var item in LoadJsonLanguage(languageCode))
-            {
-                this[item.Key] = item.Value;
-            }
-        }
-
-        private Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode = DefaultLanguageCode)
-        {
-            var    localeStrings = new Dictionary<LocaleKeys, string>();
-            string languageJson  = EmbeddedResources.ReadAllText($"Ryujinx.Ava/Assets/Locales/{languageCode}.json");
-            var    strings       = JsonHelper.Deserialize<Dictionary<string, string>>(languageJson);
-
-            foreach (var item in strings)
-            {
-                if (Enum.TryParse<LocaleKeys>(item.Key, out var key))
-                {
-                    localeStrings[key] = item.Value;
-                }
-            }
-
-            return localeStrings;
-        }
-    }
-}

Ryujinx.Ava/Input/AvaloniaMouseDriver.cs

@@ -1,161 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using FluentAvalonia.Core;
-using Ryujinx.Input;
-using System;
-using System.Numerics;
-using MouseButton = Ryujinx.Input.MouseButton;
-using Size = System.Drawing.Size;
-
-namespace Ryujinx.Ava.Input
-{
-    internal class AvaloniaMouseDriver : IGamepadDriver
-    {
-        private Control           _widget;
-        private bool              _isDisposed;
-        private Size              _size;
-        private readonly TopLevel _window;
-
-        public bool[]  PressedButtons  { get; }
-        public Vector2 CurrentPosition { get; private set; }
-        public Vector2 Scroll          { get; private set; }
-
-        public string               DriverName  => "AvaloniaMouseDriver";
-        public ReadOnlySpan<string> GamepadsIds => new[] { "0" };
-
-        public AvaloniaMouseDriver(TopLevel window, Control parent)
-        {
-            _widget = parent;
-            _window = window;
-
-            _widget.PointerMoved        += Parent_PointerMovedEvent;
-            _widget.PointerPressed      += Parent_PointerPressEvent;
-            _widget.PointerReleased     += Parent_PointerReleaseEvent;
-            _widget.PointerWheelChanged += Parent_ScrollEvent;
-            
-            _window.PointerMoved        += Parent_PointerMovedEvent;
-            _window.PointerPressed      += Parent_PointerPressEvent;
-            _window.PointerReleased     += Parent_PointerReleaseEvent;
-            _window.PointerWheelChanged += Parent_ScrollEvent;
-
-            PressedButtons = new bool[(int)MouseButton.Count];
-
-            _size = new Size((int)parent.Bounds.Width, (int)parent.Bounds.Height);
-
-            parent.GetObservable(Visual.BoundsProperty).Subscribe(Resized);
-        }
-
-        public event Action<string> OnGamepadConnected
-        {
-            add    { }
-            remove { }
-        }
-
-        public event Action<string> OnGamepadDisconnected
-        {
-            add    { }
-            remove { }
-        }
-
-        private void Resized(Rect rect)
-        {
-            _size = new Size((int)rect.Width, (int)rect.Height);
-        }
-
-        private void Parent_ScrollEvent(object o, PointerWheelEventArgs args)
-        {
-            Scroll = new Vector2((float)args.Delta.X, (float)args.Delta.Y);
-        }
-
-        private void Parent_PointerReleaseEvent(object o, PointerReleasedEventArgs args)
-        {
-            int button = (int)args.InitialPressMouseButton - 1;
-
-            if (PressedButtons.Count() >= button)
-            {
-                PressedButtons[button] = false;
-            }
-        }
-
-        private void Parent_PointerPressEvent(object o, PointerPressedEventArgs args)
-        {
-            int button = (int)args.GetCurrentPoint(_widget).Properties.PointerUpdateKind;
-
-            if (PressedButtons.Count() >= button)
-            {
-                PressedButtons[button] = true;
-            }
-        }
-
-        private void Parent_PointerMovedEvent(object o, PointerEventArgs args)
-        {
-            Point position = args.GetPosition(_widget);
-
-            CurrentPosition = new Vector2((float)position.X, (float)position.Y);
-        }
-
-        public void SetMousePressed(MouseButton button)
-        {
-            if (PressedButtons.Count() >= (int)button)
-            {
-                PressedButtons[(int)button] = true;
-            }
-        }
-
-        public void SetMouseReleased(MouseButton button)
-        {
-            if (PressedButtons.Count() >= (int)button)
-            {
-                PressedButtons[(int)button] = false;
-            }
-        }
-
-        public void SetPosition(double x, double y)
-        {
-            CurrentPosition = new Vector2((float)x, (float)y);
-        }
-
-        public bool IsButtonPressed(MouseButton button)
-        {
-            if (PressedButtons.Count() >= (int)button)
-            {
-                return PressedButtons[(int)button];
-            }
-
-            return false;
-        }
-
-        public Size GetClientSize()
-        {
-            return _size;
-        }
-
-        public IGamepad GetGamepad(string id)
-        {
-            return new AvaloniaMouse(this);
-        }
-
-        public void Dispose()
-        {
-            if (_isDisposed)
-            {
-                return;
-            }
-
-            _isDisposed = true;
-
-            _widget.PointerMoved        -= Parent_PointerMovedEvent;
-            _widget.PointerPressed      -= Parent_PointerPressEvent;
-            _widget.PointerReleased     -= Parent_PointerReleaseEvent;
-            _widget.PointerWheelChanged -= Parent_ScrollEvent;
-
-            _window.PointerMoved        -= Parent_PointerMovedEvent;
-            _window.PointerPressed      -= Parent_PointerPressEvent;
-            _window.PointerReleased     -= Parent_PointerReleaseEvent;
-            _window.PointerWheelChanged -= Parent_ScrollEvent;
-
-            _widget = null;
-        }
-    }
-}

Ryujinx.Ava/Modules/Updater/Updater.cs

@@ -1,777 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Threading;
-using FluentAvalonia.UI.Controls;
-using ICSharpCode.SharpZipLib.GZip;
-using ICSharpCode.SharpZipLib.Tar;
-using ICSharpCode.SharpZipLib.Zip;
-using Newtonsoft.Json.Linq;
-using Ryujinx.Ava;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.Ui.Common.Helper;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.NetworkInformation;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Modules
-{
-    internal static class Updater
-    {
-        private const string GitHubApiURL = "https://api.github.com";
-
-        private static readonly string HomeDir          = AppDomain.CurrentDomain.BaseDirectory;
-        private static readonly string UpdateDir        = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
-        private static readonly string UpdatePublishDir = Path.Combine(UpdateDir, "publish");
-        private static readonly int    ConnectionCount  = 4;
-
-        private static string _buildVer;
-        private static string _platformExt;
-        private static string _buildUrl;
-        private static long   _buildSize;
-        private static bool   _updateSuccessful;
-        private static bool   _running;
-
-        private static readonly string[] WindowsDependencyDirs = Array.Empty<string>();
-
-        public static async Task BeginParse(Window mainWindow, bool showVersionUpToDate)
-        {
-            if (_running)
-            {
-                return;
-            }
-
-            _running = true;
-
-            // Detect current platform
-            if (OperatingSystem.IsMacOS())
-            {
-                _platformExt = "macos_universal.app.tar.gz";
-            }
-            else if (OperatingSystem.IsWindows())
-            {
-                _platformExt = "win_x64.zip";
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                _platformExt = "linux_x64.tar.gz";
-            }
-
-            Version newVersion;
-            Version currentVersion;
-
-            try
-            {
-                currentVersion = Version.Parse(Program.Version);
-            }
-            catch
-            {
-                Logger.Error?.Print(LogClass.Application, "Failed to convert the current Ryujinx version!");
-
-                Dispatcher.UIThread.Post(async () =>
-                {
-                    await ContentDialogHelper.CreateWarningDialog(
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterCancelUpdateMessage]);
-                });
-
-                _running = false;
-
-                return;
-            }
-
-            // Get latest version number from GitHub API
-            try
-            {
-                using HttpClient jsonClient = ConstructHttpClient();
-
-                string  buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
-                string  fetchedJson  = await jsonClient.GetStringAsync(buildInfoURL);
-                JObject jsonRoot     = JObject.Parse(fetchedJson);
-                JToken  assets       = jsonRoot["assets"];
-
-                _buildVer = (string)jsonRoot["name"];
-
-                foreach (JToken asset in assets)
-                {
-                    string assetName   = (string)asset["name"];
-                    string assetState  = (string)asset["state"];
-                    string downloadURL = (string)asset["browser_download_url"];
-
-                    if (assetName.StartsWith("test-ava-ryujinx") && assetName.EndsWith(_platformExt))
-                    {
-                        _buildUrl = downloadURL;
-
-                        if (assetState != "uploaded")
-                        {
-                            if (showVersionUpToDate)
-                            {
-                                Dispatcher.UIThread.Post(async () =>
-                                {
-                                    await ContentDialogHelper.CreateUpdaterInfoDialog(LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage], "");
-                                });
-                            }
-
-                            _running = false;
-
-                            return;
-                        }
-
-                        break;
-                    }
-                }
-
-                // If build not done, assume no new update are available.
-                if (_buildUrl is null)
-                {
-                    if (showVersionUpToDate)
-                    {
-                        Dispatcher.UIThread.Post(async () =>
-                        {
-                            await ContentDialogHelper.CreateUpdaterInfoDialog(LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage], "");
-                        });
-                    }
-
-                    _running = false;
-
-                    return;
-                }
-            }
-            catch (Exception exception)
-            {
-                Logger.Error?.Print(LogClass.Application, exception.Message);
-
-                Dispatcher.UIThread.Post(async () =>
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUpdaterFailedToGetVersionMessage]);
-                });
-
-                _running = false;
-
-                return;
-            }
-
-            try
-            {
-                newVersion = Version.Parse(_buildVer);
-            }
-            catch
-            {
-                Logger.Error?.Print(LogClass.Application, "Failed to convert the received Ryujinx version from Github!");
-
-                Dispatcher.UIThread.Post(async () =>
-                {
-                    await ContentDialogHelper.CreateWarningDialog(
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterCancelUpdateMessage]);
-                });
-
-                _running = false;
-
-                return;
-            }
-
-            if (newVersion <= currentVersion)
-            {
-                if (showVersionUpToDate)
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateUpdaterInfoDialog(LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage], "");
-                    });
-                }
-
-                _running = false;
-
-                return;
-            }
-
-            // Fetch build size information to learn chunk sizes.
-            using (HttpClient buildSizeClient = ConstructHttpClient())
-            {
-                try
-                {
-                    buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0");
-
-                    HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_buildUrl), HttpCompletionOption.ResponseHeadersRead);
-
-                    _buildSize = message.Content.Headers.ContentRange.Length.Value;
-                }
-                catch (Exception ex)
-                {
-                    Logger.Warning?.Print(LogClass.Application, ex.Message);
-                    Logger.Warning?.Print(LogClass.Application, "Couldn't determine build size for update, using single-threaded updater");
-
-                    _buildSize = -1;
-                }
-            }
-
-            Dispatcher.UIThread.Post(async () =>
-            {
-                // Show a message asking the user if they want to update
-                var shouldUpdate = await ContentDialogHelper.CreateChoiceDialog(
-                    LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
-                    LocaleManager.Instance[LocaleKeys.RyujinxUpdaterMessage],
-                    $"{Program.Version} -> {newVersion}");
-
-                if (shouldUpdate)
-                {
-                    UpdateRyujinx(mainWindow, _buildUrl);
-                }
-                else
-                {
-                    _running = false;
-                }
-            });
-        }
-
-        private static HttpClient ConstructHttpClient()
-        {
-            HttpClient result = new();
-
-            // Required by GitHub to interact with APIs.
-            result.DefaultRequestHeaders.Add("User-Agent", "Ryujinx-Updater/1.0.0");
-
-            return result;
-        }
-
-        private static async void UpdateRyujinx(Window parent, string downloadUrl)
-        {
-            _updateSuccessful = false;
-
-            // Empty update dir, although it shouldn't ever have anything inside it
-            if (Directory.Exists(UpdateDir))
-            {
-                Directory.Delete(UpdateDir, true);
-            }
-
-            Directory.CreateDirectory(UpdateDir);
-
-            string updateFile = Path.Combine(UpdateDir, "update.bin");
-
-            TaskDialog taskDialog = new()
-            {
-                Header          = LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
-                SubHeader       = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
-                IconSource      = new SymbolIconSource { Symbol = Symbol.Download },
-                Buttons         = { },
-                ShowProgressBar = true,
-                XamlRoot        = parent
-            };
-
-            taskDialog.Opened += (s, e) =>
-            {
-                if (_buildSize >= 0)
-                {
-                    DoUpdateWithMultipleThreads(taskDialog, downloadUrl, updateFile);
-                }
-                else
-                {
-                    DoUpdateWithSingleThread(taskDialog, downloadUrl, updateFile);
-                }
-            };
-
-            await taskDialog.ShowAsync(true);
-
-            if (_updateSuccessful)
-            {
-                bool shouldRestart = true;
-
-                if (!OperatingSystem.IsMacOS())
-                {
-                    shouldRestart = await ContentDialogHelper.CreateChoiceDialog(LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterCompleteMessage],
-                        LocaleManager.Instance[LocaleKeys.DialogUpdaterRestartMessage]);
-                }
-
-                if (shouldRestart)
-                {
-                    List<string> arguments = CommandLineState.Arguments.ToList();
-                    string ryuName = Path.GetFileName(Environment.ProcessPath);
-                    string executableDirectory = AppDomain.CurrentDomain.BaseDirectory;
-                    string executablePath = Path.Combine(executableDirectory, ryuName);
-
-                    if (!Path.Exists(executablePath))
-                    {
-                        executablePath = Path.Combine(executableDirectory, OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx");
-                    }
-
-                    // On macOS we perform the update at relaunch.
-                    if (OperatingSystem.IsMacOS())
-                    {
-                        string baseBundlePath = Path.GetFullPath(Path.Combine(executableDirectory, "..", ".."));
-                        string newBundlePath = Path.Combine(UpdateDir, "Ryujinx.app");
-                        string updaterScriptPath = Path.Combine(newBundlePath, "Contents", "Resources", "updater.sh");
-                        string currentPid = Process.GetCurrentProcess().Id.ToString();
-
-                        executablePath = "/bin/bash";
-                        arguments.InsertRange(0, new List<string> { updaterScriptPath, baseBundlePath, newBundlePath, currentPid });
-                    }
-
-                    Process.Start(executablePath, arguments);
-                    Environment.Exit(0);
-                }
-            }
-        }
-
-        private static void DoUpdateWithMultipleThreads(TaskDialog taskDialog, string downloadUrl, string updateFile)
-        {
-            // Multi-Threaded Updater
-            long chunkSize      = _buildSize / ConnectionCount;
-            long remainderChunk = _buildSize % ConnectionCount;
-
-            int   completedRequests       = 0;
-            int   totalProgressPercentage = 0;
-            int[] progressPercentage      = new int[ConnectionCount];
-
-            List<byte[]>    list       = new(ConnectionCount);
-            List<WebClient> webClients = new(ConnectionCount);
-
-            for (int i = 0; i < ConnectionCount; i++)
-            {
-                list.Add(Array.Empty<byte>());
-            }
-
-            for (int i = 0; i < ConnectionCount; i++)
-            {
-#pragma warning disable SYSLIB0014
-                // TODO: WebClient is obsolete and need to be replaced with a more complex logic using HttpClient.
-                using WebClient client = new();
-#pragma warning restore SYSLIB0014
-
-                webClients.Add(client);
-
-                if (i == ConnectionCount - 1)
-                {
-                    client.Headers.Add("Range", $"bytes={chunkSize * i}-{(chunkSize * (i + 1) - 1) + remainderChunk}");
-                }
-                else
-                {
-                    client.Headers.Add("Range", $"bytes={chunkSize * i}-{chunkSize * (i + 1) - 1}");
-                }
-
-                client.DownloadProgressChanged += (_, args) =>
-                {
-                    int index = (int)args.UserState;
-
-                    Interlocked.Add(ref totalProgressPercentage, -1 * progressPercentage[index]);
-                    Interlocked.Exchange(ref progressPercentage[index], args.ProgressPercentage);
-                    Interlocked.Add(ref totalProgressPercentage, args.ProgressPercentage);
-
-                    taskDialog.SetProgressBarState(totalProgressPercentage / ConnectionCount, TaskDialogProgressState.Normal);
-                };
-
-                client.DownloadDataCompleted += (_, args) =>
-                {
-                    int index = (int)args.UserState;
-
-                    if (args.Cancelled)
-                    {
-                        webClients[index].Dispose();
-
-                        taskDialog.Hide();
-
-                        return;
-                    }
-
-                    list[index] = args.Result;
-                    Interlocked.Increment(ref completedRequests);
-
-                    if (Equals(completedRequests, ConnectionCount))
-                    {
-                        byte[] mergedFileBytes = new byte[_buildSize];
-                        for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++)
-                        {
-                            Array.Copy(list[connectionIndex], 0, mergedFileBytes, destinationOffset, list[connectionIndex].Length);
-                            destinationOffset += list[connectionIndex].Length;
-                        }
-
-                        File.WriteAllBytes(updateFile, mergedFileBytes);
-
-                        // On macOS, ensure that we remove the quarantine bit to prevent Gatekeeper from blocking execution.
-                        if (OperatingSystem.IsMacOS())
-                        {
-                            using (Process xattrProcess = Process.Start("xattr", new List<string> { "-d", "com.apple.quarantine", updateFile }))
-                            {
-                                xattrProcess.WaitForExit();
-                            }
-                        }
-
-                        try
-                        {
-                            InstallUpdate(taskDialog, updateFile);
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.Warning?.Print(LogClass.Application, e.Message);
-                            Logger.Warning?.Print(LogClass.Application, "Multi-Threaded update failed, falling back to single-threaded updater.");
-
-                            DoUpdateWithSingleThread(taskDialog, downloadUrl, updateFile);
-
-                            return;
-                        }
-                    }
-                };
-
-                try
-                {
-                    client.DownloadDataAsync(new Uri(downloadUrl), i);
-                }
-                catch (WebException ex)
-                {
-                    Logger.Warning?.Print(LogClass.Application, ex.Message);
-                    Logger.Warning?.Print(LogClass.Application, "Multi-Threaded update failed, falling back to single-threaded updater.");
-
-                    foreach (WebClient webClient in webClients)
-                    {
-                        webClient.CancelAsync();
-                    }
-
-                    DoUpdateWithSingleThread(taskDialog, downloadUrl, updateFile);
-
-                    return;
-                }
-            }
-        }
-
-        private static void DoUpdateWithSingleThreadWorker(TaskDialog taskDialog, string downloadUrl, string updateFile)
-        {
-            using HttpClient client = new();
-            // We do not want to timeout while downloading
-            client.Timeout = TimeSpan.FromDays(1);
-
-            using (HttpResponseMessage response         = client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead).Result)
-            using (Stream              remoteFileStream = response.Content.ReadAsStreamAsync().Result)
-            {
-                using Stream updateFileStream = File.Open(updateFile, FileMode.Create);
-
-                long totalBytes  = response.Content.Headers.ContentLength.Value;
-                long byteWritten = 0;
-
-                byte[] buffer = new byte[32 * 1024];
-
-                while (true)
-                {
-                    int readSize = remoteFileStream.Read(buffer);
-
-                    if (readSize == 0)
-                    {
-                        break;
-                    }
-
-                    byteWritten += readSize;
-
-                    taskDialog.SetProgressBarState(GetPercentage(byteWritten, totalBytes), TaskDialogProgressState.Normal);
-
-                    updateFileStream.Write(buffer, 0, readSize);
-                }
-            }
-
-            InstallUpdate(taskDialog, updateFile);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static double GetPercentage(double value, double max)
-        {
-            return max == 0 ? 0 : value / max * 100;
-        }
-
-        private static void DoUpdateWithSingleThread(TaskDialog taskDialog, string downloadUrl, string updateFile)
-        {
-            Thread worker = new(() => DoUpdateWithSingleThreadWorker(taskDialog, downloadUrl, updateFile))
-            {
-                Name = "Updater.SingleThreadWorker"
-            };
-
-            worker.Start();
-        }
-
-        [SupportedOSPlatform("linux")]
-        [SupportedOSPlatform("macos")]
-        private static void ExtractTarGzipFile(TaskDialog taskDialog, string archivePath, string outputDirectoryPath)
-        {
-            using Stream          inStream   = File.OpenRead(archivePath);
-            using GZipInputStream gzipStream = new(inStream);
-            using TarInputStream  tarStream  = new(gzipStream, Encoding.ASCII);
-
-            TarEntry tarEntry;
-
-            while ((tarEntry = tarStream.GetNextEntry()) is not null)
-            {
-                if (tarEntry.IsDirectory)
-                {
-                    continue;
-                }
-
-                string outPath = Path.Combine(outputDirectoryPath, tarEntry.Name);
-
-                Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                using (FileStream outStream = File.OpenWrite(outPath))
-                {
-                    tarStream.CopyEntryContents(outStream);
-                }
-
-                File.SetUnixFileMode(outPath, (UnixFileMode)tarEntry.TarHeader.Mode);
-                File.SetLastWriteTime(outPath, DateTime.SpecifyKind(tarEntry.ModTime, DateTimeKind.Utc));
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    if (tarEntry is null)
-                    {
-                        return;
-                    }
-
-                    taskDialog.SetProgressBarState(GetPercentage(tarEntry.Size, inStream.Length), TaskDialogProgressState.Normal);
-                });
-            }
-        }
-
-        private static void ExtractZipFile(TaskDialog taskDialog, string archivePath, string outputDirectoryPath)
-        {
-            using Stream  inStream = File.OpenRead(archivePath);
-            using ZipFile zipFile  = new(inStream);
-
-            double count = 0;
-            foreach (ZipEntry zipEntry in zipFile)
-            {
-                count++;
-                if (zipEntry.IsDirectory) continue;
-
-                string outPath = Path.Combine(outputDirectoryPath, zipEntry.Name);
-
-                Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                using (Stream     zipStream = zipFile.GetInputStream(zipEntry))
-                using (FileStream outStream = File.OpenWrite(outPath))
-                {
-                    zipStream.CopyTo(outStream);
-                }
-
-                File.SetLastWriteTime(outPath, DateTime.SpecifyKind(zipEntry.DateTime, DateTimeKind.Utc));
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    taskDialog.SetProgressBarState(GetPercentage(count, zipFile.Count), TaskDialogProgressState.Normal);
-                });
-            }
-        }
-
-        private static async void InstallUpdate(TaskDialog taskDialog, string updateFile)
-        {
-            // Extract Update
-            taskDialog.SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterExtracting];
-            taskDialog.SetProgressBarState(0, TaskDialogProgressState.Normal);
-
-            await Task.Run(() =>
-            {
-                if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
-                {
-                    ExtractTarGzipFile(taskDialog, updateFile, UpdateDir);
-                }
-                else if (OperatingSystem.IsWindows())
-                {
-                    ExtractZipFile(taskDialog, updateFile, UpdateDir);
-                }
-                else
-                {
-                    throw new NotSupportedException();
-                }
-            });
-
-            // Delete downloaded zip
-            File.Delete(updateFile);
-
-            List<string> allFiles = EnumerateFilesToDelete().ToList();
-
-            taskDialog.SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterRenaming];
-            taskDialog.SetProgressBarState(0, TaskDialogProgressState.Normal);
-
-            // NOTE: On macOS, replacement is delayed to the restart phase.
-            if (!OperatingSystem.IsMacOS())
-            {
-                // Replace old files
-                await Task.Run(() =>
-                {
-                    double count = 0;
-                    foreach (string file in allFiles)
-                    {
-                        count++;
-                        try
-                        {
-                            File.Move(file, file + ".ryuold");
-
-                            Dispatcher.UIThread.Post(() =>
-                            {
-                                taskDialog.SetProgressBarState(GetPercentage(count, allFiles.Count), TaskDialogProgressState.Normal);
-                            });
-                        }
-                        catch
-                        {
-                            Logger.Warning?.Print(LogClass.Application, LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.UpdaterRenameFailed, file));
-                        }
-                    }
-
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        taskDialog.SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterAddingFiles];
-                        taskDialog.SetProgressBarState(0, TaskDialogProgressState.Normal);
-                    });
-
-                    MoveAllFilesOver(UpdatePublishDir, HomeDir, taskDialog);
-                });
-
-                Directory.Delete(UpdateDir, true);
-            }
-
-            _updateSuccessful = true;
-
-            taskDialog.Hide();
-        }
-
-        public static bool CanUpdate(bool showWarnings)
-        {
-#if !DISABLE_UPDATER
-            if (RuntimeInformation.OSArchitecture != Architecture.X64 && !OperatingSystem.IsMacOS())
-            {
-                if (showWarnings)
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterArchNotSupportedMessage],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterArchNotSupportedSubMessage]);
-                    });
-                }
-
-                return false;
-            }
-
-            if (!NetworkInterface.GetIsNetworkAvailable())
-            {
-                if (showWarnings)
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterNoInternetMessage],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterNoInternetSubMessage]);
-                    });
-                }
-
-                return false;
-            }
-
-            if (Program.Version.Contains("dirty") || !ReleaseInformation.IsValid())
-            {
-                if (showWarnings)
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildMessage],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage]);
-                    });
-                }
-
-                return false;
-            }
-
-            return true;
-#else
-            if (showWarnings)
-            {
-                if (ReleaseInformation.IsFlatHubBuild())
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterFlatpakNotSupportedMessage]);
-                    });
-                }
-                else
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage]);
-                    });
-                }
-            }
-
-            return false;
-#endif
-        }
-
-        // NOTE: This method should always reflect the latest build layout.
-        private static IEnumerable<string> EnumerateFilesToDelete()
-        {
-            var files = Directory.EnumerateFiles(HomeDir); // All files directly in base dir.
-
-            if (OperatingSystem.IsWindows())
-            {
-                foreach (string dir in WindowsDependencyDirs)
-                {
-                    string dirPath = Path.Combine(HomeDir, dir);
-                    if (Directory.Exists(dirPath))
-                    {
-                        files = files.Concat(Directory.EnumerateFiles(dirPath, "*", SearchOption.AllDirectories));
-                    }
-                }
-            }
-
-            return files;
-        }
-
-        private static void MoveAllFilesOver(string root, string dest, TaskDialog taskDialog)
-        {
-            int total = Directory.GetFiles(root, "*", SearchOption.AllDirectories).Length;
-            foreach (string directory in Directory.GetDirectories(root))
-            {
-                string dirName = Path.GetFileName(directory);
-
-                if (!Directory.Exists(Path.Combine(dest, dirName)))
-                {
-                    Directory.CreateDirectory(Path.Combine(dest, dirName));
-                }
-
-                MoveAllFilesOver(directory, Path.Combine(dest, dirName), taskDialog);
-            }
-
-            double count = 0;
-            foreach (string file in Directory.GetFiles(root))
-            {
-                count++;
-
-                File.Move(file, Path.Combine(dest, Path.GetFileName(file)), true);
-
-                Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    taskDialog.SetProgressBarState(GetPercentage(count, total), TaskDialogProgressState.Normal);
-                });
-            }
-        }
-
-        public static void CleanupUpdate()
-        {
-            foreach (string file in Directory.GetFiles(HomeDir, "*.ryuold", SearchOption.AllDirectories))
-            {
-                File.Delete(file);
-            }
-        }
-    }
-}

Ryujinx.Ava/Program.cs

@@ -1,229 +0,0 @@
-using Avalonia;
-using Avalonia.Threading;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.GraphicsDriver;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.SystemInfo;
-using Ryujinx.Common.SystemInterop;
-using Ryujinx.Modules;
-using Ryujinx.SDL2.Common;
-using Ryujinx.Ui.Common;
-using Ryujinx.Ui.Common.Configuration;
-using Ryujinx.Ui.Common.Helper;
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava
-{
-    internal partial class Program
-    {
-        public static double WindowScaleFactor  { get; set; }
-        public static double DesktopScaleFactor { get; set; } = 1.0;
-        public static string Version            { get; private set; }
-        public static string ConfigurationPath  { get; private set; }
-        public static bool   PreviewerDetached  { get; private set; }
-
-        [LibraryImport("user32.dll", SetLastError = true)]
-        public static partial int MessageBoxA(IntPtr hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
-
-        private const uint MB_ICONWARNING = 0x30;
-
-        public static void Main(string[] args)
-        {
-            Version = ReleaseInformation.GetVersion();
-
-            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
-            {
-                _ = MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MB_ICONWARNING);
-            }
-
-            PreviewerDetached = true;
-
-            Initialize(args);
-
-            LoggerAdapter.Register();
-
-            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-        }
-
-        public static AppBuilder BuildAvaloniaApp()
-        {
-            return AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .With(new X11PlatformOptions
-                {
-                    EnableMultiTouch = true,
-                    EnableIme        = true,
-                    UseEGL           = false,
-                    UseGpu           = true
-                })
-                .With(new Win32PlatformOptions
-                {
-                    EnableMultitouch                = true,
-                    UseWgl                          = false,
-                    AllowEglInitialization          = false,
-                    CompositionBackdropCornerRadius = 8.0f,
-                })
-                .UseSkia();
-        }
-
-        private static void Initialize(string[] args)
-        {
-            // Parse arguments
-            CommandLineState.ParseArguments(args);
-
-            // Delete backup files after updating.
-            Task.Run(Updater.CleanupUpdate);
-
-            Console.Title = $"Ryujinx Console {Version}";
-
-            // Hook unhandled exception and process exit events.
-            AppDomain.CurrentDomain.UnhandledException += (sender, e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
-            AppDomain.CurrentDomain.ProcessExit        += (sender, e) => Exit();
-
-            // Setup base data directory.
-            AppDataManager.Initialize(CommandLineState.BaseDirPathArg);
-
-            // Initialize the configuration.
-            ConfigurationState.Initialize();
-
-            // Initialize the logger system.
-            LoggerModule.Initialize();
-
-            // Initialize Discord integration.
-            DiscordIntegrationModule.Initialize();
-
-            // Initialize SDL2 driver
-            SDL2Driver.MainThreadDispatcher = action => Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Input);
-
-            ReloadConfig();
-
-            ForceDpiAware.Windows();
-
-            WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
-
-            // Logging system information.
-            PrintSystemInfo();
-
-            // Enable OGL multithreading on the driver, when available.
-            DriverUtilities.ToggleOGLThreading(ConfigurationState.Instance.Graphics.BackendThreading == BackendThreading.Off);
-
-            // Check if keys exists.
-            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
-            {
-                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
-                {
-                    MainWindow.ShowKeyErrorOnLoad = true;
-                }
-            }
-
-            if (CommandLineState.LaunchPathArg != null)
-            {
-                MainWindow.DeferLoadApplication(CommandLineState.LaunchPathArg, CommandLineState.StartFullscreenArg);
-            }
-        }
-
-        public static void ReloadConfig()
-        {
-            string localConfigurationPath   = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json");
-            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, "Config.json");
-
-            // Now load the configuration as the other subsystems are now registered
-            if (File.Exists(localConfigurationPath))
-            {
-                ConfigurationPath = localConfigurationPath;
-            }
-            else if (File.Exists(appDataConfigurationPath))
-            {
-                ConfigurationPath = appDataConfigurationPath;
-            }
-
-            if (ConfigurationPath == null)
-            {
-                // No configuration, we load the default values and save it to disk
-                ConfigurationPath = appDataConfigurationPath;
-
-                ConfigurationState.Instance.LoadDefault();
-                ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
-            }
-            else
-            {
-                if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
-                {
-                    ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
-                }
-                else
-                {
-                    ConfigurationState.Instance.LoadDefault();
-
-                    Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location {ConfigurationPath}");
-                }
-            }
-
-            // Check if graphics backend was overridden
-            if (CommandLineState.OverrideGraphicsBackend != null)
-            {
-                if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.OpenGl;
-                }
-                else if (CommandLineState.OverrideGraphicsBackend.ToLower() == "vulkan")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.Vulkan;
-                }
-            }
-
-            // Check if docked mode was overriden.
-            if (CommandLineState.OverrideDockedMode.HasValue)
-            {
-                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
-            }
-        }
-
-        private static void PrintSystemInfo()
-        {
-            Logger.Notice.Print(LogClass.Application, $"Ryujinx Version: {Version}");
-            SystemInfo.Gather().Print();
-
-            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(Logger.GetEnabledLevels().Count == 0 ? "<None>" : string.Join(", ", Logger.GetEnabledLevels()))}");
-
-            if (AppDataManager.Mode == AppDataManager.LaunchMode.Custom)
-            {
-                Logger.Notice.Print(LogClass.Application, $"Launch Mode: Custom Path {AppDataManager.BaseDirPath}");
-            }
-            else
-            {
-                Logger.Notice.Print(LogClass.Application, $"Launch Mode: {AppDataManager.Mode}");
-            }
-        }
-
-        private static void ProcessUnhandledException(Exception ex, bool isTerminating)
-        {
-            string message = $"Unhandled exception caught: {ex}";
-
-            Logger.Error?.PrintMsg(LogClass.Application, message);
-
-            if (Logger.Error == null)
-            {
-                Logger.Notice.PrintMsg(LogClass.Application, message);
-            }
-
-            if (isTerminating)
-            {
-                Exit();
-            }
-        }
-
-        public static void Exit()
-        {
-            DiscordIntegrationModule.Exit();
-
-            Logger.Shutdown();
-        }
-    }
-}

Ryujinx.Ava/Ryujinx.Ava.csproj

@@ -1,194 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-    <OutputType>Exe</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>1.0.0-dirty</Version>
-    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
-    <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
-    <RootNamespace>Ryujinx.Ava</RootNamespace>
-    <ApplicationIcon>Ryujinx.ico</ApplicationIcon>
-    <TieredPGO>true</TieredPGO>
-  </PropertyGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <Exec Command="codesign --entitlements $(ProjectDir)..\distribution\macos\entitlements.xml -f --deep -s $(SigningCertificate) $(TargetDir)$(TargetName)" />
-  </Target>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Desktop" />
-    <PackageReference Include="Avalonia.Diagnostics" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
-    <PackageReference Include="Avalonia.Svg" />
-    <PackageReference Include="Avalonia.Svg.Skia" />
-    <PackageReference Include="jp2masa.Avalonia.Flexbox" />
-    <PackageReference Include="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI" />
-    <PackageReference Include="XamlNameReferenceGenerator" />
-
-    <PackageReference Include="OpenTK.Core" />
-    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
-    <PackageReference Include="Silk.NET.Vulkan" />
-    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
-    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
-    <PackageReference Include="SPB" />
-    <PackageReference Include="SharpZipLib" />
-    <PackageReference Include="SixLabors.ImageSharp" />
-
-    <!--NOTE: DO NOT REMOVE, THIS IS REQUIRED AS A RESULT OF A TRIMMING ISSUE IN AVALONIA -->
-    <PackageReference Include="System.Drawing.Common" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
-    <ProjectReference Include="..\Ryujinx.Ui.Common\Ryujinx.Ui.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.Ui.LocaleGenerator\Ryujinx.Ui.LocaleGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>alsoft.ini</TargetPath>
-    </Content>
-    <Content Include="..\distribution\legal\THIRDPARTY.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>THIRDPARTY.md</TargetPath>
-    </Content>
-    <Content Include="..\LICENSE.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>LICENSE.txt</TargetPath>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
-    <Content Include="..\distribution\linux\Ryujinx.sh">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\distribution\linux\mime\Ryujinx.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>mime\Ryujinx.xml</TargetPath>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <AvaloniaResource Include="Ui\**\*.xaml">
-      <SubType>Designer</SubType>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\Fonts\SegoeFluentIcons.ttf" />
-    <AvaloniaResource Include="Assets\Styles\BaseLight.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\Styles\BaseDark.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\Styles\Styles.xaml" />
-
-    <Compile Update="App.axaml.cs">
-      <DependentUpon>App.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Windows\MainWindow.axaml.cs">
-      <DependentUpon>MainWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Windows\AboutWindow.axaml.cs">
-      <DependentUpon>AboutWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Applet\ErrorAppletWindow.axaml.cs">
-      <DependentUpon>ProfileWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Applet\SwkbdAppletWindow.axaml.cs">
-      <DependentUpon>ProfileWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Controls\InputDialog.axaml.cs">
-      <DependentUpon>InputDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Ui\Windows\ContentDialogOverlay.xaml.cs">
-      <DependentUpon>ContentDialogOverlay.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Ui\Controls\GameListView.axaml.cs">
-      <DependentUpon>GameListView.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="UI\Views\User\UserEditorView.axaml.cs">
-      <DependentUpon>UserEditor.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="UI\Views\User\UserRecovererView.axaml.cs">
-      <DependentUpon>UserRecoverer.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="UI\Views\User\UserSelectorView.axaml.cs">
-      <DependentUpon>UserSelector.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Assets\Locales\el_GR.json" />
-    <None Remove="Assets\Locales\en_US.json" />
-    <None Remove="Assets\Locales\es_ES.json" />
-    <None Remove="Assets\Locales\fr_FR.json" />
-    <None Remove="Assets\Locales\de_DE.json" />
-    <None Remove="Assets\Locales\it_IT.json" />
-    <None Remove="Assets\Locales\ja_JP.json" />
-    <None Remove="Assets\Locales\ko_KR.json" />
-    <None Remove="Assets\Locales\pl_PL.json" />
-    <None Remove="Assets\Locales\pt_BR.json" />
-    <None Remove="Assets\Locales\ru_RU.json" />
-    <None Remove="Assets\Locales\tr_TR.json" />
-    <None Remove="Assets\Locales\uk_UA.json" />
-    <None Remove="Assets\Locales\zh_CN.json" />
-    <None Remove="Assets\Locales\zh_TW.json" />
-    <None Remove="Assets\Styles\Styles.xaml" />
-    <None Remove="Assets\Styles\BaseDark.xaml" />
-    <None Remove="Assets\Styles\BaseLight.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\Locales\el_GR.json" />
-    <EmbeddedResource Include="Assets\Locales\en_US.json" />
-    <EmbeddedResource Include="Assets\Locales\es_ES.json" />
-    <EmbeddedResource Include="Assets\Locales\fr_FR.json" />
-    <EmbeddedResource Include="Assets\Locales\de_DE.json" />
-    <EmbeddedResource Include="Assets\Locales\it_IT.json" />
-    <EmbeddedResource Include="Assets\Locales\ja_JP.json" />
-    <EmbeddedResource Include="Assets\Locales\ko_KR.json" />
-    <EmbeddedResource Include="Assets\Locales\pl_PL.json" />
-    <EmbeddedResource Include="Assets\Locales\pt_BR.json" />
-    <EmbeddedResource Include="Assets\Locales\ru_RU.json" />
-    <EmbeddedResource Include="Assets\Locales\tr_TR.json" />
-    <EmbeddedResource Include="Assets\Locales\uk_UA.json" />
-    <EmbeddedResource Include="Assets\Locales\zh_CN.json" />
-    <EmbeddedResource Include="Assets\Locales\zh_TW.json" />
-    <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-      <AdditionalFiles Include="Assets\Locales\en_US.json" />
-  </ItemGroup>
-</Project>

Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs

@@ -1,195 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Threading;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.HLE;
-using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
-using Ryujinx.HLE.Ui;
-using System;
-using System.Threading;
-
-namespace Ryujinx.Ava.UI.Applet
-{
-    internal class AvaHostUiHandler : IHostUiHandler
-    {
-        private readonly MainWindow _parent;
-
-        public IHostUiTheme HostUiTheme { get; }
-
-        public AvaHostUiHandler(MainWindow parent)
-        {
-            _parent = parent;
-
-            HostUiTheme = new AvaloniaHostUiTheme(parent);
-        }
-
-        public bool DisplayMessageDialog(ControllerAppletUiArgs args)
-        {
-            string message = LocaleManager.Instance.UpdateAndGetDynamicValue(
-                args.PlayerCountMin == args.PlayerCountMax ? LocaleKeys.DialogControllerAppletMessage : LocaleKeys.DialogControllerAppletMessagePlayerRange,
-                args.PlayerCountMin == args.PlayerCountMax ? args.PlayerCountMin.ToString() : $"{args.PlayerCountMin}-{args.PlayerCountMax}",
-                args.SupportedStyles,
-                string.Join(", ", args.SupportedPlayers),
-                args.IsDocked ? LocaleManager.Instance[LocaleKeys.DialogControllerAppletDockModeSet] : "");
-
-            return DisplayMessageDialog(LocaleManager.Instance[LocaleKeys.DialogControllerAppletTitle], message);
-        }
-
-        public bool DisplayMessageDialog(string title, string message)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool okPressed = false;
-
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                try
-                {
-                    ManualResetEvent deferEvent = new(false);
-
-                    bool opened = false;
-
-                    UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
-                       title,
-                       message,
-                       "",
-                       LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel],
-                       "",
-                       LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
-                       (int)Symbol.Important,
-                       deferEvent,
-                       async (window) =>
-                       {
-                           if (opened)
-                           {
-                               return;
-                           }
-
-                           opened = true;
-
-                           _parent.SettingsWindow = new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager);
-
-                           await _parent.SettingsWindow.ShowDialog(window);
-
-                           opened = false;
-                       });
-
-                    if (response == UserResult.Ok)
-                    {
-                        okPressed = true;
-                    }
-
-                    dialogCloseEvent.Set();
-                }
-                catch (Exception ex)
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogMessageDialogErrorExceptionMessage, ex));
-
-                    dialogCloseEvent.Set();
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-
-            return okPressed;
-        }
-
-        public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool okPressed = false;
-            bool error = false;
-            string inputText = args.InitialText ?? "";
-
-            Dispatcher.UIThread.Post(async () =>
-            {
-                try
-                {
-                    var response = await SwkbdAppletDialog.ShowInputDialog(_parent, LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
-
-                    if (response.Result == UserResult.Ok)
-                    {
-                        inputText = response.Input;
-                        okPressed = true;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    error = true;
-
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage, ex));
-                }
-                finally
-                {
-                    dialogCloseEvent.Set();
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-
-            userText = error ? null : inputText;
-
-            return error || okPressed;
-        }
-
-        public void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value)
-        {
-            device.Configuration.UserChannelPersistence.ExecuteProgram(kind, value);
-            if (_parent.ViewModel.AppHost != null)
-            {
-                _parent.ViewModel.AppHost.Stop();
-            }
-        }
-
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
-        {
-            ManualResetEvent dialogCloseEvent = new(false);
-
-            bool showDetails = false;
-
-            Dispatcher.UIThread.Post(async () =>
-            {
-                try
-                {
-                    ErrorAppletWindow msgDialog = new(_parent, buttons, message)
-                    {
-                        Title = title,
-                        WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                        Width = 400
-                    };
-
-                    object response = await msgDialog.Run();
-
-                    if (response != null && buttons != null && buttons.Length > 1 && (int)response != buttons.Length - 1)
-                    {
-                        showDetails = true;
-                    }
-
-                    dialogCloseEvent.Set();
-
-                    msgDialog.Close();
-                }
-                catch (Exception ex)
-                {
-                    dialogCloseEvent.Set();
-
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogErrorAppletErrorExceptionMessage, ex));
-                }
-            });
-
-            dialogCloseEvent.WaitOne();
-
-            return showDetails;
-        }
-
-        public IDynamicTextInputHandler CreateDynamicTextInputHandler()
-        {
-            return new AvaloniaDynamicTextInputHandler(_parent);
-        }
-    }
-}

Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml

@@ -1,64 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.SwkbdAppletDialog"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Width="400"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Grid
-        Margin="20"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <Image
-            Grid.Row="1"
-            Grid.RowSpan="5"
-            Height="80"
-            MinWidth="50"
-            Margin="5,10,20,10"
-            VerticalAlignment="Center"
-            Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
-        <TextBlock
-            Grid.Row="1"
-            Grid.Column="1"
-            Margin="5"
-            Text="{Binding MainText}"
-            TextWrapping="Wrap" />
-        <TextBlock
-            Grid.Row="2"
-            Grid.Column="1"
-            Margin="5"
-            Text="{Binding SecondaryText}"
-            TextWrapping="Wrap" />
-        <TextBox
-            Name="Input"
-            Grid.Row="3"
-            Grid.Column="1"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Center"
-            KeyUp="Message_KeyUp"
-            Text="{Binding Message}"
-            TextInput="Message_TextInput"
-            TextWrapping="Wrap"
-            UseFloatingWatermark="True" />
-        <TextBlock
-            Name="Error"
-            Grid.Row="4"
-            Grid.Column="1"
-            Margin="5"
-            HorizontalAlignment="Stretch"
-            TextWrapping="Wrap" />
-    </Grid>
-</UserControl>

Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -1,179 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.HLE.HOS.Applets;
-using System;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    internal partial class SwkbdAppletDialog : UserControl
-    {
-        private Predicate<int> _checkLength;
-        private int _inputMax;
-        private int _inputMin;
-        private string _placeholder;
-
-        private ContentDialog _host;
-
-        public SwkbdAppletDialog(string mainText, string secondaryText, string placeholder)
-        {
-            MainText = mainText;
-            SecondaryText = secondaryText;
-            DataContext = this;
-            _placeholder = placeholder;
-            InitializeComponent();
-
-            Input.Watermark = _placeholder;
-
-            Input.AddHandler(TextInputEvent, Message_TextInput, RoutingStrategies.Tunnel, true);
-
-            SetInputLengthValidation(0, int.MaxValue); // Disable by default.
-        }
-
-        public SwkbdAppletDialog()
-        {
-            DataContext = this;
-            InitializeComponent();
-        }
-
-        public string Message { get; set; } = "";
-        public string MainText { get; set; } = "";
-        public string SecondaryText { get; set; } = "";
-
-        public static async Task<(UserResult Result, string Input)> ShowInputDialog(StyleableWindow window, string title, SoftwareKeyboardUiArgs args)
-        {
-            ContentDialog contentDialog = new ContentDialog();
-
-            UserResult result = UserResult.Cancel;
-
-            SwkbdAppletDialog content = new SwkbdAppletDialog(args.HeaderText, args.SubtitleText, args.GuideText)
-            {
-                Message = args.InitialText ?? ""
-            };
-
-            string input = string.Empty;
-
-            var overlay = new ContentDialogOverlayWindow()
-            {
-                Height = window.Bounds.Height,
-                Width = window.Bounds.Width,
-                Position = window.PointToScreen(new Point())
-            };
-
-            window.PositionChanged += OverlayOnPositionChanged;
-
-            void OverlayOnPositionChanged(object sender, PixelPointEventArgs e)
-            {
-                overlay.Position = window.PointToScreen(new Point());
-            }
-
-            contentDialog = overlay.ContentDialog;
-
-            bool opened = false;
-
-            content.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
-
-            content._host = contentDialog;
-            contentDialog.Title = title;
-            contentDialog.PrimaryButtonText = args.SubmitText;
-            contentDialog.IsPrimaryButtonEnabled = content._checkLength(content.Message.Length);
-            contentDialog.SecondaryButtonText = "";
-            contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel];
-            contentDialog.Content = content;
-
-            TypedEventHandler<ContentDialog, ContentDialogClosedEventArgs> handler = (sender, eventArgs) =>
-            {
-                if (eventArgs.Result == ContentDialogResult.Primary)
-                {
-                    result = UserResult.Ok;
-                    input = content.Input.Text;
-                }
-            };
-            contentDialog.Closed += handler;
-
-            overlay.Opened += OverlayOnActivated;
-
-            async void OverlayOnActivated(object sender, EventArgs e)
-            {
-                if (opened)
-                {
-                    return;
-                }
-
-                opened = true;
-
-                overlay.Position = window.PointToScreen(new Point());
-
-                await contentDialog.ShowAsync(overlay);
-                contentDialog.Closed -= handler;
-                overlay.Close();
-            };
-
-            await overlay.ShowDialog(window);
-
-            return (result, input);
-        }
-
-        public void SetInputLengthValidation(int min, int max)
-        {
-            _inputMin = Math.Min(min, max);
-            _inputMax = Math.Max(min, max);
-
-            Error.IsVisible = false;
-            Error.FontStyle = FontStyle.Italic;
-
-            if (_inputMin <= 0 && _inputMax == int.MaxValue) // Disable.
-            {
-                Error.IsVisible = false;
-
-                _checkLength = length => true;
-            }
-            else if (_inputMin > 0 && _inputMax == int.MaxValue)
-            {
-                Error.IsVisible = true;
-
-                Error.Text = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SwkbdMinCharacters, _inputMin);
-
-                _checkLength = length => _inputMin <= length;
-            }
-            else
-            {
-                Error.IsVisible = true;
-
-                Error.Text = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SwkbdMinRangeCharacters, _inputMin, _inputMax);
-
-                _checkLength = length => _inputMin <= length && length <= _inputMax;
-            }
-
-            Message_TextInput(this, new TextInputEventArgs());
-        }
-
-        private void Message_TextInput(object sender, TextInputEventArgs e)
-        {
-            if (_host != null)
-            {
-                _host.IsPrimaryButtonEnabled = _checkLength(Message.Length);
-            }
-        }
-
-        private void Message_KeyUp(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter && _host.IsPrimaryButtonEnabled)
-            {
-                _host.Hide(ContentDialogResult.Primary);
-            }
-            else
-            {
-                _host.IsPrimaryButtonEnabled = _checkLength(Message.Length);
-            }
-        }
-    }
-}

Ryujinx.Ava/UI/Controls/GameGridView.axaml

@@ -1,177 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.GameGridView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    Focusable="True">
-    <UserControl.Resources>
-        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <MenuFlyout x:Key="GameContextMenu">
-            <MenuItem
-                Command="{Binding ToggleFavorite}"
-                Header="{locale:Locale GameListContextMenuToggleFavorite}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
-            <Separator />
-            <MenuItem
-                Command="{Binding OpenUserSaveDirectory}"
-                IsEnabled="{Binding EnabledUserSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenDeviceSaveDirectory}"
-                IsEnabled="{Binding EnabledDeviceSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenBcatSaveDirectory}"
-                IsEnabled="{Binding EnabledBcatSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
-            <Separator />
-            <MenuItem
-                Command="{Binding OpenTitleUpdateManager}"
-                Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
-            <MenuItem
-                Command="{Binding OpenDownloadableContentManager}"
-                Header="{locale:Locale GameListContextMenuManageDlc}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
-            <MenuItem
-                Command="{Binding OpenCheatManager}"
-                Header="{locale:Locale GameListContextMenuManageCheat}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
-            <MenuItem
-                Command="{Binding OpenModsDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenSdModsDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
-            <Separator />
-            <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
-                <MenuItem
-                    Command="{Binding PurgePtcCache}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
-                <MenuItem
-                    Command="{Binding PurgeShaderCache}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
-                <MenuItem
-                    Command="{Binding OpenPtcDirectory}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
-                <MenuItem
-                    Command="{Binding OpenShaderCacheDirectory}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
-            </MenuItem>
-            <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
-                <MenuItem
-                    Command="{Binding ExtractExeFs}"
-                    Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
-                <MenuItem
-                    Command="{Binding ExtractRomFs}"
-                    Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
-                <MenuItem
-                    Command="{Binding ExtractLogo}"
-                    Header="{locale:Locale GameListContextMenuExtractDataLogo}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
-            </MenuItem>
-        </MenuFlyout>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <ListBox
-            Grid.Row="0"
-            Padding="8"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource GameContextMenu}"
-            DoubleTapped="GameList_DoubleTapped"
-            Items="{Binding AppsObservableList}"
-            SelectionChanged="GameList_SelectionChanged">
-            <ListBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <flex:FlexPanel
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        AlignContent="FlexStart"
-                        JustifyContent="Center" />
-                </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-            <ListBox.Styles>
-                <Style Selector="ListBoxItem">
-                    <Setter Property="Margin" Value="5" />
-                    <Setter Property="CornerRadius" Value="4" />
-                </Style>
-                <Style Selector="ListBoxItem:selected /template/ Border#SelectionIndicator">
-                    <Setter Property="MinHeight" Value="{Binding $parent[UserControl].DataContext.GridItemSelectorSize}" />
-                </Style>
-            </ListBox.Styles>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Border
-                            Margin="10"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
-                            Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
-                            Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                            Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                            ClipToBounds="True"
-                            CornerRadius="4">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Image
-                                    Grid.Row="0"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Top"
-                                    Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
-                                <Panel
-                                    Grid.Row="1"
-                                    Height="50"
-                                    Margin="0 10 0 0"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    IsVisible="{Binding $parent[UserControl].DataContext.ShowNames}">
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding TitleName}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap" />
-                                </Panel>
-                            </Grid>
-                        </Border>
-                        <ui:SymbolIcon
-                            Margin="5,5,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            FontSize="16"
-                            Foreground="{DynamicResource SystemAccentColor}"
-                            IsVisible="{Binding Favorite}"
-                            Symbol="StarFilled" />
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-    </Grid>
-</UserControl>

Ryujinx.Ava/UI/Controls/GameGridView.axaml.cs

@@ -1,57 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ui.App.Common;
-using System;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class GameGridView : UserControl
-    {
-        public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
-            RoutedEvent.Register<GameGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
-
-        public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
-        {
-            add    { AddHandler(ApplicationOpenedEvent,    value); }
-            remove { RemoveHandler(ApplicationOpenedEvent, value); }
-        }
-
-        public GameGridView()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public void GameList_DoubleTapped(object sender, RoutedEventArgs args)
-        {
-            if (sender is ListBox listBox)
-            {
-                if (listBox.SelectedItem is ApplicationData selected)
-                {
-                    RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
-                }
-            }
-        }
-
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (sender is ListBox listBox)
-            {
-                (DataContext as MainWindowViewModel).GridSelectedApplication = listBox.SelectedItem as ApplicationData;
-            }
-        }
-
-        private void SearchBox_OnKeyUp(object sender, KeyEventArgs e)
-        {
-            (DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
-        }
-    }
-}

Ryujinx.Ava/UI/Controls/GameListView.axaml

@@ -1,233 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.GameListView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    Focusable="True"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <MenuFlyout x:Key="GameContextMenu">
-            <MenuItem
-                Command="{Binding ToggleFavorite}"
-                Header="{locale:Locale GameListContextMenuToggleFavorite}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
-            <Separator />
-            <MenuItem
-                Command="{Binding OpenUserSaveDirectory}"
-                IsEnabled="{Binding EnabledUserSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenDeviceSaveDirectory}"
-                IsEnabled="{Binding EnabledDeviceSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenBcatSaveDirectory}"
-                IsEnabled="{Binding EnabledBcatSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
-            <Separator />
-            <MenuItem
-                Command="{Binding OpenTitleUpdateManager}"
-                Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
-            <MenuItem
-                Command="{Binding OpenDownloadableContentManager}"
-                Header="{locale:Locale GameListContextMenuManageDlc}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
-            <MenuItem
-                Command="{Binding OpenCheatManager}"
-                Header="{locale:Locale GameListContextMenuManageCheat}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
-            <MenuItem
-                Command="{Binding OpenModsDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
-            <MenuItem
-                Command="{Binding OpenSdModsDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
-            <Separator />
-            <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
-                <MenuItem
-                    Command="{Binding PurgePtcCache}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
-                <MenuItem
-                    Command="{Binding PurgeShaderCache}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
-                <MenuItem
-                    Command="{Binding OpenPtcDirectory}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
-                <MenuItem
-                    Command="{Binding OpenShaderCacheDirectory}"
-                    Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
-            </MenuItem>
-            <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
-                <MenuItem
-                    Command="{Binding ExtractExeFs}"
-                    Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
-                <MenuItem
-                    Command="{Binding ExtractRomFs}"
-                    Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
-                <MenuItem
-                    Command="{Binding ExtractLogo}"
-                    Header="{locale:Locale GameListContextMenuExtractDataLogo}"
-                    ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
-            </MenuItem>
-        </MenuFlyout>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <ListBox
-            Name="GameListBox"
-            Grid.Row="0"
-            Padding="8"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource GameContextMenu}"
-            DoubleTapped="GameList_DoubleTapped"
-            Items="{Binding AppsObservableList}"
-            SelectionChanged="GameList_SelectionChanged">
-            <ListBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Orientation="Vertical"
-                        Spacing="2" />
-                </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-            <ListBox.Styles>
-                <Style Selector="ListBoxItem:selected /template/ Border#SelectionIndicator">
-                    <Setter Property="MinHeight" Value="{Binding $parent[UserControl].DataContext.ListItemSelectorSize}" />
-                </Style>
-            </ListBox.Styles>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Border
-                            Margin="0"
-                            Padding="10"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            ClipToBounds="True"
-                            CornerRadius="5">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="10" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition Width="100" />
-                                </Grid.ColumnDefinitions>
-                                <Image
-                                    Grid.RowSpan="3"
-                                    Grid.Column="0"
-                                    Margin="0"
-                                    Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
-                                    Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
-                                    Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                                    Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                                    Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
-                                <Border
-                                    Grid.Column="2"
-                                    Margin="0,0,5,0"
-                                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                                    BorderThickness="0,0,1,0">
-                                    <StackPanel
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Top"
-                                        Orientation="Vertical"
-                                        Spacing="5">
-                                        <TextBlock
-                                            HorizontalAlignment="Stretch"
-                                            FontWeight="Bold"
-                                            Text="{Binding TitleName}"
-                                            TextAlignment="Left"
-                                            TextWrapping="Wrap" />
-                                        <TextBlock
-                                            HorizontalAlignment="Stretch"
-                                            Text="{Binding Developer}"
-                                            TextAlignment="Left"
-                                            TextWrapping="Wrap" />
-                                        <TextBlock
-                                            HorizontalAlignment="Stretch"
-                                            Text="{Binding Version}"
-                                            TextAlignment="Left"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                </Border>
-                                <StackPanel
-                                    Grid.Column="3"
-                                    Margin="10,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Orientation="Vertical"
-                                    Spacing="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding TitleId}"
-                                        TextAlignment="Left"
-                                        TextWrapping="Wrap" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding FileExtension}"
-                                        TextAlignment="Left"
-                                        TextWrapping="Wrap" />
-                                </StackPanel>
-                                <StackPanel
-                                    Grid.Column="4"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Top"
-                                    Orientation="Vertical"
-                                    Spacing="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding TimePlayed}"
-                                        TextAlignment="Right"
-                                        TextWrapping="Wrap" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayed}"
-                                        TextAlignment="Right"
-                                        TextWrapping="Wrap" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding FileSize}"
-                                        TextAlignment="Right"
-                                        TextWrapping="Wrap" />
-                                </StackPanel>
-                                <ui:SymbolIcon
-                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    Margin="-5,-5,0,0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    FontSize="16"
-                                    Foreground="{DynamicResource SystemAccentColor}"
-                                    IsVisible="{Binding Favorite}"
-                                    Symbol="StarFilled" />
-                            </Grid>
-                        </Border>
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-    </Grid>
-</UserControl>

Ryujinx.Ava/UI/Controls/GameListView.axaml.cs

@@ -1,57 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ui.App.Common;
-using System;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class GameListView : UserControl
-    {
-        public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
-            RoutedEvent.Register<GameGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
-
-        public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
-        {
-            add    { AddHandler(ApplicationOpenedEvent,    value); }
-            remove { RemoveHandler(ApplicationOpenedEvent, value); }
-        }
-
-        public GameListView()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public void GameList_DoubleTapped(object sender, RoutedEventArgs args)
-        {
-            if (sender is ListBox listBox)
-            {
-                if (listBox.SelectedItem is ApplicationData selected)
-                {
-                    RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
-                }
-            }
-        }
-
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (sender is ListBox listBox)
-            {
-                (DataContext as MainWindowViewModel).ListSelectedApplication = listBox.SelectedItem as ApplicationData;
-            }
-        }
-
-        private void SearchBox_OnKeyUp(object sender, KeyEventArgs e)
-        {
-            (DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
-        }
-    }
-}

Ryujinx.Ava/UI/Controls/InputDialog.axaml

@@ -1,32 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.InputDialog"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Grid
-        Margin="5,10,5,5"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Center">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <TextBlock HorizontalAlignment="Center" Text="{Binding Message}" />
-        <TextBox
-            Grid.Row="1"
-            Width="300"
-            Margin="10"
-            HorizontalAlignment="Center"
-            MaxLength="{Binding MaxLength}"
-            Text="{Binding Input, Mode=TwoWay}" />
-        <TextBlock
-            Grid.Row="2"
-            Margin="5,5,5,10"
-            HorizontalAlignment="Center"
-            Text="{Binding SubMessage}" />
-    </Grid>
-</UserControl>

Ryujinx.Ava/UI/Controls/InputDialog.axaml.cs

@@ -1,57 +0,0 @@
-using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class InputDialog : UserControl
-    {
-        public string Message { get; set; }
-        public string Input { get; set; }
-        public string SubMessage { get; set; }
-
-        public uint MaxLength { get; }
-
-        public InputDialog(string message, string input = "", string subMessage = "", uint maxLength = int.MaxValue)
-        {
-            Message = message;
-            Input = input;
-            SubMessage = subMessage;
-            MaxLength = maxLength;
-
-            DataContext = this;
-        }
-
-        public InputDialog()
-        {
-            InitializeComponent();
-        }
-
-        public static async Task<(UserResult Result, string Input)> ShowInputDialog(string title, string message,
-            string input = "", string subMessage = "", uint maxLength = int.MaxValue)
-        {
-            UserResult result = UserResult.Cancel;
-
-            InputDialog content = new InputDialog(message, input, subMessage, maxLength);
-            ContentDialog contentDialog = new ContentDialog
-            {
-                Title = title,
-                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                SecondaryButtonText = "",
-                CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel],
-                Content = content,
-                PrimaryButtonCommand = MiniCommand.Create(() =>
-                {
-                    result = UserResult.Ok;
-                    input = content.Input;
-                })
-            };
-            await contentDialog.ShowAsync();
-
-            return (result, input);
-        }
-    }
-}

Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs

@@ -1,218 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Avalonia.Threading;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using LibHac;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Shim;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Views.User;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class NavigationDialogHost : UserControl
-    {
-        public AccountManager AccountManager { get; }
-        public ContentManager ContentManager { get; }
-        public VirtualFileSystem VirtualFileSystem { get; }
-        public HorizonClient HorizonClient { get; }
-        public UserProfileViewModel ViewModel { get; set; }
-
-        public NavigationDialogHost()
-        {
-            InitializeComponent();
-        }
-
-        public NavigationDialogHost(AccountManager accountManager, ContentManager contentManager,
-            VirtualFileSystem virtualFileSystem, HorizonClient horizonClient)
-        {
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            VirtualFileSystem = virtualFileSystem;
-            HorizonClient = horizonClient;
-            ViewModel = new UserProfileViewModel();
-            LoadProfiles();
-
-            if (contentManager.GetCurrentFirmwareVersion() != null)
-            {
-                Task.Run(() =>
-                {
-                    UserFirmwareAvatarSelectorViewModel.PreloadAvatars(contentManager, virtualFileSystem);
-                });
-            }
-            InitializeComponent();
-        }
-
-        public void GoBack(object parameter = null)
-        {
-            if (ContentFrame.BackStack.Count > 0)
-            {
-                ContentFrame.GoBack();
-            }
-
-            LoadProfiles();
-        }
-
-        public void Navigate(Type sourcePageType, object parameter)
-        {
-            ContentFrame.Navigate(sourcePageType, parameter);
-        }
-
-        public static async Task Show(AccountManager ownerAccountManager, ContentManager ownerContentManager,
-            VirtualFileSystem ownerVirtualFileSystem, HorizonClient ownerHorizonClient)
-        {
-            var content = new NavigationDialogHost(ownerAccountManager, ownerContentManager, ownerVirtualFileSystem, ownerHorizonClient);
-            ContentDialog contentDialog = new ContentDialog
-            {
-                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
-                PrimaryButtonText = "",
-                SecondaryButtonText = "",
-                CloseButtonText = "",
-                Content = content,
-                Padding = new Thickness(0)
-            };
-
-            contentDialog.Closed += (sender, args) =>
-            {
-                content.ViewModel.Dispose();
-            };
-
-            Style footer = new(x => x.Name("DialogSpace").Child().OfType<Border>());
-            footer.Setters.Add(new Setter(IsVisibleProperty, false));
-
-            contentDialog.Styles.Add(footer);
-
-            await contentDialog.ShowAsync();
-        }
-
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTree(e);
-
-            Navigate(typeof(UserSelectorViews), this);
-        }
-
-        public void LoadProfiles()
-        {
-            ViewModel.Profiles.Clear();
-            ViewModel.LostProfiles.Clear();
-
-            var profiles = AccountManager.GetAllUsers().OrderBy(x => x.Name);
-
-            foreach (var profile in profiles)
-            {
-                ViewModel.Profiles.Add(new UserProfile(profile, this));
-            }
-
-            var saveDataFilter = SaveDataFilter.Make(programId: default, saveType: SaveDataType.Account, default, saveDataId: default, index: default);
-
-            using var saveDataIterator = new UniqueRef<SaveDataIterator>();
-
-            HorizonClient.Fs.OpenSaveDataIterator(ref saveDataIterator.Ref(), SaveDataSpaceId.User, in saveDataFilter).ThrowIfFailure();
-
-            Span<SaveDataInfo> saveDataInfo = stackalloc SaveDataInfo[10];
-
-            HashSet<HLE.HOS.Services.Account.Acc.UserId> lostAccounts = new();
-
-            while (true)
-            {
-                saveDataIterator.Get.ReadSaveDataInfo(out long readCount, saveDataInfo).ThrowIfFailure();
-
-                if (readCount == 0)
-                {
-                    break;
-                }
-
-                for (int i = 0; i < readCount; i++)
-                {
-                    var save = saveDataInfo[i];
-                    var id = new HLE.HOS.Services.Account.Acc.UserId((long)save.UserId.Id.Low, (long)save.UserId.Id.High);
-                    if (ViewModel.Profiles.Cast<UserProfile>().FirstOrDefault( x=> x.UserId == id) == null)
-                    {
-                        lostAccounts.Add(id);
-                    }
-                }
-            }
-
-            foreach(var account in lostAccounts)
-            {
-                ViewModel.LostProfiles.Add(new UserProfile(new HLE.HOS.Services.Account.Acc.UserProfile(account, "", null), this));
-            }
-
-            ViewModel.Profiles.Add(new BaseModel());
-        }
-
-        public async void DeleteUser(UserProfile userProfile)
-        {
-            var lastUserId = AccountManager.LastOpenedUser.UserId;
-
-            if (userProfile.UserId == lastUserId)
-            {
-                // If we are deleting the currently open profile, then we must open something else before deleting.
-                var profile = ViewModel.Profiles.Cast<UserProfile>().FirstOrDefault(x => x.UserId != lastUserId);
-
-                if (profile == null)
-                {
-                    async void Action()
-                    {
-                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUserProfileDeletionWarningMessage]);
-                    }
-
-                    Dispatcher.UIThread.Post(Action);
-
-                    return;
-                }
-
-                AccountManager.OpenUser(profile.UserId);
-            }
-
-            var result = await ContentDialogHelper.CreateConfirmationDialog(
-                LocaleManager.Instance[LocaleKeys.DialogUserProfileDeletionConfirmMessage],
-                "",
-                LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                "");
-
-            if (result == UserResult.Yes)
-            {
-                GoBack();
-                AccountManager.DeleteUser(userProfile.UserId);
-            }
-
-            LoadProfiles();
-        }
-
-        public void AddUser()
-        {
-            Navigate(typeof(UserEditorView), (this, (UserProfile)null, true));
-        }
-
-        public void EditUser(UserProfile userProfile)
-        {
-            Navigate(typeof(UserEditorView), (this, userProfile, false));
-        }
-
-        public void RecoverLostAccounts()
-        {
-            Navigate(typeof(UserRecovererView), this);
-        }
-
-        public void ManageSaves()
-        {
-            Navigate(typeof(UserSaveManagerView), (this, AccountManager, HorizonClient, VirtualFileSystem));
-        }
-    }
-}

Ryujinx.Ava/UI/Controls/UpdateWaitWindow.axaml.cs

@@ -1,20 +0,0 @@
-using Avalonia.Controls;
-using Ryujinx.Ava.UI.Windows;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class UpdateWaitWindow : StyleableWindow
-    {
-        public UpdateWaitWindow(string primaryText, string secondaryText) : this()
-        {
-            PrimaryText.Text = primaryText;
-            SecondaryText.Text = secondaryText;
-            WindowStartupLocation = WindowStartupLocation.CenterOwner;
-        }
-
-        public UpdateWaitWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}

Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs

@@ -1,437 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Media;
-using Avalonia.Threading;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    public static class ContentDialogHelper
-    {
-        private static bool _isChoiceDialogOpen;
-
-        public async static Task<UserResult> ShowContentDialog(
-             string title,
-             object content,
-             string primaryButton,
-             string secondaryButton,
-             string closeButton,
-             UserResult primaryButtonResult = UserResult.Ok,
-             ManualResetEvent deferResetEvent = null,
-             Func<Window, Task> doWhileDeferred = null,
-             TypedEventHandler<ContentDialog, ContentDialogButtonClickEventArgs> deferCloseAction = null)
-        {
-            UserResult result = UserResult.None;
-
-            ContentDialog contentDialog = new()
-            {
-                Title               = title,
-                PrimaryButtonText   = primaryButton,
-                SecondaryButtonText = secondaryButton,
-                CloseButtonText     = closeButton,
-                Content             = content
-            };
-
-            contentDialog.PrimaryButtonCommand = MiniCommand.Create(() =>
-            {
-                result = primaryButtonResult;
-            });
-
-            contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
-            {
-                result = UserResult.No;
-                contentDialog.PrimaryButtonClick -= deferCloseAction;
-            });
-
-            contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
-            {
-                result = UserResult.Cancel;
-                contentDialog.PrimaryButtonClick -= deferCloseAction;
-            });
-
-            if (deferResetEvent != null)
-            {
-                contentDialog.PrimaryButtonClick += deferCloseAction;
-            }
-
-            await ShowAsync(contentDialog);
-
-            return result;
-        }
-
-        private async static Task<UserResult> ShowTextDialog(
-            string title,
-            string primaryText,
-            string secondaryText,
-            string primaryButton,
-            string secondaryButton,
-            string closeButton,
-            int iconSymbol,
-            UserResult primaryButtonResult = UserResult.Ok,
-            ManualResetEvent deferResetEvent = null,
-            Func<Window, Task> doWhileDeferred = null,
-            TypedEventHandler<ContentDialog, ContentDialogButtonClickEventArgs> deferCloseAction = null)
-        {
-            Grid content = CreateTextDialogContent(primaryText, secondaryText, iconSymbol);
-
-            return await ShowContentDialog(title, content, primaryButton, secondaryButton, closeButton, primaryButtonResult, deferResetEvent, doWhileDeferred, deferCloseAction);
-        }
-
-        public async static Task<UserResult> ShowDeferredContentDialog(
-            StyleableWindow window,
-            string title,
-            string primaryText,
-            string secondaryText,
-            string primaryButton,
-            string secondaryButton,
-            string closeButton,
-            int iconSymbol,
-            ManualResetEvent deferResetEvent,
-            Func<Window, Task> doWhileDeferred = null)
-        {
-            bool startedDeferring = false;
-            UserResult result = UserResult.None;
-
-            return await ShowTextDialog(
-                title,
-                primaryText,
-                secondaryText,
-                primaryButton,
-                secondaryButton,
-                closeButton,
-                iconSymbol,
-                primaryButton == LocaleManager.Instance[LocaleKeys.InputDialogYes] ? UserResult.Yes : UserResult.Ok,
-                deferResetEvent,
-                doWhileDeferred,
-                DeferClose);
-
-            async void DeferClose(ContentDialog sender, ContentDialogButtonClickEventArgs args)
-            {
-                if (startedDeferring)
-                {
-                    return;
-                }
-
-                sender.PrimaryButtonClick -= DeferClose;
-
-                startedDeferring = true;
-
-                var deferral = args.GetDeferral();
-
-                result = primaryButton == LocaleManager.Instance[LocaleKeys.InputDialogYes] ? UserResult.Yes : UserResult.Ok;
-
-                sender.PrimaryButtonClick -= DeferClose;
-
-                _ = Task.Run(() =>
-                {
-                    deferResetEvent.WaitOne();
-
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        deferral.Complete();
-                    });
-                });
-
-                if (doWhileDeferred != null)
-                {
-                    await doWhileDeferred(window);
-
-                    deferResetEvent.Set();
-                }
-            }
-        }
-
-        private static Grid CreateTextDialogContent(string primaryText, string secondaryText, int symbol)
-        {
-            Grid content = new()
-            {
-                RowDefinitions    = new RowDefinitions()    { new RowDefinition(), new RowDefinition() },
-                ColumnDefinitions = new ColumnDefinitions() { new ColumnDefinition(GridLength.Auto), new ColumnDefinition() },
-
-                MinHeight = 80
-            };
-
-            SymbolIcon icon = new()
-            {
-                Symbol            = (Symbol)symbol,
-                Margin            = new Thickness(10),
-                FontSize          = 40,
-                VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center
-            };
-
-            Grid.SetColumn(icon, 0);
-            Grid.SetRowSpan(icon, 2);
-            Grid.SetRow(icon, 0);
-
-            TextBlock primaryLabel = new()
-            {
-                Text         = primaryText,
-                Margin       = new Thickness(5),
-                TextWrapping = TextWrapping.Wrap,
-                MaxWidth     = 450
-            };
-
-            TextBlock secondaryLabel = new()
-            {
-                Text         = secondaryText,
-                Margin       = new Thickness(5),
-                TextWrapping = TextWrapping.Wrap,
-                MaxWidth     = 450
-            };
-
-            Grid.SetColumn(primaryLabel, 1);
-            Grid.SetColumn(secondaryLabel, 1);
-            Grid.SetRow(primaryLabel, 0);
-            Grid.SetRow(secondaryLabel, 1);
-
-            content.Children.Add(icon);
-            content.Children.Add(primaryLabel);
-            content.Children.Add(secondaryLabel);
-
-            return content;
-        }
-
-        public static async Task<UserResult> CreateInfoDialog(
-            string primary,
-            string secondaryText,
-            string acceptButton,
-            string closeButton,
-            string title)
-        {
-            return await ShowTextDialog(
-                title,
-                primary,
-                secondaryText,
-                acceptButton,
-                "",
-                closeButton,
-                (int)Symbol.Important);
-        }
-
-        internal static async Task<UserResult> CreateConfirmationDialog(
-            string primaryText,
-            string secondaryText,
-            string acceptButtonText,
-            string cancelButtonText,
-            string title,
-            UserResult primaryButtonResult = UserResult.Yes)
-        {
-            return await ShowTextDialog(
-                string.IsNullOrWhiteSpace(title) ? LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle] : title,
-                primaryText,
-                secondaryText,
-                acceptButtonText,
-                "",
-                cancelButtonText,
-                (int)Symbol.Help,
-                primaryButtonResult);
-        }
-
-        internal static UpdateWaitWindow CreateWaitingDialog(string mainText, string secondaryText)
-        {
-            return new(mainText, secondaryText);
-        }
-
-        internal static async Task CreateUpdaterInfoDialog(string primary, string secondaryText)
-        {
-            await ShowTextDialog(
-                LocaleManager.Instance[LocaleKeys.DialogUpdaterTitle],
-                primary,
-                secondaryText,
-                "",
-                "",
-                LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                (int)Symbol.Important);
-        }
-
-        internal static async Task CreateWarningDialog(string primary, string secondaryText)
-        {
-            await ShowTextDialog(
-                LocaleManager.Instance[LocaleKeys.DialogWarningTitle],
-                primary,
-                secondaryText,
-                "",
-                "",
-                LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                (int)Symbol.Important);
-        }
-
-        internal static async Task CreateErrorDialog(string errorMessage, string secondaryErrorMessage = "")
-        {
-            Logger.Error?.Print(LogClass.Application, errorMessage);
-
-            await ShowTextDialog(
-                LocaleManager.Instance[LocaleKeys.DialogErrorTitle],
-                LocaleManager.Instance[LocaleKeys.DialogErrorMessage],
-                errorMessage,
-                secondaryErrorMessage,
-                "",
-                LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                (int)Symbol.Dismiss);
-        }
-
-        internal static async Task<bool> CreateChoiceDialog(string title, string primary, string secondaryText)
-        {
-            if (_isChoiceDialogOpen)
-            {
-                return false;
-            }
-
-            _isChoiceDialogOpen = true;
-
-            UserResult response = await ShowTextDialog(
-                title,
-                primary,
-                secondaryText,
-                LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                "",
-                LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                (int)Symbol.Help,
-                UserResult.Yes);
-
-            _isChoiceDialogOpen = false;
-
-            return response == UserResult.Yes;
-        }
-
-        internal static async Task<bool> CreateExitDialog()
-        {
-            return await CreateChoiceDialog(
-                LocaleManager.Instance[LocaleKeys.DialogExitTitle],
-                LocaleManager.Instance[LocaleKeys.DialogExitMessage],
-                LocaleManager.Instance[LocaleKeys.DialogExitSubMessage]);
-        }
-
-        internal static async Task<bool> CreateStopEmulationDialog()
-        {
-            return await CreateChoiceDialog(
-                LocaleManager.Instance[LocaleKeys.DialogStopEmulationTitle],
-                LocaleManager.Instance[LocaleKeys.DialogStopEmulationMessage],
-                LocaleManager.Instance[LocaleKeys.DialogExitSubMessage]);
-        }
-
-        internal static async Task<string> CreateInputDialog(
-            string title,
-            string mainText,
-            string subText,
-            uint maxLength = int.MaxValue,
-            string input = "")
-        {
-            var result = await InputDialog.ShowInputDialog(
-                title,
-                mainText,
-                input,
-                subText,
-                maxLength);
-
-            if (result.Result == UserResult.Ok)
-            {
-                return result.Input;
-            }
-
-            return string.Empty;
-        }
-
-        public static async Task<ContentDialogResult> ShowAsync(ContentDialog contentDialog)
-        {
-            ContentDialogResult result;
-
-            ContentDialogOverlayWindow contentDialogOverlayWindow = null;
-
-            Window parent = GetMainWindow();
-
-            if (parent != null && parent.IsActive && parent is MainWindow window && window.ViewModel.IsGameRunning)
-            {
-                contentDialogOverlayWindow = new()
-                {
-                    Height        = parent.Bounds.Height,
-                    Width         = parent.Bounds.Width,
-                    Position      = parent.PointToScreen(new Point()),
-                    ShowInTaskbar = false
-                };
-
-                parent.PositionChanged += OverlayOnPositionChanged;
-
-                void OverlayOnPositionChanged(object sender, PixelPointEventArgs e)
-                {
-                    contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
-                }
-
-                contentDialogOverlayWindow.ContentDialog = contentDialog;
-
-                bool opened = false;
-
-                contentDialogOverlayWindow.Opened += OverlayOnActivated;
-
-                async void OverlayOnActivated(object sender, EventArgs e)
-                {
-                    if (opened)
-                    {
-                        return;
-                    }
-
-                    opened = true;
-
-                    contentDialogOverlayWindow.Position = parent.PointToScreen(new Point());
-
-                    result = await ShowDialog();
-                }
-
-                result = await contentDialogOverlayWindow.ShowDialog<ContentDialogResult>(parent);
-            }
-            else
-            {
-                result = await ShowDialog();
-            }
-
-            async Task<ContentDialogResult> ShowDialog()
-            {
-                if (contentDialogOverlayWindow is not null)
-                {
-                    result = await contentDialog.ShowAsync(contentDialogOverlayWindow);
-
-                    contentDialogOverlayWindow!.Close();
-                }
-                else
-                {
-                    result = await contentDialog.ShowAsync();
-                }
-
-                return result;
-            }
-
-            if (contentDialogOverlayWindow is not null)
-            {
-                contentDialogOverlayWindow.Content = null;
-                contentDialogOverlayWindow.Close();
-            }
-
-            return result;
-        }
-
-        private static Window GetMainWindow()
-        {
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime al)
-            {
-                foreach (Window item in al.Windows)
-                {
-                    if (item.IsActive && item is MainWindow window)
-                    {
-                        return window;
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}

Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs

@@ -1,115 +0,0 @@
-using Avalonia.Utilities;
-using System;
-using System.Text;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    using AvaLogger   = Avalonia.Logging.Logger;
-    using AvaLogLevel = Avalonia.Logging.LogEventLevel;
-    using RyuLogger   = Ryujinx.Common.Logging.Logger;
-    using RyuLogClass = Ryujinx.Common.Logging.LogClass;
-
-    internal class LoggerAdapter : Avalonia.Logging.ILogSink
-    {
-        public static void Register()
-        {
-            AvaLogger.Sink = new LoggerAdapter();
-        }
-
-        private static RyuLogger.Log? GetLog(AvaLogLevel level)
-        {
-            return level switch
-            {
-                AvaLogLevel.Verbose     => RyuLogger.Debug,
-                AvaLogLevel.Debug       => RyuLogger.Debug,
-                AvaLogLevel.Information => RyuLogger.Debug,
-                AvaLogLevel.Warning     => RyuLogger.Debug,
-                AvaLogLevel.Error       => RyuLogger.Error,
-                AvaLogLevel.Fatal       => RyuLogger.Error,
-                _ => throw new ArgumentOutOfRangeException(nameof(level), level, null)
-            };
-        }
-
-        public bool IsEnabled(AvaLogLevel level, string area)
-        {
-            return GetLog(level) != null;
-        }
-
-        public void Log(AvaLogLevel level, string area, object source, string messageTemplate)
-        {
-            GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, null));
-        }
-
-        public void Log<T0>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0)
-        {
-            GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0 }));
-        }
-
-        public void Log<T0, T1>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0,  T1 propertyValue1)
-        {
-            GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0, propertyValue1 }));
-        }
-
-        public void Log<T0, T1, T2>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
-        {
-            GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0, propertyValue1, propertyValue2 }));
-        }
-
-        public void Log(AvaLogLevel level, string area, object source, string messageTemplate, params object[] propertyValues)
-        {
-            GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, propertyValues));
-        }
-
-        private static string Format(AvaLogLevel level, string area, string template, object source, object[] v)
-        {
-            var result = new StringBuilder();
-            var r = new CharacterReader(template.AsSpan());
-            int i = 0;
-
-            result.Append('[');
-            result.Append(level);
-            result.Append("] ");
-
-            result.Append('[');
-            result.Append(area);
-            result.Append("] ");
-
-            while (!r.End)
-            {
-                var c = r.Take();
-
-                if (c != '{')
-                {
-                    result.Append(c);
-                }
-                else
-                {
-                    if (r.Peek != '{')
-                    {
-                        result.Append('\'');
-                        result.Append(i < v.Length ? v[i++] : null);
-                        result.Append('\'');
-                        r.TakeUntil('}');
-                        r.Take();
-                    }
-                    else
-                    {
-                        result.Append('{');
-                        r.Take();
-                    }
-                }
-            }
-
-            if (source != null)
-            {
-                result.Append(" (");
-                result.Append(source.GetType().Name);
-                result.Append(" #");
-                result.Append(source.GetHashCode());
-                result.Append(')');
-            }
-
-            return result.ToString();
-        }
-    }
-}

Ryujinx.Ava/UI/Models/Amiibo.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.UI.Models
-{
-    public class Amiibo
-    {
-        public struct AmiiboJson
-        {
-            [JsonPropertyName("amiibo")] public List<AmiiboApi> Amiibo { get; set; }
-            [JsonPropertyName("lastUpdated")] public DateTime LastUpdated { get; set; }
-        }
-
-        public struct AmiiboApi
-        {
-            [JsonPropertyName("name")] public string Name { get; set; }
-            [JsonPropertyName("head")] public string Head { get; set; }
-            [JsonPropertyName("tail")] public string Tail { get; set; }
-            [JsonPropertyName("image")] public string Image { get; set; }
-            [JsonPropertyName("amiiboSeries")] public string AmiiboSeries { get; set; }
-            [JsonPropertyName("character")] public string Character { get; set; }
-            [JsonPropertyName("gameSeries")] public string GameSeries { get; set; }
-            [JsonPropertyName("type")] public string Type { get; set; }
-
-            [JsonPropertyName("release")] public Dictionary<string, string> Release { get; set; }
-
-            [JsonPropertyName("gamesSwitch")] public List<AmiiboApiGamesSwitch> GamesSwitch { get; set; }
-
-            public override string ToString()
-            {
-                return Name;
-            }
-
-            public string GetId()
-            {
-                return Head + Tail;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is AmiiboApi amiibo)
-                {
-                    return amiibo.Head + amiibo.Tail == Head + Tail;
-                }
-
-                return false;
-            }
-
-            public override int GetHashCode()
-            {
-                return base.GetHashCode();
-            }
-        }
-
-        public class AmiiboApiGamesSwitch
-        {
-            [JsonPropertyName("amiiboUsage")] public List<AmiiboApiUsage> AmiiboUsage { get; set; }
-
-            [JsonPropertyName("gameID")] public List<string> GameId { get; set; }
-
-            [JsonPropertyName("gameName")] public string GameName { get; set; }
-        }
-
-        public class AmiiboApiUsage
-        {
-            [JsonPropertyName("Usage")] public string Usage { get; set; }
-
-            [JsonPropertyName("write")] public bool Write { get; set; }
-        }
-    }
-}

Ryujinx.Ava/UI/Models/DownloadableContentModel.cs

@@ -1,32 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-
-namespace Ryujinx.Ava.UI.Models
-{
-    public class DownloadableContentModel : BaseModel
-    {
-        private bool _enabled;
-
-        public bool Enabled
-        {
-            get => _enabled;
-            set
-            {
-                _enabled = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string TitleId       { get; }
-        public string ContainerPath { get; }
-        public string FullPath      { get; }
-
-        public DownloadableContentModel(string titleId, string containerPath, string fullPath, bool enabled)
-        {
-            TitleId       = titleId;
-            ContainerPath = containerPath;
-            FullPath      = fullPath;
-            Enabled       = enabled;
-        }
-    }
-}

Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs

@@ -1,33 +0,0 @@
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ui.App.Common;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.UI.Models.Generic
-{
-    internal class LastPlayedSortComparer : IComparer<ApplicationData>
-    {
-        public LastPlayedSortComparer() { }
-        public LastPlayedSortComparer(bool isAscending) { IsAscending = isAscending; }
-
-        public bool IsAscending { get; }
-
-        public int Compare(ApplicationData x, ApplicationData y)
-        {
-            string aValue = x.LastPlayed;
-            string bValue = y.LastPlayed;
-
-            if (aValue == LocaleManager.Instance[LocaleKeys.Never])
-            {
-                aValue = DateTime.UnixEpoch.ToString();
-            }
-
-            if (bValue == LocaleManager.Instance[LocaleKeys.Never])
-            {
-                bValue = DateTime.UnixEpoch.ToString();
-            }
-
-            return (IsAscending ? 1 : -1) * DateTime.Compare(DateTime.Parse(bValue), DateTime.Parse(aValue));
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/AboutWindowViewModel.cs

@@ -1,133 +0,0 @@
-using Avalonia;
-using Avalonia.Media.Imaging;
-using Avalonia.Threading;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Common.Utilities;
-using Ryujinx.Ui.Common.Configuration;
-using System;
-using System.Net.Http;
-using System.Net.NetworkInformation;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class AboutWindowViewModel : BaseModel
-    {
-        private Bitmap _githubLogo;
-        private Bitmap _discordLogo;
-        private Bitmap _patreonLogo;
-        private Bitmap _twitterLogo;
-
-        private string _version;
-        private string _supporters;
-
-        public Bitmap GithubLogo
-        {
-            get => _githubLogo;
-            set
-            {
-                _githubLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap DiscordLogo
-        {
-            get => _discordLogo;
-            set
-            {
-                _discordLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap PatreonLogo
-        {
-            get => _patreonLogo;
-            set
-            {
-                _patreonLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap TwitterLogo
-        {
-            get => _twitterLogo;
-            set
-            {
-                _twitterLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Supporters
-        {
-            get => _supporters;
-            set
-            {
-                _supporters = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Version
-        {
-            get => _version;
-            set
-            {
-                _version = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Developers => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.AboutPageDeveloperListMore, "gdkchan, Ac_K, marysaka, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, GoffyDude, TSRBerry, IsaacMarovitz");
-
-        public AboutWindowViewModel()
-        {
-            Version = Program.Version;
-
-            var assets = AvaloniaLocator.Current.GetService<Avalonia.Platform.IAssetLoader>();
-
-            if (ConfigurationState.Instance.Ui.BaseStyle.Value == "Light")
-            {
-                GithubLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_GitHub_Light.png?assembly=Ryujinx.Ui.Common")));
-                DiscordLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Discord_Light.png?assembly=Ryujinx.Ui.Common")));
-                PatreonLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Patreon_Light.png?assembly=Ryujinx.Ui.Common")));
-                TwitterLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Twitter_Light.png?assembly=Ryujinx.Ui.Common")));
-            }
-            else
-            {
-                GithubLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_GitHub_Dark.png?assembly=Ryujinx.Ui.Common")));
-                DiscordLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Discord_Dark.png?assembly=Ryujinx.Ui.Common")));
-                PatreonLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Patreon_Dark.png?assembly=Ryujinx.Ui.Common")));
-                TwitterLogo = new Bitmap(assets.Open(new Uri("resm:Ryujinx.Ui.Common.Resources.Logo_Twitter_Dark.png?assembly=Ryujinx.Ui.Common")));
-            }
-
-            Dispatcher.UIThread.InvokeAsync(DownloadPatronsJson);
-        }
-
-        private async Task DownloadPatronsJson()
-        {
-            if (!NetworkInterface.GetIsNetworkAvailable())
-            {
-                Supporters = LocaleManager.Instance[LocaleKeys.ConnectionError];
-
-                return;
-            }
-
-            HttpClient httpClient = new();
-
-            try
-            {
-                string patreonJsonString = await httpClient.GetStringAsync("https://patreon.ryujinx.org/");
-
-                Supporters = string.Join(", ", JsonHelper.Deserialize<string[]>(patreonJsonString)) + "\n\n";
-            }
-            catch
-            {
-                Supporters = LocaleManager.Instance[LocaleKeys.ApiError];
-            }
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -1,452 +0,0 @@
-using Avalonia;
-using Avalonia.Collections;
-using Avalonia.Media.Imaging;
-using Avalonia.Threading;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class AmiiboWindowViewModel : BaseModel, IDisposable
-    {
-        private const string DefaultJson = "{ \"amiibo\": [] }";
-        private const float AmiiboImageSize = 350f;
-
-        private readonly string _amiiboJsonPath;
-        private readonly byte[] _amiiboLogoBytes;
-        private readonly HttpClient _httpClient;
-        private readonly StyleableWindow _owner;
-        
-        private Bitmap _amiiboImage;
-        private List<Amiibo.AmiiboApi> _amiiboList;
-        private AvaloniaList<Amiibo.AmiiboApi> _amiibos;
-        private ObservableCollection<string> _amiiboSeries;
-
-        private int _amiiboSelectedIndex;
-        private int _seriesSelectedIndex;
-        private bool _enableScanning;
-        private bool _showAllAmiibo;
-        private bool _useRandomUuid;
-        private string _usage;
-
-        public AmiiboWindowViewModel(StyleableWindow owner, string lastScannedAmiiboId, string titleId)
-        {
-            _owner = owner;
-            _httpClient = new HttpClient { Timeout = TimeSpan.FromMilliseconds(5000) };
-            LastScannedAmiiboId = lastScannedAmiiboId;
-            TitleId = titleId;
-
-            Directory.CreateDirectory(Path.Join(AppDataManager.BaseDirPath, "system", "amiibo"));
-
-            _amiiboJsonPath = Path.Join(AppDataManager.BaseDirPath, "system", "amiibo", "Amiibo.json");
-            _amiiboList = new List<Amiibo.AmiiboApi>();
-            _amiiboSeries = new ObservableCollection<string>();
-            _amiibos = new AvaloniaList<Amiibo.AmiiboApi>();
-
-            _amiiboLogoBytes = EmbeddedResources.Read("Ryujinx.Ui.Common/Resources/Logo_Amiibo.png");
-
-            _ = LoadContentAsync();
-        }
-
-        public AmiiboWindowViewModel() { }
-
-        public string TitleId { get; set; }
-        public string LastScannedAmiiboId { get; set; }
-
-        public UserResult Response { get; private set; }
-
-        public bool UseRandomUuid
-        {
-            get => _useRandomUuid;
-            set
-            {
-                _useRandomUuid = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowAllAmiibo
-        {
-            get => _showAllAmiibo;
-            set
-            {
-                _showAllAmiibo = value;
-
-#pragma warning disable 4014
-                ParseAmiiboData();
-#pragma warning restore 4014
-
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<Amiibo.AmiiboApi> AmiiboList
-        {
-            get => _amiibos;
-            set
-            {
-                _amiibos = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public ObservableCollection<string> AmiiboSeries
-        {
-            get => _amiiboSeries;
-            set
-            {
-                _amiiboSeries = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public int SeriesSelectedIndex
-        {
-            get => _seriesSelectedIndex;
-            set
-            {
-                _seriesSelectedIndex = value;
-
-                FilterAmiibo();
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int AmiiboSelectedIndex
-        {
-            get => _amiiboSelectedIndex;
-            set
-            {
-                _amiiboSelectedIndex = value;
-
-                EnableScanning = _amiiboSelectedIndex >= 0 && _amiiboSelectedIndex < _amiibos.Count;
-
-                SetAmiiboDetails();
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap AmiiboImage
-        {
-            get => _amiiboImage;
-            set
-            {
-                _amiiboImage = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string Usage
-        {
-            get => _usage;
-            set
-            {
-                _usage = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool EnableScanning
-        {
-            get => _enableScanning;
-            set
-            {
-                _enableScanning = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public void Dispose()
-        {
-            _httpClient.Dispose();
-        }
-
-        private async Task LoadContentAsync()
-        {
-            string amiiboJsonString = DefaultJson;
-
-            if (File.Exists(_amiiboJsonPath))
-            {
-                amiiboJsonString = File.ReadAllText(_amiiboJsonPath);
-
-                if (await NeedsUpdate(JsonHelper.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).LastUpdated))
-                {
-                    amiiboJsonString = await DownloadAmiiboJson();
-                }
-            }
-            else
-            {
-                try
-                {
-                    amiiboJsonString = await DownloadAmiiboJson();
-                }
-                catch
-                {
-                    ShowInfoDialog();
-                }
-            }
-
-            _amiiboList = JsonHelper.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).Amiibo;
-            _amiiboList = _amiiboList.OrderBy(amiibo => amiibo.AmiiboSeries).ToList();
-
-            ParseAmiiboData();
-        }
-
-        private void ParseAmiiboData()
-        {
-            _amiiboSeries.Clear();
-            _amiibos.Clear();
-
-            for (int i = 0; i < _amiiboList.Count; i++)
-            {
-                if (!_amiiboSeries.Contains(_amiiboList[i].AmiiboSeries))
-                {
-                    if (!ShowAllAmiibo)
-                    {
-                        foreach (Amiibo.AmiiboApiGamesSwitch game in _amiiboList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    AmiiboSeries.Add(_amiiboList[i].AmiiboSeries);
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AmiiboSeries.Add(_amiiboList[i].AmiiboSeries);
-                    }
-                }
-            }
-
-            if (LastScannedAmiiboId != "")
-            {
-                SelectLastScannedAmiibo();
-            }
-            else
-            {
-                SeriesSelectedIndex = 0;
-            }
-        }
-
-        private void SelectLastScannedAmiibo()
-        {
-            Amiibo.AmiiboApi scanned = _amiiboList.FirstOrDefault(amiibo => amiibo.GetId() == LastScannedAmiiboId);
-
-            SeriesSelectedIndex = AmiiboSeries.IndexOf(scanned.AmiiboSeries);
-            AmiiboSelectedIndex = AmiiboList.IndexOf(scanned);
-        }
-
-        private void FilterAmiibo()
-        {
-            _amiibos.Clear();
-
-            if (_seriesSelectedIndex < 0)
-            {
-                return;
-            }
-
-            List<Amiibo.AmiiboApi> amiiboSortedList = _amiiboList
-                .Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex])
-                .OrderBy(amiibo => amiibo.Name).ToList();
-
-            for (int i = 0; i < amiiboSortedList.Count; i++)
-            {
-                if (!_amiibos.Contains(amiiboSortedList[i]))
-                {
-                    if (!_showAllAmiibo)
-                    {
-                        foreach (Amiibo.AmiiboApiGamesSwitch game in amiiboSortedList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    _amiibos.Add(amiiboSortedList[i]);
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        _amiibos.Add(amiiboSortedList[i]);
-                    }
-                }
-            }
-
-            AmiiboSelectedIndex = 0;
-        }
-
-        private void SetAmiiboDetails()
-        {
-            ResetAmiiboPreview();
-
-            Usage = string.Empty;
-
-            if (_amiiboSelectedIndex < 0)
-            {
-                return;
-            }
-
-            Amiibo.AmiiboApi selected = _amiibos[_amiiboSelectedIndex];
-
-            string imageUrl = _amiiboList.FirstOrDefault(amiibo => amiibo.Equals(selected)).Image;
-
-            string usageString = "";
-
-            for (int i = 0; i < _amiiboList.Count; i++)
-            {
-                if (_amiiboList[i].Equals(selected))
-                {
-                    bool writable = false;
-
-                    foreach (Amiibo.AmiiboApiGamesSwitch item in _amiiboList[i].GamesSwitch)
-                    {
-                        if (item.GameId.Contains(TitleId))
-                        {
-                            foreach (Amiibo.AmiiboApiUsage usageItem in item.AmiiboUsage)
-                            {
-                                usageString += Environment.NewLine +
-                                               $"- {usageItem.Usage.Replace("/", Environment.NewLine + "-")}";
-
-                                writable = usageItem.Write;
-                            }
-                        }
-                    }
-
-                    if (usageString.Length == 0)
-                    {
-                        usageString = LocaleManager.Instance[LocaleKeys.Unknown] + ".";
-                    }
-
-                    Usage = $"{LocaleManager.Instance[LocaleKeys.Usage]} {(writable ? $" ({LocaleManager.Instance[LocaleKeys.Writable]})" : "")} : {usageString}";
-                }
-            }
-
-            _ = UpdateAmiiboPreview(imageUrl);
-        }
-
-        private async Task<bool> NeedsUpdate(DateTime oldLastModified)
-        {
-            try
-            {
-                HttpResponseMessage response =
-                    await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://amiibo.ryujinx.org/"));
-
-                if (response.IsSuccessStatusCode)
-                {
-                    return response.Content.Headers.LastModified != oldLastModified;
-                }
-
-                return false;
-            }
-            catch
-            {
-                ShowInfoDialog();
-
-                return false;
-            }
-        }
-
-        private async Task<string> DownloadAmiiboJson()
-        {
-            HttpResponseMessage response = await _httpClient.GetAsync("https://amiibo.ryujinx.org/");
-
-            if (response.IsSuccessStatusCode)
-            {
-                string amiiboJsonString = await response.Content.ReadAsStringAsync();
-
-                using (FileStream amiiboJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough))
-                {
-                    amiiboJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString));
-                }
-
-                return amiiboJsonString;
-            }
-
-            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
-                LocaleManager.Instance[LocaleKeys.DialogAmiiboApiFailFetchMessage],
-                LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                "",
-                LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
-
-            Close();
-
-            return DefaultJson;
-        }
-
-        private void Close()
-        {
-            Dispatcher.UIThread.Post(_owner.Close);
-        }
-
-        private async Task UpdateAmiiboPreview(string imageUrl)
-        {
-            HttpResponseMessage response = await _httpClient.GetAsync(imageUrl);
-
-            if (response.IsSuccessStatusCode)
-            {
-                byte[] amiiboPreviewBytes = await response.Content.ReadAsByteArrayAsync();
-                using (MemoryStream memoryStream = new(amiiboPreviewBytes))
-                {
-                    Bitmap bitmap = new(memoryStream);
-
-                    double ratio = Math.Min(AmiiboImageSize / bitmap.Size.Width,
-                        AmiiboImageSize / bitmap.Size.Height);
-
-                    int resizeHeight = (int)(bitmap.Size.Height * ratio);
-                    int resizeWidth = (int)(bitmap.Size.Width * ratio);
-
-                    AmiiboImage = bitmap.CreateScaledBitmap(new PixelSize(resizeWidth, resizeHeight));
-                }
-            }
-        }
-
-        private void ResetAmiiboPreview()
-        {
-            using (MemoryStream memoryStream = new(_amiiboLogoBytes))
-            {
-                Bitmap bitmap = new(memoryStream);
-
-                AmiiboImage = bitmap;
-            }
-        }
-
-        private async void ShowInfoDialog()
-        {
-            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
-                LocaleManager.Instance[LocaleKeys.DialogAmiiboApiConnectErrorMessage],
-                LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                "",
-                LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/AvatarProfileViewModel.cs

@@ -1,363 +0,0 @@
-using Avalonia.Media;
-using DynamicData;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
-using LibHac.Ncm;
-using LibHac.Tools.Fs;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.HLE.FileSystem;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Color = Avalonia.Media.Color;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    internal class AvatarProfileViewModel : BaseModel, IDisposable
-    {
-        private const int MaxImageTasks = 4;
-        
-        private static readonly Dictionary<string, byte[]> _avatarStore = new();
-        private static bool _isPreloading;
-        private static Action _loadCompleteAction;
-
-        private ObservableCollection<ProfileImageModel> _images;
-        private Color _backgroundColor = Colors.White;
-
-        private int _selectedIndex;
-        private int _imagesLoaded;
-        private bool _isActive;
-        private byte[] _selectedImage;
-        private bool _isIndeterminate = true;
-
-        public bool IsActive
-        {
-            get => _isActive;
-            set => _isActive = value;
-        }
-
-        public AvatarProfileViewModel()
-        {
-            _images = new ObservableCollection<ProfileImageModel>();
-        }
-        
-        public AvatarProfileViewModel(Action loadCompleteAction)
-        {
-            _images = new ObservableCollection<ProfileImageModel>();
-
-            if (_isPreloading)
-            {
-                _loadCompleteAction = loadCompleteAction;
-            }
-            else
-            {
-                ReloadImages();
-            }
-        }
-
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set
-            {
-                _backgroundColor = value;
-
-                IsActive = false;
-                
-                ReloadImages();
-            }
-        }
-
-        public ObservableCollection<ProfileImageModel> Images
-        {
-            get => _images;
-            set
-            {
-                _images = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsIndeterminate
-        {
-            get => _isIndeterminate;
-            set
-            {
-                _isIndeterminate = value;
-                
-                OnPropertyChanged();
-            }
-        }
-
-        public int ImageCount => _avatarStore.Count;
-
-        public int ImagesLoaded
-        {
-            get => _imagesLoaded;
-            set
-            {
-                _imagesLoaded = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public int SelectedIndex
-        {
-            get => _selectedIndex;
-            set
-            {
-                _selectedIndex = value;
-
-                if (_selectedIndex == -1)
-                {
-                    SelectedImage = null;
-                }
-                else
-                {
-                    SelectedImage = _images[_selectedIndex].Data;
-                }
-
-                OnPropertyChanged();
-            }
-        }
-
-        public byte[] SelectedImage
-        {
-            get => _selectedImage;
-            private set => _selectedImage = value;
-        }
-
-        public void ReloadImages()
-        {
-            if (_isPreloading)
-            {
-                IsIndeterminate = false;
-                return;
-            }
-            Task.Run(() =>
-            {
-                IsActive = true;
-
-                Images.Clear();
-                int selectedIndex = _selectedIndex;
-                int index = 0;
-                
-                ImagesLoaded = 0;
-                IsIndeterminate = false;
-
-                var keys = _avatarStore.Keys.ToList();
-
-                var newImages = new List<ProfileImageModel>();
-                var tasks = new List<Task>();
-
-                for (int i = 0; i < MaxImageTasks; i++)
-                {
-                    var start = i;
-                    tasks.Add(Task.Run(() => ImageTask(start)));
-                }
-
-                Task.WaitAll(tasks.ToArray());
-                
-                Images.AddRange(newImages);
-
-                void ImageTask(int start)
-                {
-                    for (int i = start; i < keys.Count; i += MaxImageTasks)
-                    {
-                        if (!IsActive)
-                        {
-                            return;
-                        }
-
-                        var key = keys[i];
-                        var image = _avatarStore[keys[i]];
-
-                        var data = ProcessImage(image);
-                        newImages.Add(new ProfileImageModel(key, data));
-                        if (index++ == selectedIndex)
-                        {
-                            SelectedImage = data;
-                        }
-
-                        Interlocked.Increment(ref _imagesLoaded);
-                        OnPropertyChanged(nameof(ImagesLoaded));
-                    }
-                }
-            });
-        }
-
-        private byte[] ProcessImage(byte[] data)
-        {
-            using (MemoryStream streamJpg = new())
-            {
-                Image avatarImage = Image.Load(data, new PngDecoder());
-
-                avatarImage.Mutate(x => x.BackgroundColor(new Rgba32(BackgroundColor.R,
-                    BackgroundColor.G,
-                    BackgroundColor.B,
-                    BackgroundColor.A)));
-                avatarImage.SaveAsJpeg(streamJpg);
-
-                return streamJpg.ToArray();
-            }
-        }
-
-        public static void PreloadAvatars(ContentManager contentManager, VirtualFileSystem virtualFileSystem)
-        {
-            try
-            {
-                if (_avatarStore.Count > 0)
-                {
-                    return;
-                }
-
-                _isPreloading = true;
-
-                string contentPath =
-                    contentManager.GetInstalledContentPath(0x010000000000080A, StorageId.BuiltInSystem,
-                        NcaContentType.Data);
-                string avatarPath = virtualFileSystem.SwitchPathToSystemPath(contentPath);
-
-                if (!string.IsNullOrWhiteSpace(avatarPath))
-                {
-                    using (IStorage ncaFileStream = new LocalStorage(avatarPath, FileAccess.Read, FileMode.Open))
-                    {
-                        Nca nca = new(virtualFileSystem.KeySet, ncaFileStream);
-                        IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
-
-                        foreach (DirectoryEntryEx item in romfs.EnumerateEntries())
-                        {
-                            // TODO: Parse DatabaseInfo.bin and table.bin files for more accuracy.
-                            if (item.Type == DirectoryEntryType.File && item.FullPath.Contains("chara") &&
-                                item.FullPath.Contains("szs"))
-                            {
-                                using var file = new UniqueRef<IFile>();
-
-                                romfs.OpenFile(ref file.Ref(), ("/" + item.FullPath).ToU8Span(), OpenMode.Read)
-                                    .ThrowIfFailure();
-
-                                using (MemoryStream stream = new())
-                                using (MemoryStream streamPng = new())
-                                {
-                                    file.Get.AsStream().CopyTo(stream);
-
-                                    stream.Position = 0;
-
-                                    Image avatarImage = Image.LoadPixelData<Rgba32>(DecompressYaz0(stream), 256, 256);
-
-                                    avatarImage.SaveAsPng(streamPng);
-
-                                    _avatarStore.Add(item.FullPath, streamPng.ToArray());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            finally
-            {
-                _isPreloading = false;
-                _loadCompleteAction?.Invoke();
-            }
-        }
-
-        private static byte[] DecompressYaz0(Stream stream)
-        {
-            using (BinaryReader reader = new(stream))
-            {
-                reader.ReadInt32(); // Magic
-
-                uint decodedLength = BinaryPrimitives.ReverseEndianness(reader.ReadUInt32());
-
-                reader.ReadInt64(); // Padding
-
-                byte[] input = new byte[stream.Length - stream.Position];
-                stream.Read(input, 0, input.Length);
-
-                uint inputOffset = 0;
-
-                byte[] output = new byte[decodedLength];
-                uint outputOffset = 0;
-
-                ushort mask = 0;
-                byte header = 0;
-
-                while (outputOffset < decodedLength)
-                {
-                    if ((mask >>= 1) == 0)
-                    {
-                        header = input[inputOffset++];
-                        mask = 0x80;
-                    }
-
-                    if ((header & mask) != 0)
-                    {
-                        if (outputOffset == output.Length)
-                        {
-                            break;
-                        }
-
-                        output[outputOffset++] = input[inputOffset++];
-                    }
-                    else
-                    {
-                        byte byte1 = input[inputOffset++];
-                        byte byte2 = input[inputOffset++];
-
-                        uint dist = (uint)((byte1 & 0xF) << 8) | byte2;
-                        uint position = outputOffset - (dist + 1);
-
-                        uint length = (uint)byte1 >> 4;
-                        if (length == 0)
-                        {
-                            length = (uint)input[inputOffset++] + 0x12;
-                        }
-                        else
-                        {
-                            length += 2;
-                        }
-
-                        uint gap = outputOffset - position;
-                        uint nonOverlappingLength = length;
-
-                        if (nonOverlappingLength > gap)
-                        {
-                            nonOverlappingLength = gap;
-                        }
-
-                        Buffer.BlockCopy(output, (int)position, output, (int)outputOffset, (int)nonOverlappingLength);
-                        outputOffset += nonOverlappingLength;
-                        position += nonOverlappingLength;
-                        length -= nonOverlappingLength;
-
-                        while (length-- > 0)
-                        {
-                            output[outputOffset++] = output[position++];
-                        }
-                    }
-                }
-
-                return output;
-            }
-        }
-
-        public void Dispose()
-        {
-            _loadCompleteAction = null;
-            IsActive = false;
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/ControllerSettingsViewModel.cs

@@ -1,903 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Svg.Skia;
-using Avalonia.Threading;
-using LibHac.Bcat;
-using LibHac.Tools.Fs;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Controller;
-using Ryujinx.Common.Configuration.Hid.Controller.Motion;
-using Ryujinx.Common.Configuration.Hid.Keyboard;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.Input;
-using Ryujinx.Ui.Common.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.GamepadInputId;
-using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
-using Key = Ryujinx.Common.Configuration.Hid.Key;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class ControllerSettingsViewModel : BaseModel, IDisposable
-    {
-        private const string Disabled = "disabled";
-        private const string ProControllerResource = "Ryujinx.Ui.Common/Resources/Controller_ProCon.svg";
-        private const string JoyConPairResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConPair.svg";
-        private const string JoyConLeftResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConLeft.svg";
-        private const string JoyConRightResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConRight.svg";
-        private const string KeyboardString = "keyboard";
-        private const string ControllerString = "controller";
-        private readonly MainWindow _mainWindow;
-
-        private PlayerIndex _playerId;
-        private int _controller;
-        private int _controllerNumber = 0;
-        private string _controllerImage;
-        private int _device;
-        private object _configuration;
-        private string _profileName;
-        private bool _isLoaded;
-        private readonly UserControl _owner;
-
-        public IGamepadDriver AvaloniaKeyboardDriver { get; }
-        public IGamepad SelectedGamepad { get; private set; }
-
-        public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
-        public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
-        internal ObservableCollection<ControllerModel> Controllers { get; set; }
-        public AvaloniaList<string> ProfilesList { get; set; }
-        public AvaloniaList<string> DeviceList { get; set; }
-
-        // XAML Flags
-        public bool ShowSettings => _device > 0;
-        public bool IsController => _device > 1;
-        public bool IsKeyboard => !IsController;
-        public bool IsRight { get; set; }
-        public bool IsLeft { get; set; }
-
-        public bool IsModified { get; set; }
-
-        public object Configuration
-        {
-            get => _configuration;
-            set
-            {
-                _configuration = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public PlayerIndex PlayerId
-        {
-            get => _playerId;
-            set
-            {
-                if (IsModified)
-                {
-                    return;
-                }
-
-                IsModified = false;
-                _playerId = value;
-
-                if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
-                {
-                    _playerId = PlayerIndex.Player1;
-                }
-
-                LoadConfiguration();
-                LoadDevice();
-                LoadProfiles();
-
-                _isLoaded = true;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int Controller
-        {
-            get => _controller;
-            set
-            {
-                _controller = value;
-
-                if (_controller == -1)
-                {
-                    _controller = 0;
-                }
-
-                if (Controllers.Count > 0 && value < Controllers.Count && _controller > -1)
-                {
-                    ControllerType controller = Controllers[_controller].Type;
-
-                    IsLeft = true;
-                    IsRight = true;
-
-                    switch (controller)
-                    {
-                        case ControllerType.Handheld:
-                            ControllerImage = JoyConPairResource;
-                            break;
-                        case ControllerType.ProController:
-                            ControllerImage = ProControllerResource;
-                            break;
-                        case ControllerType.JoyconPair:
-                            ControllerImage = JoyConPairResource;
-                            break;
-                        case ControllerType.JoyconLeft:
-                            ControllerImage = JoyConLeftResource;
-                            IsRight = false;
-                            break;
-                        case ControllerType.JoyconRight:
-                            ControllerImage = JoyConRightResource;
-                            IsLeft = false;
-                            break;
-                    }
-
-                    LoadInputDriver();
-                    LoadProfiles();
-                }
-
-                OnPropertyChanged();
-                NotifyChanges();
-            }
-        }
-
-        public string ControllerImage
-        {
-            get => _controllerImage;
-            set
-            {
-                _controllerImage = value;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(Image));
-            }
-        }
-
-        public SvgImage Image
-        {
-            get
-            {
-                SvgImage image = new SvgImage();
-
-                if (!string.IsNullOrWhiteSpace(_controllerImage))
-                {
-                    SvgSource source = new SvgSource();
-
-                    source.Load(EmbeddedResources.GetStream(_controllerImage));
-
-                    image.Source = source;
-                }
-
-                return image;
-            }
-        }
-
-        public string ProfileName
-        {
-            get => _profileName; set
-            {
-                _profileName = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int Device
-        {
-            get => _device;
-            set
-            {
-                _device = value < 0 ? 0 : value;
-
-                if (_device >= Devices.Count)
-                {
-                    return;
-                }
-
-                var selected = Devices[_device].Type;
-
-                if (selected != DeviceType.None)
-                {
-                    LoadControllers();
-
-                    if (_isLoaded)
-                    {
-                        LoadConfiguration(LoadDefaultConfiguration());
-                    }
-                }
-
-                OnPropertyChanged();
-                NotifyChanges();
-            }
-        }
-
-        public InputConfig Config { get; set; }
-
-        public ControllerSettingsViewModel(UserControl owner) : this()
-        {
-            _owner = owner;
-
-            if (Program.PreviewerDetached)
-            {
-                _mainWindow =
-                    (MainWindow)((IClassicDesktopStyleApplicationLifetime)Avalonia.Application.Current
-                        .ApplicationLifetime).MainWindow;
-
-                AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);
-
-                _mainWindow.InputManager.GamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
-                _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
-                if (_mainWindow.ViewModel.AppHost != null)
-                {
-                    _mainWindow.ViewModel.AppHost.NpadManager.BlockInputUpdates();
-                }
-
-                _isLoaded = false;
-
-                LoadDevices();
-
-                PlayerId = PlayerIndex.Player1;
-            }
-        }
-
-        public ControllerSettingsViewModel()
-        {
-            PlayerIndexes = new ObservableCollection<PlayerModel>();
-            Controllers = new ObservableCollection<ControllerModel>();
-            Devices = new ObservableCollection<(DeviceType Type, string Id, string Name)>();
-            ProfilesList = new AvaloniaList<string>();
-            DeviceList = new AvaloniaList<string>();
-
-            ControllerImage = ProControllerResource;
-
-            PlayerIndexes.Add(new(PlayerIndex.Player1, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer1]));
-            PlayerIndexes.Add(new(PlayerIndex.Player2, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer2]));
-            PlayerIndexes.Add(new(PlayerIndex.Player3, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer3]));
-            PlayerIndexes.Add(new(PlayerIndex.Player4, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer4]));
-            PlayerIndexes.Add(new(PlayerIndex.Player5, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer5]));
-            PlayerIndexes.Add(new(PlayerIndex.Player6, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer6]));
-            PlayerIndexes.Add(new(PlayerIndex.Player7, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer7]));
-            PlayerIndexes.Add(new(PlayerIndex.Player8, LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer8]));
-            PlayerIndexes.Add(new(PlayerIndex.Handheld, LocaleManager.Instance[LocaleKeys.ControllerSettingsHandheld]));
-        }
-
-        private void LoadConfiguration(InputConfig inputConfig = null)
-        {
-            Config = inputConfig ?? ConfigurationState.Instance.Hid.InputConfig.Value.Find(inputConfig => inputConfig.PlayerIndex == _playerId);
-
-            if (Config is StandardKeyboardInputConfig keyboardInputConfig)
-            {
-                Configuration = new InputConfiguration<Key, ConfigStickInputId>(keyboardInputConfig);
-            }
-
-            if (Config is StandardControllerInputConfig controllerInputConfig)
-            {
-                Configuration = new InputConfiguration<ConfigGamepadInputId, ConfigStickInputId>(controllerInputConfig);
-            }
-        }
-
-        public void LoadDevice()
-        {
-            if (Config == null || Config.Backend == InputBackendType.Invalid)
-            {
-                Device = 0;
-            }
-            else
-            {
-                var type = DeviceType.None;
-
-                if (Config is StandardKeyboardInputConfig)
-                {
-                    type = DeviceType.Keyboard;
-                }
-
-                if (Config is StandardControllerInputConfig)
-                {
-                    type = DeviceType.Controller;
-                }
-
-                var item = Devices.FirstOrDefault(x => x.Type == type && x.Id == Config.Id);
-                if (item != default)
-                {
-                    Device = Devices.ToList().FindIndex(x => x.Id == item.Id);
-                }
-                else
-                {
-                    Device = 0;
-                }
-            }
-        }
-
-        public async void ShowMotionConfig()
-        {
-            await MotionSettingsWindow.Show(this);
-        }
-
-        public async void ShowRumbleConfig()
-        {
-            await RumbleSettingsWindow.Show(this);
-        }
-
-        private void LoadInputDriver()
-        {
-            if (_device < 0)
-            {
-                return;
-            }
-
-            string id = GetCurrentGamepadId();
-            var type = Devices[Device].Type;
-
-            if (type == DeviceType.None)
-            {
-                return;
-            }
-            else if (type == DeviceType.Keyboard)
-            {
-                if (_mainWindow.InputManager.KeyboardDriver is AvaloniaKeyboardDriver)
-                {
-                    // NOTE: To get input in this window, we need to bind a custom keyboard driver instead of using the InputManager one as the main window isn't focused...
-                    SelectedGamepad = AvaloniaKeyboardDriver.GetGamepad(id);
-                }
-                else
-                {
-                    SelectedGamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
-                }
-            }
-            else
-            {
-                SelectedGamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
-            }
-        }
-
-        private void HandleOnGamepadDisconnected(string id)
-        {
-            Dispatcher.UIThread.Post(() =>
-            {
-                LoadDevices();
-            });
-        }
-
-        private void HandleOnGamepadConnected(string id)
-        {
-            Dispatcher.UIThread.Post(() =>
-            {
-                LoadDevices();
-            });
-        }
-
-        private string GetCurrentGamepadId()
-        {
-            if (_device < 0)
-            {
-                return string.Empty;
-            }
-
-            var device = Devices[Device];
-
-            if (device.Type == DeviceType.None)
-            {
-                return null;
-            }
-
-            return device.Id.Split(" ")[0];
-        }
-
-        public void LoadControllers()
-        {
-            Controllers.Clear();
-
-            if (_playerId == PlayerIndex.Handheld)
-            {
-                Controllers.Add(new(ControllerType.Handheld, LocaleManager.Instance[LocaleKeys.ControllerSettingsControllerTypeHandheld]));
-
-                Controller = 0;
-            }
-            else
-            {
-                Controllers.Add(new(ControllerType.ProController, LocaleManager.Instance[LocaleKeys.ControllerSettingsControllerTypeProController]));
-                Controllers.Add(new(ControllerType.JoyconPair, LocaleManager.Instance[LocaleKeys.ControllerSettingsControllerTypeJoyConPair]));
-                Controllers.Add(new(ControllerType.JoyconLeft, LocaleManager.Instance[LocaleKeys.ControllerSettingsControllerTypeJoyConLeft]));
-                Controllers.Add(new(ControllerType.JoyconRight, LocaleManager.Instance[LocaleKeys.ControllerSettingsControllerTypeJoyConRight]));
-
-                if (Config != null && Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType) != -1)
-                {
-                    Controller = Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType);
-                }
-                else
-                {
-                    Controller = 0;
-                }
-            }
-        }
-
-        private static string GetShortGamepadName(string str)
-        {
-            const string Ellipsis = "...";
-            const int MaxSize = 50;
-
-            if (str.Length > MaxSize)
-            {
-                return $"{str.AsSpan(0, MaxSize - Ellipsis.Length)}{Ellipsis}";
-            }
-
-            return str;
-        }
-
-        private static string GetShortGamepadId(string str)
-        {
-            const string Hyphen = "-";
-            const int Offset = 1;
-
-            return str.Substring(str.IndexOf(Hyphen) + Offset);
-        }
-
-        public void LoadDevices()
-        {
-            lock (Devices)
-            {
-                Devices.Clear();
-                DeviceList.Clear();
-                Devices.Add((DeviceType.None, Disabled, LocaleManager.Instance[LocaleKeys.ControllerSettingsDeviceDisabled]));
-
-                foreach (string id in _mainWindow.InputManager.KeyboardDriver.GamepadsIds)
-                {
-                    using IGamepad gamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
-
-                    if (gamepad != null)
-                    {
-                        Devices.Add((DeviceType.Keyboard, id, $"{GetShortGamepadName(gamepad.Name)}"));
-                    }
-                }
-
-                foreach (string id in _mainWindow.InputManager.GamepadDriver.GamepadsIds)
-                {
-                    using IGamepad gamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
-
-                    if (gamepad != null)
-                    {
-                        if (Devices.Any(controller => GetShortGamepadId(controller.Id) == GetShortGamepadId(gamepad.Id)))
-                        {
-                            _controllerNumber++;
-                        }
-
-                        Devices.Add((DeviceType.Controller, id, $"{GetShortGamepadName(gamepad.Name)} ({_controllerNumber})"));
-                    }
-                }
-
-                _controllerNumber = 0;
-
-                DeviceList.AddRange(Devices.Select(x => x.Name));
-                Device = Math.Min(Device, DeviceList.Count);
-            }
-        }
-
-        private string GetProfileBasePath()
-        {
-            string path = AppDataManager.ProfilesDirPath;
-            var type = Devices[Device == -1 ? 0 : Device].Type;
-
-            if (type == DeviceType.Keyboard)
-            {
-                path = Path.Combine(path, KeyboardString);
-            }
-            else if (type == DeviceType.Controller)
-            {
-                path = Path.Combine(path, ControllerString);
-            }
-
-            return path;
-        }
-
-        private void LoadProfiles()
-        {
-            ProfilesList.Clear();
-
-            string basePath = GetProfileBasePath();
-
-            if (!Directory.Exists(basePath))
-            {
-                Directory.CreateDirectory(basePath);
-            }
-
-            ProfilesList.Add((LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault]));
-
-            foreach (string profile in Directory.GetFiles(basePath, "*.json", SearchOption.AllDirectories))
-            {
-                ProfilesList.Add(Path.GetFileNameWithoutExtension(profile));
-            }
-
-            if (string.IsNullOrWhiteSpace(ProfileName))
-            {
-                ProfileName = LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault];
-            }
-        }
-
-        public InputConfig LoadDefaultConfiguration()
-        {
-            var activeDevice = Devices.FirstOrDefault();
-
-            if (Devices.Count > 0 && Device < Devices.Count && Device >= 0)
-            {
-                activeDevice = Devices[Device];
-            }
-
-            InputConfig config;
-            if (activeDevice.Type == DeviceType.Keyboard)
-            {
-                string id = activeDevice.Id;
-
-                config = new StandardKeyboardInputConfig
-                {
-                    Version = InputConfig.CurrentVersion,
-                    Backend = InputBackendType.WindowKeyboard,
-                    Id = id,
-                    ControllerType = ControllerType.ProController,
-                    LeftJoycon = new LeftJoyconCommonConfig<Key>
-                    {
-                        DpadUp = Key.Up,
-                        DpadDown = Key.Down,
-                        DpadLeft = Key.Left,
-                        DpadRight = Key.Right,
-                        ButtonMinus = Key.Minus,
-                        ButtonL = Key.E,
-                        ButtonZl = Key.Q,
-                        ButtonSl = Key.Unbound,
-                        ButtonSr = Key.Unbound
-                    },
-                    LeftJoyconStick =
-                        new JoyconConfigKeyboardStick<Key>
-                        {
-                            StickUp = Key.W,
-                            StickDown = Key.S,
-                            StickLeft = Key.A,
-                            StickRight = Key.D,
-                            StickButton = Key.F
-                        },
-                    RightJoycon = new RightJoyconCommonConfig<Key>
-                    {
-                        ButtonA = Key.Z,
-                        ButtonB = Key.X,
-                        ButtonX = Key.C,
-                        ButtonY = Key.V,
-                        ButtonPlus = Key.Plus,
-                        ButtonR = Key.U,
-                        ButtonZr = Key.O,
-                        ButtonSl = Key.Unbound,
-                        ButtonSr = Key.Unbound
-                    },
-                    RightJoyconStick = new JoyconConfigKeyboardStick<Key>
-                    {
-                        StickUp = Key.I,
-                        StickDown = Key.K,
-                        StickLeft = Key.J,
-                        StickRight = Key.L,
-                        StickButton = Key.H
-                    }
-                };
-            }
-            else if (activeDevice.Type == DeviceType.Controller)
-            {
-                bool isNintendoStyle = Devices.ToList().Find(x => x.Id == activeDevice.Id).Name.Contains("Nintendo");
-
-                string id = activeDevice.Id.Split(" ")[0];
-
-                config = new StandardControllerInputConfig
-                {
-                    Version = InputConfig.CurrentVersion,
-                    Backend = InputBackendType.GamepadSDL2,
-                    Id = id,
-                    ControllerType = ControllerType.ProController,
-                    DeadzoneLeft = 0.1f,
-                    DeadzoneRight = 0.1f,
-                    RangeLeft = 1.0f,
-                    RangeRight = 1.0f,
-                    TriggerThreshold = 0.5f,
-                    LeftJoycon = new LeftJoyconCommonConfig<ConfigGamepadInputId>
-                    {
-                        DpadUp = ConfigGamepadInputId.DpadUp,
-                        DpadDown = ConfigGamepadInputId.DpadDown,
-                        DpadLeft = ConfigGamepadInputId.DpadLeft,
-                        DpadRight = ConfigGamepadInputId.DpadRight,
-                        ButtonMinus = ConfigGamepadInputId.Minus,
-                        ButtonL = ConfigGamepadInputId.LeftShoulder,
-                        ButtonZl = ConfigGamepadInputId.LeftTrigger,
-                        ButtonSl = ConfigGamepadInputId.Unbound,
-                        ButtonSr = ConfigGamepadInputId.Unbound
-                    },
-                    LeftJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
-                    {
-                        Joystick = ConfigStickInputId.Left,
-                        StickButton = ConfigGamepadInputId.LeftStick,
-                        InvertStickX = false,
-                        InvertStickY = false
-                    },
-                    RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
-                    {
-                        ButtonA = isNintendoStyle ? ConfigGamepadInputId.A : ConfigGamepadInputId.B,
-                        ButtonB = isNintendoStyle ? ConfigGamepadInputId.B : ConfigGamepadInputId.A,
-                        ButtonX = isNintendoStyle ? ConfigGamepadInputId.X : ConfigGamepadInputId.Y,
-                        ButtonY = isNintendoStyle ? ConfigGamepadInputId.Y : ConfigGamepadInputId.X,
-                        ButtonPlus = ConfigGamepadInputId.Plus,
-                        ButtonR = ConfigGamepadInputId.RightShoulder,
-                        ButtonZr = ConfigGamepadInputId.RightTrigger,
-                        ButtonSl = ConfigGamepadInputId.Unbound,
-                        ButtonSr = ConfigGamepadInputId.Unbound
-                    },
-                    RightJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
-                    {
-                        Joystick = ConfigStickInputId.Right,
-                        StickButton = ConfigGamepadInputId.RightStick,
-                        InvertStickX = false,
-                        InvertStickY = false
-                    },
-                    Motion = new StandardMotionConfigController
-                    {
-                        MotionBackend = MotionInputBackendType.GamepadDriver,
-                        EnableMotion = true,
-                        Sensitivity = 100,
-                        GyroDeadzone = 1
-                    },
-                    Rumble = new RumbleConfigController
-                    {
-                        StrongRumble = 1f,
-                        WeakRumble = 1f,
-                        EnableRumble = false
-                    }
-                };
-            }
-            else
-            {
-                config = new InputConfig();
-            }
-
-            config.PlayerIndex = _playerId;
-
-            return config;
-        }
-
-        public async void LoadProfile()
-        {
-            if (Device == 0)
-            {
-                return;
-            }
-
-            InputConfig config = null;
-
-            if (string.IsNullOrWhiteSpace(ProfileName))
-            {
-                return;
-            }
-
-            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-            {
-                config = LoadDefaultConfiguration();
-            }
-            else
-            {
-                string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-
-                if (!File.Exists(path))
-                {
-                    var index = ProfilesList.IndexOf(ProfileName);
-                    if (index != -1)
-                    {
-                        ProfilesList.RemoveAt(index);
-                    }
-                    return;
-                }
-
-                try
-                {
-                    using (Stream stream = File.OpenRead(path))
-                    {
-                        config = JsonHelper.Deserialize<InputConfig>(stream);
-                    }
-                }
-                catch (JsonException) { }
-                catch (InvalidOperationException)
-                {
-                    Logger.Error?.Print(LogClass.Configuration, $"Profile {ProfileName} is incompatible with the current input configuration system.");
-
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogProfileInvalidProfileErrorMessage, ProfileName));
-
-                    return;
-                }
-            }
-
-            if (config != null)
-            {
-                _isLoaded = false;
-
-                LoadConfiguration(config);
-
-                LoadDevice();
-
-                _isLoaded = true;
-
-                NotifyChanges();
-            }
-        }
-
-        public async void SaveProfile()
-        {
-            if (Device == 0)
-            {
-                return;
-            }
-
-            if (Configuration == null)
-            {
-                return;
-            }
-
-            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-            {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
-
-                return;
-            }
-            else
-            {
-                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
-
-                if (validFileName)
-                {
-                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-
-                    InputConfig config = null;
-
-                    if (IsKeyboard)
-                    {
-                        config = (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig();
-                    }
-                    else if (IsController)
-                    {
-                        config = (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
-                    }
-
-                    config.ControllerType = Controllers[_controller].Type;
-
-                    string jsonString = JsonHelper.Serialize(config, true);
-
-                    await File.WriteAllTextAsync(path, jsonString);
-
-                    LoadProfiles();
-                }
-                else
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                }
-            }
-        }
-
-        public async void RemoveProfile()
-        {
-            if (Device == 0 || ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault] || ProfilesList.IndexOf(ProfileName) == -1)
-            {
-                return;
-            }
-
-            UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                LocaleManager.Instance[LocaleKeys.DialogProfileDeleteProfileTitle],
-                LocaleManager.Instance[LocaleKeys.DialogProfileDeleteProfileMessage],
-                LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
-
-            if (result == UserResult.Yes)
-            {
-                string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-
-                if (File.Exists(path))
-                {
-                    File.Delete(path);
-                }
-
-                LoadProfiles();
-            }
-        }
-
-        public void Save()
-        {
-            IsModified = false;
-
-            List<InputConfig> newConfig = new();
-
-            newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
-
-            newConfig.Remove(newConfig.Find(x => x == null));
-
-            if (Device == 0)
-            {
-                newConfig.Remove(newConfig.Find(x => x.PlayerIndex == this.PlayerId));
-            }
-            else
-            {
-                var device = Devices[Device];
-
-                if (device.Type == DeviceType.Keyboard)
-                {
-                    var inputConfig = Configuration as InputConfiguration<Key, ConfigStickInputId>;
-                    inputConfig.Id = device.Id;
-                }
-                else
-                {
-                    var inputConfig = Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>;
-                    inputConfig.Id = device.Id.Split(" ")[0];
-                }
-
-                var config = !IsController
-                    ? (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig()
-                    : (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
-                config.ControllerType = Controllers[_controller].Type;
-                config.PlayerIndex = _playerId;
-
-                int i = newConfig.FindIndex(x => x.PlayerIndex == PlayerId);
-                if (i == -1)
-                {
-                    newConfig.Add(config);
-                }
-                else
-                {
-                    newConfig[i] = config;
-                }
-            }
-
-            _mainWindow.ViewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
-
-            // Atomically replace and signal input change.
-            // NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.
-            ConfigurationState.Instance.Hid.InputConfig.Value = newConfig;
-
-            ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-        }
-
-        public void NotifyChange(string property)
-        {
-            OnPropertyChanged(property);
-        }
-
-        public void NotifyChanges()
-        {
-            OnPropertyChanged(nameof(Configuration));
-            OnPropertyChanged(nameof(IsController));
-            OnPropertyChanged(nameof(ShowSettings));
-            OnPropertyChanged(nameof(IsKeyboard));
-            OnPropertyChanged(nameof(IsRight));
-            OnPropertyChanged(nameof(IsLeft));
-        }
-
-        public void Dispose()
-        {
-            _mainWindow.InputManager.GamepadDriver.OnGamepadConnected -= HandleOnGamepadConnected;
-            _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected -= HandleOnGamepadDisconnected;
-
-            _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
-
-            SelectedGamepad?.Dispose();
-
-            AvaloniaKeyboardDriver.Dispose();
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs

@@ -1,517 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using DynamicData;
-using LibHac.Tools.FsSystem;
-using Ryujinx.Audio.Backends.OpenAL;
-using Ryujinx.Audio.Backends.SDL2;
-using Ryujinx.Audio.Backends.SoundIo;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.GraphicsDriver;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.Vulkan;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.Services.Time.TimeZone;
-using Ryujinx.Ui.Common.Configuration;
-using Ryujinx.Ui.Common.Configuration.System;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Runtime.InteropServices;
-using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class SettingsViewModel : BaseModel
-    {
-        private readonly VirtualFileSystem _virtualFileSystem;
-        private readonly ContentManager _contentManager;
-        private TimeZoneContentManager _timeZoneContentManager;
-
-        private readonly List<string> _validTzRegions;
-
-        private float _customResolutionScale;
-        private int _resolutionScale;
-        private int _graphicsBackendMultithreadingIndex;
-        private float _volume;
-        private bool _isVulkanAvailable = true;
-        private bool _directoryChanged;
-        private List<string> _gpuIds = new();
-        private KeyboardHotkeys _keyboardHotkeys;
-        private int _graphicsBackendIndex;
-        private string _customThemePath;
-
-        public event Action CloseWindow;
-        public event Action SaveSettingsEvent;
-
-        public int ResolutionScale
-        {
-            get => _resolutionScale;
-            set
-            {
-                _resolutionScale = value;
-
-                OnPropertyChanged(nameof(CustomResolutionScale));
-                OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
-            }
-        }
-
-        public int GraphicsBackendMultithreadingIndex
-        {
-            get => _graphicsBackendMultithreadingIndex;
-            set
-            {
-                _graphicsBackendMultithreadingIndex = value;
-
-                if (_graphicsBackendMultithreadingIndex != (int)ConfigurationState.Instance.Graphics.BackendThreading.Value)
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogSettingsBackendThreadingWarningMessage],
-                            "",
-                            "",
-                            LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                            LocaleManager.Instance[LocaleKeys.DialogSettingsBackendThreadingWarningTitle]);
-                    });
-                }
-
-                OnPropertyChanged();
-            }
-        }
-
-        public float CustomResolutionScale
-        {
-            get => _customResolutionScale;
-            set
-            {
-                _customResolutionScale = MathF.Round(value, 1);
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsVulkanAvailable
-        {
-            get => _isVulkanAvailable;
-            set
-            {
-                _isVulkanAvailable = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();
-
-        public bool IsHypervisorAvailable => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
-
-        public bool DirectoryChanged
-        {
-            get => _directoryChanged;
-            set
-            {
-                _directoryChanged = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsMacOS => OperatingSystem.IsMacOS();
-
-        public bool EnableDiscordIntegration { get; set; }
-        public bool CheckUpdatesOnStart { get; set; }
-        public bool ShowConfirmExit { get; set; }
-        public bool HideCursorOnIdle { get; set; }
-        public bool EnableDockedMode { get; set; }
-        public bool EnableKeyboard { get; set; }
-        public bool EnableMouse { get; set; }
-        public bool EnableVsync { get; set; }
-        public bool EnablePptc { get; set; }
-        public bool EnableInternetAccess { get; set; }
-        public bool EnableFsIntegrityChecks { get; set; }
-        public bool IgnoreMissingServices { get; set; }
-        public bool ExpandDramSize { get; set; }
-        public bool EnableShaderCache { get; set; }
-        public bool EnableTextureRecompression { get; set; }
-        public bool EnableMacroHLE { get; set; }
-        public bool EnableFileLog { get; set; }
-        public bool EnableStub { get; set; }
-        public bool EnableInfo { get; set; }
-        public bool EnableWarn { get; set; }
-        public bool EnableError { get; set; }
-        public bool EnableTrace { get; set; }
-        public bool EnableGuest { get; set; }
-        public bool EnableFsAccessLog { get; set; }
-        public bool EnableDebug { get; set; }
-        public bool IsOpenAlEnabled { get; set; }
-        public bool IsSoundIoEnabled { get; set; }
-        public bool IsSDL2Enabled { get; set; }
-        public bool EnableCustomTheme { get; set; }
-        public bool IsCustomResolutionScaleActive => _resolutionScale == 4;
-        public bool IsVulkanSelected => GraphicsBackendIndex == 0;
-        public bool UseHypervisor { get; set; }
-
-        public string TimeZone { get; set; }
-        public string ShaderDumpPath { get; set; }
-
-        public string CustomThemePath
-        {
-            get
-            {
-                return _customThemePath;
-            }
-            set
-            {
-                _customThemePath = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int Language { get; set; }
-        public int Region { get; set; }
-        public int FsGlobalAccessLogMode { get; set; }
-        public int AudioBackend { get; set; }
-        public int MaxAnisotropy { get; set; }
-        public int AspectRatio { get; set; }
-        public int OpenglDebugLevel { get; set; }
-        public int MemoryMode { get; set; }
-        public int BaseStyleIndex { get; set; }
-        public int GraphicsBackendIndex
-        {
-            get => _graphicsBackendIndex;
-            set
-            {
-                _graphicsBackendIndex = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsVulkanSelected));
-            }
-        }
-
-        public int PreferredGpuIndex { get; set; }
-
-        public float Volume
-        {
-            get => _volume;
-            set
-            {
-                _volume = value;
-
-                ConfigurationState.Instance.System.AudioVolume.Value = _volume / 100;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public DateTimeOffset DateOffset { get; set; }
-        public TimeSpan TimeOffset { get; set; }
-        private AvaloniaList<TimeZone> TimeZones { get; set; }
-        public AvaloniaList<string> GameDirectories { get; set; }
-        public ObservableCollection<ComboBoxItem> AvailableGpus { get; set; }
-
-        public KeyboardHotkeys KeyboardHotkeys
-        {
-            get => _keyboardHotkeys;
-            set
-            {
-                _keyboardHotkeys = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
-        {
-            _virtualFileSystem = virtualFileSystem;
-            _contentManager = contentManager;
-            if (Program.PreviewerDetached)
-            {
-                LoadTimeZones();
-            }
-        }
-
-        public SettingsViewModel()
-        {
-            GameDirectories = new AvaloniaList<string>();
-            TimeZones = new AvaloniaList<TimeZone>();
-            AvailableGpus = new ObservableCollection<ComboBoxItem>();
-            _validTzRegions = new List<string>();
-
-            CheckSoundBackends();
-
-            if (Program.PreviewerDetached)
-            {
-                LoadAvailableGpus();
-                LoadCurrentConfiguration();
-            }
-        }
-
-        public void CheckSoundBackends()
-        {
-            IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported;
-            IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported;
-            IsSDL2Enabled = SDL2HardwareDeviceDriver.IsSupported;
-        }
-
-        private void LoadAvailableGpus()
-        {
-            _gpuIds = new List<string>();
-            List<string> names = new();
-            var devices = VulkanRenderer.GetPhysicalDevices();
-
-            if (devices.Length == 0)
-            {
-                IsVulkanAvailable = false;
-                GraphicsBackendIndex = 1;
-            }
-            else
-            {
-                foreach (var device in devices)
-                {
-                    _gpuIds.Add(device.Id);
-                    names.Add($"{device.Name} {(device.IsDiscrete ? "(dGPU)" : "")}");
-                }
-            }
-
-            AvailableGpus.Clear();
-            AvailableGpus.AddRange(names.Select(x => new ComboBoxItem { Content = x }));
-        }
-
-        public void LoadTimeZones()
-        {
-            _timeZoneContentManager = new TimeZoneContentManager();
-
-            _timeZoneContentManager.InitializeInstance(_virtualFileSystem, _contentManager, IntegrityCheckLevel.None);
-
-            foreach ((int offset, string location, string abbr) in _timeZoneContentManager.ParseTzOffsets())
-            {
-                int hours = Math.DivRem(offset, 3600, out int seconds);
-                int minutes = Math.Abs(seconds) / 60;
-
-                string abbr2 = abbr.StartsWith('+') || abbr.StartsWith('-') ? string.Empty : abbr;
-
-                TimeZones.Add(new TimeZone($"UTC{hours:+0#;-0#;+00}:{minutes:D2}", location, abbr2));
-
-                _validTzRegions.Add(location);
-            }
-        }
-
-        public void ValidateAndSetTimeZone(string location)
-        {
-            if (_validTzRegions.Contains(location))
-            {
-                TimeZone = location;
-            }
-        }
-
-        public void LoadCurrentConfiguration()
-        {
-            ConfigurationState config = ConfigurationState.Instance;
-
-            // User Interface
-            EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
-            ShowConfirmExit = config.ShowConfirmExit;
-            HideCursorOnIdle = config.HideCursorOnIdle;
-
-            GameDirectories.Clear();
-            GameDirectories.AddRange(config.Ui.GameDirs.Value);
-
-            EnableCustomTheme = config.Ui.EnableCustomTheme;
-            CustomThemePath = config.Ui.CustomThemePath;
-            BaseStyleIndex = config.Ui.BaseStyle == "Light" ? 0 : 1;
-
-            // Input
-            EnableDockedMode = config.System.EnableDockedMode;
-            EnableKeyboard = config.Hid.EnableKeyboard;
-            EnableMouse = config.Hid.EnableMouse;
-
-            // Keyboard Hotkeys
-            KeyboardHotkeys = config.Hid.Hotkeys.Value;
-
-            // System
-            Region = (int)config.System.Region.Value;
-            Language = (int)config.System.Language.Value;
-            TimeZone = config.System.TimeZone;
-
-            DateTime dateTimeOffset = DateTime.Now.AddSeconds(config.System.SystemTimeOffset);
-
-            DateOffset = dateTimeOffset.Date;
-            TimeOffset = dateTimeOffset.TimeOfDay;
-            EnableVsync = config.Graphics.EnableVsync;
-            EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
-            ExpandDramSize = config.System.ExpandRam;
-            IgnoreMissingServices = config.System.IgnoreMissingServices;
-
-            // CPU
-            EnablePptc = config.System.EnablePtc;
-            MemoryMode = (int)config.System.MemoryManagerMode.Value;
-            UseHypervisor = config.System.UseHypervisor;
-
-            // Graphics
-            GraphicsBackendIndex = (int)config.Graphics.GraphicsBackend.Value;
-            PreferredGpuIndex = _gpuIds.Contains(config.Graphics.PreferredGpu) ? _gpuIds.IndexOf(config.Graphics.PreferredGpu) : 0;
-            EnableShaderCache = config.Graphics.EnableShaderCache;
-            EnableTextureRecompression = config.Graphics.EnableTextureRecompression;
-            EnableMacroHLE = config.Graphics.EnableMacroHLE;
-            ResolutionScale = config.Graphics.ResScale == -1 ? 4 : config.Graphics.ResScale - 1;
-            CustomResolutionScale = config.Graphics.ResScaleCustom;
-            MaxAnisotropy = config.Graphics.MaxAnisotropy == -1 ? 0 : (int)(MathF.Log2(config.Graphics.MaxAnisotropy));
-            AspectRatio = (int)config.Graphics.AspectRatio.Value;
-            GraphicsBackendMultithreadingIndex = (int)config.Graphics.BackendThreading.Value;
-            ShaderDumpPath = config.Graphics.ShadersDumpPath;
-
-            // Audio
-            AudioBackend = (int)config.System.AudioBackend.Value;
-            Volume = config.System.AudioVolume * 100;
-
-            // Network
-            EnableInternetAccess = config.System.EnableInternetAccess;
-
-            // Logging
-            EnableFileLog = config.Logger.EnableFileLog;
-            EnableStub = config.Logger.EnableStub;
-            EnableInfo = config.Logger.EnableInfo;
-            EnableWarn = config.Logger.EnableWarn;
-            EnableError = config.Logger.EnableError;
-            EnableTrace = config.Logger.EnableTrace;
-            EnableGuest = config.Logger.EnableGuest;
-            EnableDebug = config.Logger.EnableDebug;
-            EnableFsAccessLog = config.Logger.EnableFsAccessLog;
-            FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode;
-            OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;
-        }
-
-        public void SaveSettings()
-        {
-            ConfigurationState config = ConfigurationState.Instance;
-
-            // User Interface
-            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
-            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
-            config.ShowConfirmExit.Value = ShowConfirmExit;
-            config.HideCursorOnIdle.Value = HideCursorOnIdle;
-
-            if (_directoryChanged)
-            {
-                List<string> gameDirs = new(GameDirectories);
-                config.Ui.GameDirs.Value = gameDirs;
-            }
-
-            config.Ui.EnableCustomTheme.Value = EnableCustomTheme;
-            config.Ui.CustomThemePath.Value = CustomThemePath;
-            config.Ui.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
-
-            // Input
-            config.System.EnableDockedMode.Value = EnableDockedMode;
-            config.Hid.EnableKeyboard.Value = EnableKeyboard;
-            config.Hid.EnableMouse.Value = EnableMouse;
-
-            // Keyboard Hotkeys
-            config.Hid.Hotkeys.Value = KeyboardHotkeys;
-
-            // System
-            config.System.Region.Value = (Region)Region;
-            config.System.Language.Value = (Language)Language;
-
-            if (_validTzRegions.Contains(TimeZone))
-            {
-                config.System.TimeZone.Value = TimeZone;
-            }
-
-            TimeSpan systemTimeOffset = DateOffset - DateTime.Now;
-
-            config.System.SystemTimeOffset.Value = systemTimeOffset.Seconds;
-            config.Graphics.EnableVsync.Value = EnableVsync;
-            config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
-            config.System.ExpandRam.Value = ExpandDramSize;
-            config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
-
-            // CPU
-            config.System.EnablePtc.Value = EnablePptc;
-            config.System.MemoryManagerMode.Value = (MemoryManagerMode)MemoryMode;
-            config.System.UseHypervisor.Value = UseHypervisor;
-
-            // Graphics
-            config.Graphics.GraphicsBackend.Value = (GraphicsBackend)GraphicsBackendIndex;
-            config.Graphics.PreferredGpu.Value = _gpuIds.ElementAtOrDefault(PreferredGpuIndex);
-            config.Graphics.EnableShaderCache.Value = EnableShaderCache;
-            config.Graphics.EnableTextureRecompression.Value = EnableTextureRecompression;
-            config.Graphics.EnableMacroHLE.Value = EnableMacroHLE;
-            config.Graphics.ResScale.Value = ResolutionScale == 4 ? -1 : ResolutionScale + 1;
-            config.Graphics.ResScaleCustom.Value = CustomResolutionScale;
-            config.Graphics.MaxAnisotropy.Value = MaxAnisotropy == 0 ? -1 : MathF.Pow(2, MaxAnisotropy);
-            config.Graphics.AspectRatio.Value = (AspectRatio)AspectRatio;
-
-            if (ConfigurationState.Instance.Graphics.BackendThreading != (BackendThreading)GraphicsBackendMultithreadingIndex)
-            {
-                DriverUtilities.ToggleOGLThreading(GraphicsBackendMultithreadingIndex == (int)BackendThreading.Off);
-            }
-
-            config.Graphics.BackendThreading.Value = (BackendThreading)GraphicsBackendMultithreadingIndex;
-            config.Graphics.ShadersDumpPath.Value = ShaderDumpPath;
-
-            // Audio
-            AudioBackend audioBackend = (AudioBackend)AudioBackend;
-            if (audioBackend != config.System.AudioBackend.Value)
-            {
-                config.System.AudioBackend.Value = audioBackend;
-
-                Logger.Info?.Print(LogClass.Application, $"AudioBackend toggled to: {audioBackend}");
-            }
-
-            config.System.AudioVolume.Value = Volume / 100;
-
-            // Network
-            config.System.EnableInternetAccess.Value = EnableInternetAccess;
-
-            // Logging
-            config.Logger.EnableFileLog.Value = EnableFileLog;
-            config.Logger.EnableStub.Value = EnableStub;
-            config.Logger.EnableInfo.Value = EnableInfo;
-            config.Logger.EnableWarn.Value = EnableWarn;
-            config.Logger.EnableError.Value = EnableError;
-            config.Logger.EnableTrace.Value = EnableTrace;
-            config.Logger.EnableGuest.Value = EnableGuest;
-            config.Logger.EnableDebug.Value = EnableDebug;
-            config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog;
-            config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode;
-            config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel;
-
-            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-
-            MainWindow.UpdateGraphicsConfig();
-
-            SaveSettingsEvent?.Invoke();
-
-            _directoryChanged = false;
-        }
-
-        public void RevertIfNotSaved()
-        {
-            Program.ReloadConfig();
-        }
-
-        public void ApplyButton()
-        {
-            SaveSettings();
-        }
-
-        public void OkButton()
-        {
-            SaveSettings();
-            CloseWindow?.Invoke();
-        }
-
-        public void CancelButton()
-        {
-            RevertIfNotSaved();
-            CloseWindow?.Invoke();
-        }
-    }
-}

Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs

@@ -1,250 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Threading;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
-using LibHac.Ns;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Path = System.IO.Path;
-using SpanHelpers = LibHac.Common.SpanHelpers;
-
-namespace Ryujinx.Ava.UI.ViewModels;
-
-public class TitleUpdateViewModel : BaseModel
-{
-    public TitleUpdateMetadata _titleUpdateWindowData;
-    public readonly string     _titleUpdateJsonPath;
-    private VirtualFileSystem  _virtualFileSystem { get; }
-    private ulong              _titleId           { get; }
-    private string             _titleName         { get; }
-
-    private AvaloniaList<TitleUpdateModel> _titleUpdates = new();
-    private AvaloniaList<object> _views = new();
-    private object _selectedUpdate;
-
-    public AvaloniaList<TitleUpdateModel> TitleUpdates
-    {
-        get => _titleUpdates;
-        set
-        {
-            _titleUpdates = value;
-            OnPropertyChanged();
-        }
-    }
-
-    public AvaloniaList<object> Views
-    {
-        get => _views;
-        set
-        {
-            _views = value;
-            OnPropertyChanged();
-        }
-    }
-
-    public object SelectedUpdate
-    {
-        get => _selectedUpdate;
-        set
-        {
-            _selectedUpdate = value;
-            OnPropertyChanged();
-        }
-    }
-
-    public TitleUpdateViewModel(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName)
-    {
-        _virtualFileSystem = virtualFileSystem;
-
-        _titleId   = titleId;
-        _titleName = titleName;
-
-        _titleUpdateJsonPath = Path.Combine(AppDataManager.GamesDirPath, titleId.ToString("x16"), "updates.json");
-
-        try
-        {
-            _titleUpdateWindowData = JsonHelper.DeserializeFromFile<TitleUpdateMetadata>(_titleUpdateJsonPath);
-        }
-        catch
-        {
-            Logger.Warning?.Print(LogClass.Application, $"Failed to deserialize title update data for {_titleId} at {_titleUpdateJsonPath}");
-
-            _titleUpdateWindowData = new TitleUpdateMetadata
-            {
-                Selected = "",
-                Paths    = new List<string>()
-            };
-
-            Save();
-        }
-
-        LoadUpdates();
-    }
-
-    private void LoadUpdates()
-    {
-        foreach (string path in _titleUpdateWindowData.Paths)
-        {
-            AddUpdate(path);
-        }
-
-        TitleUpdateModel selected = TitleUpdates.FirstOrDefault(x => x.Path == _titleUpdateWindowData.Selected, null);
-
-        SelectedUpdate = selected;
-
-        // NOTE: Save the list again to remove leftovers.
-        Save();
-
-        SortUpdates();
-    }
-
-    public void SortUpdates()
-    {
-        var list = TitleUpdates.ToList();
-
-        list.Sort((first, second) =>
-        {
-            if (string.IsNullOrEmpty(first.Control.DisplayVersionString.ToString()))
-            {
-                return -1;
-            }
-            else if (string.IsNullOrEmpty(second.Control.DisplayVersionString.ToString()))
-            {
-                return 1;
-            }
-
-            return Version.Parse(first.Control.DisplayVersionString.ToString()).CompareTo(Version.Parse(second.Control.DisplayVersionString.ToString())) * -1;
-        });
-
-        Views.Clear();
-        Views.Add(new BaseModel());
-        Views.AddRange(list);
-
-        if (SelectedUpdate == null)
-        {
-            SelectedUpdate = Views[0];
-        }
-        else if (!TitleUpdates.Contains(SelectedUpdate))
-        {
-            if (Views.Count > 1)
-            {
-                SelectedUpdate = Views[1];
-            }
-            else
-            {
-                SelectedUpdate = Views[0];
-            }
-        }
-    }
-
-    private void AddUpdate(string path)
-    {
-        if (File.Exists(path) && TitleUpdates.All(x => x.Path != path))
-        {
-            using FileStream file = new(path, FileMode.Open, FileAccess.Read);
-
-            try
-            {
-                (Nca patchNca, Nca controlNca) = ApplicationLoader.GetGameUpdateDataFromPartition(_virtualFileSystem, new PartitionFileSystem(file.AsStorage()), _titleId.ToString("x16"), 0);
-
-                if (controlNca != null && patchNca != null)
-                {
-                    ApplicationControlProperty controlData = new();
-
-                    using UniqueRef<IFile> nacpFile = new();
-
-                    controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None).OpenFile(ref nacpFile.Ref(), "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure();
-                    nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure();
-
-                    TitleUpdates.Add(new TitleUpdateModel(controlData, path));
-                }
-                else
-                {
-                    Dispatcher.UIThread.Post(async () =>
-                    {
-                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUpdateAddUpdateErrorMessage]);
-                    });
-                }
-            }
-            catch (Exception ex)
-            {
-                Dispatcher.UIThread.Post(async () =>
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogLoadNcaErrorMessage, ex.Message, path));
-                });
-            }
-        }
-    }
-
-    public void RemoveUpdate(TitleUpdateModel update)
-    {
-        TitleUpdates.Remove(update);
-
-        SortUpdates();
-    }
-
-    public async void Add()
-    {
-        OpenFileDialog dialog = new()
-        {
-            Title         = LocaleManager.Instance[LocaleKeys.SelectUpdateDialogTitle],
-            AllowMultiple = true
-        };
-
-        dialog.Filters.Add(new FileDialogFilter
-        {
-            Name       = "NSP",
-            Extensions = { "nsp" }
-        });
-
-        if (Avalonia.Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            string[] files = await dialog.ShowAsync(desktop.MainWindow);
-
-            if (files != null)
-            {
-                foreach (string file in files)
-                {
-                    AddUpdate(file);
-                }
-            }
-        }
-
-        SortUpdates();
-    }
-
-    public void Save()
-    {
-        _titleUpdateWindowData.Paths.Clear();
-        _titleUpdateWindowData.Selected = "";
-
-        foreach (TitleUpdateModel update in TitleUpdates)
-        {
-            _titleUpdateWindowData.Paths.Add(update.Path);
-
-            if (update == SelectedUpdate)
-            {
-                _titleUpdateWindowData.Selected = update.Path;
-            }
-        }
-
-        File.WriteAllBytes(_titleUpdateJsonPath, Encoding.UTF8.GetBytes(JsonHelper.Serialize(_titleUpdateWindowData, true)));
-    }
-}

Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs

@@ -1,230 +0,0 @@
-using Avalonia.Media;
-using LibHac.Common;
-using LibHac.Fs;
-using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
-using LibHac.Ncm;
-using LibHac.Tools.Fs;
-using LibHac.Tools.FsSystem;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.HLE.FileSystem;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using Color = Avalonia.Media.Color;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    internal class UserFirmwareAvatarSelectorViewModel : BaseModel
-    {
-        private static readonly Dictionary<string, byte[]> _avatarStore = new();
-
-        private ObservableCollection<ProfileImageModel> _images;
-        private Color _backgroundColor = Colors.White;
-
-        private int _selectedIndex;
-        private byte[] _selectedImage;
-
-        public UserFirmwareAvatarSelectorViewModel()
-        {
-            _images = new ObservableCollection<ProfileImageModel>();
-
-            LoadImagesFromStore();
-        }
-
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set
-            {
-                _backgroundColor = value;
-                OnPropertyChanged();
-                ChangeImageBackground();
-            }
-        }
-
-        public ObservableCollection<ProfileImageModel> Images
-        {
-            get => _images;
-            set
-            {
-                _images = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public int SelectedIndex
-        {
-            get => _selectedIndex;
-            set
-            {
-                _selectedIndex = value;
-
-                if (_selectedIndex == -1)
-                {
-                    SelectedImage = null;
-                }
-                else
-                {
-                    SelectedImage = _images[_selectedIndex].Data;
-                }
-
-                OnPropertyChanged();
-            }
-        }
-
-        public byte[] SelectedImage
-        {
-            get => _selectedImage;
-            private set => _selectedImage = value;
-        }
-
-        private void LoadImagesFromStore()
-        {
-            Images.Clear();
-
-            foreach (var image in _avatarStore)
-            {
-                Images.Add(new ProfileImageModel(image.Key, image.Value));
-            }
-        }
-
-        private void ChangeImageBackground()
-        {
-            foreach (var image in Images)
-            {
-                image.BackgroundColor = new SolidColorBrush(BackgroundColor);
-            }
-        }
-
-        public static void PreloadAvatars(ContentManager contentManager, VirtualFileSystem virtualFileSystem)
-        {
-            if (_avatarStore.Count > 0)
-            {
-                return;
-            }
-
-            string contentPath = contentManager.GetInstalledContentPath(0x010000000000080A, StorageId.BuiltInSystem, NcaContentType.Data);
-            string avatarPath = virtualFileSystem.SwitchPathToSystemPath(contentPath);
-
-            if (!string.IsNullOrWhiteSpace(avatarPath))
-            {
-                using (IStorage ncaFileStream = new LocalStorage(avatarPath, FileAccess.Read, FileMode.Open))
-                {
-                    Nca nca = new(virtualFileSystem.KeySet, ncaFileStream);
-                    IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
-
-                    foreach (DirectoryEntryEx item in romfs.EnumerateEntries())
-                    {
-                        // TODO: Parse DatabaseInfo.bin and table.bin files for more accuracy.
-                        if (item.Type == DirectoryEntryType.File && item.FullPath.Contains("chara") && item.FullPath.Contains("szs"))
-                        {
-                            using var file = new UniqueRef<IFile>();
-
-                            romfs.OpenFile(ref file.Ref(), ("/" + item.FullPath).ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                            using (MemoryStream stream = new())
-                            using (MemoryStream streamPng = new())
-                            {
-                                file.Get.AsStream().CopyTo(stream);
-
-                                stream.Position = 0;
-
-                                Image avatarImage = Image.LoadPixelData<Rgba32>(DecompressYaz0(stream), 256, 256);
-
-                                avatarImage.SaveAsPng(streamPng);
-
-                                _avatarStore.Add(item.FullPath, streamPng.ToArray());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static byte[] DecompressYaz0(Stream stream)
-        {
-            using (BinaryReader reader = new(stream))
-            {
-                reader.ReadInt32(); // Magic
-
-                uint decodedLength = BinaryPrimitives.ReverseEndianness(reader.ReadUInt32());
-
-                reader.ReadInt64(); // Padding
-
-                byte[] input = new byte[stream.Length - stream.Position];
-                stream.Read(input, 0, input.Length);
-
-                uint inputOffset = 0;
-
-                byte[] output = new byte[decodedLength];
-                uint outputOffset = 0;
-
-                ushort mask = 0;
-                byte header = 0;
-
-                while (outputOffset < decodedLength)
-                {
-                    if ((mask >>= 1) == 0)
-                    {
-                        header = input[inputOffset++];
-                        mask = 0x80;
-                    }
-
-                    if ((header & mask) != 0)
-                    {
-                        if (outputOffset == output.Length)
-                        {
-                            break;
-                        }
-
-                        output[outputOffset++] = input[inputOffset++];
-                    }
-                    else
-                    {
-                        byte byte1 = input[inputOffset++];
-                        byte byte2 = input[inputOffset++];
-
-                        uint dist = (uint)((byte1 & 0xF) << 8) | byte2;
-                        uint position = outputOffset - (dist + 1);
-
-                        uint length = (uint)byte1 >> 4;
-                        if (length == 0)
-                        {
-                            length = (uint)input[inputOffset++] + 0x12;
-                        }
-                        else
-                        {
-                            length += 2;
-                        }
-
-                        uint gap = outputOffset - position;
-                        uint nonOverlappingLength = length;
-
-                        if (nonOverlappingLength > gap)
-                        {
-                            nonOverlappingLength = gap;
-                        }
-
-                        Buffer.BlockCopy(output, (int)position, output, (int)outputOffset, (int)nonOverlappingLength);
-                        outputOffset += nonOverlappingLength;
-                        position += nonOverlappingLength;
-                        length -= nonOverlappingLength;
-
-                        while (length-- > 0)
-                        {
-                            output[outputOffset++] = output[position++];
-                        }
-                    }
-                }
-
-                return output;
-            }
-        }
-    }
-}

Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml

@@ -1,163 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    mc:Ignorable="d"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    x:DataType="viewModels:MainWindowViewModel"
-    x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView"
-    x:CompileBindings="True">
-    <Design.DataContext>
-        <viewModels:MainWindowViewModel />
-    </Design.DataContext>
-    <DockPanel HorizontalAlignment="Stretch">
-        <Menu
-            Name="Menu"
-            Height="35"
-            Margin="0"
-            HorizontalAlignment="Left">
-            <Menu.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <DockPanel Margin="0" HorizontalAlignment="Stretch" />
-                </ItemsPanelTemplate>
-            </Menu.ItemsPanel>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarFile}">
-                <MenuItem
-                    Command="{ReflectionBinding OpenFile}"
-                    Header="{locale:Locale MenuBarFileOpenFromFile}"
-                    IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFileTooltip}" />
-                <MenuItem
-                    Command="{ReflectionBinding OpenFolder}"
-                    Header="{locale:Locale MenuBarFileOpenUnpacked}"
-                    IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFolderTooltip}" />
-                <MenuItem Header="{locale:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}">
-                    <MenuItem
-                        Click="OpenMiiApplet"
-                        Header="Mii Edit Applet"
-                        ToolTip.Tip="{locale:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
-                </MenuItem>
-                <Separator />
-                <MenuItem
-                    Command="{ReflectionBinding OpenRyujinxFolder}"
-                    Header="{locale:Locale MenuBarFileOpenEmuFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxFolderTooltip}" />
-                <MenuItem
-                    Command="{ReflectionBinding OpenLogsFolder}"
-                    Header="{locale:Locale MenuBarFileOpenLogsFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxLogsTooltip}" />
-                <Separator />
-                <MenuItem
-                    Click="CloseWindow"
-                    Header="{locale:Locale MenuBarFileExit}"
-                    ToolTip.Tip="{locale:Locale ExitTooltip}" />
-            </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarOptions}">
-                <MenuItem
-                    Command="{ReflectionBinding ToggleFullscreen}"
-                    Header="{locale:Locale MenuBarOptionsToggleFullscreen}"
-                    InputGesture="F11" />
-                <MenuItem>
-                    <MenuItem.Icon>
-                        <CheckBox IsChecked="{Binding StartGamesInFullscreen, Mode=TwoWay}"
-                                  MinWidth="250">
-                            <TextBlock Text="{locale:Locale MenuBarOptionsStartGamesInFullscreen}"/>
-                        </CheckBox>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem IsVisible="{Binding ShowConsoleVisible}">
-                    <MenuItem.Icon>
-                        <CheckBox IsChecked="{Binding ShowConsole, Mode=TwoWay}"
-                                  MinWidth="250">
-                            <TextBlock Text="{locale:Locale MenuBarOptionsShowConsole}"/>
-                        </CheckBox>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem Name="ChangeLanguageMenuItem" Header="{locale:Locale MenuBarOptionsChangeLanguage}" />
-                <Separator />
-                <MenuItem
-                    Click="OpenSettings"
-                    Header="{locale:Locale MenuBarOptionsSettings}"
-                    ToolTip.Tip="{locale:Locale OpenSettingsTooltip}" />
-                <MenuItem
-                    Command="{ReflectionBinding ManageProfiles}"
-                    Header="{locale:Locale MenuBarOptionsManageUserProfiles}"
-                    IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale OpenProfileManagerTooltip}" />
-            </MenuItem>
-            <MenuItem
-                Name="ActionsMenuItem"
-                VerticalAlignment="Center"
-                Header="{locale:Locale MenuBarActions}"
-                IsEnabled="{Binding IsGameRunning}">
-                <MenuItem
-                    Click="PauseEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsPauseEmulation}"
-                    InputGesture="{Binding PauseKey}"
-                    IsEnabled="{Binding !IsPaused}"
-                    IsVisible="{Binding !IsPaused}" />
-                <MenuItem
-                    Click="ResumeEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsResumeEmulation}"
-                    InputGesture="{Binding PauseKey}"
-                    IsEnabled="{Binding IsPaused}"
-                    IsVisible="{Binding IsPaused}" />
-                <MenuItem
-                    Click="StopEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsStopEmulation}"
-                    InputGesture="Escape"
-                    IsEnabled="{Binding IsGameRunning}"
-                    ToolTip.Tip="{locale:Locale StopEmulationTooltip}" />
-                <MenuItem Command="{ReflectionBinding SimulateWakeUpMessage}" Header="{locale:Locale MenuBarOptionsSimulateWakeUpMessage}" />
-                <Separator />
-                <MenuItem
-                    Name="ScanAmiiboMenuItem"
-                    AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
-                    Click="OpenAmiiboWindow"
-                    Header="{locale:Locale MenuBarActionsScanAmiibo}"
-                    IsEnabled="{Binding IsAmiiboRequested}" />
-                <MenuItem
-                    Command="{ReflectionBinding TakeScreenshot}"
-                    Header="{locale:Locale MenuBarFileToolsTakeScreenshot}"
-                    InputGesture="{Binding ScreenshotKey}"
-                    IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem
-                    Command="{ReflectionBinding HideUi}"
-                    Header="{locale:Locale MenuBarFileToolsHideUi}"
-                    InputGesture="{Binding ShowUiKey}"
-                    IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem
-                    Click="OpenCheatManagerForCurrentApp"
-                    Header="{locale:Locale GameListContextMenuManageCheat}"
-                    IsEnabled="{Binding IsGameRunning}" />
-            </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarTools}">
-                <MenuItem Header="{locale:Locale MenuBarToolsInstallFirmware}" IsEnabled="{Binding EnableNonGameRunningControls}">
-                    <MenuItem Command="{ReflectionBinding InstallFirmwareFromFile}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromFile}" />
-                    <MenuItem Command="{ReflectionBinding InstallFirmwareFromFolder}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" />
-                </MenuItem>
-                <MenuItem Header="{locale:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
-                    <MenuItem Header="{locale:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click"/>
-                    <MenuItem Header="{locale:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarHelp}">
-                <MenuItem
-                    Name="UpdateMenuItem"
-                    IsEnabled="{Binding CanUpdate}"
-                    Click="CheckForUpdates"
-                    Header="{locale:Locale MenuBarHelpCheckForUpdates}"
-                    ToolTip.Tip="{locale:Locale CheckUpdatesTooltip}" />
-                <Separator />
-                <MenuItem
-                    Click="OpenAboutWindow"
-                    Header="{locale:Locale MenuBarHelpAbout}"
-                    ToolTip.Tip="{locale:Locale OpenAboutTooltip}" />
-            </MenuItem>
-        </Menu>
-    </DockPanel>
-</UserControl>

Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -1,212 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using LibHac.FsSystem;
-using LibHac.Ncm;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common;
-using Ryujinx.Common.Utilities;
-using Ryujinx.HLE.HOS;
-using Ryujinx.Modules;
-using Ryujinx.Ui.Common.Helper;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Views.Main
-{
-    public partial class MainMenuBarView : UserControl
-    {
-        public MainWindow Window { get; private set; }
-        public MainWindowViewModel ViewModel { get; private set; }
-
-        public MainMenuBarView()
-        {
-            InitializeComponent();
-
-            List<MenuItem> menuItems = new();
-
-            string localePath = "Ryujinx.Ava/Assets/Locales";
-            string localeExt  = ".json";
-
-            string[] localesPath = EmbeddedResources.GetAllAvailableResources(localePath, localeExt);
-
-            Array.Sort(localesPath);
-
-            foreach (string locale in localesPath)
-            {
-                string languageCode = Path.GetFileNameWithoutExtension(locale).Split('.').Last();
-                string languageJson = EmbeddedResources.ReadAllText($"{localePath}/{languageCode}{localeExt}");
-                var    strings      = JsonHelper.Deserialize<Dictionary<string, string>>(languageJson);
-
-                if (!strings.TryGetValue("Language", out string languageName))
-                {
-                    languageName = languageCode;
-                }
-
-                MenuItem menuItem = new()
-                {
-                    Header  = languageName,
-                    Command = MiniCommand.Create(() =>
-                    {
-                        ViewModel.ChangeLanguage(languageCode);
-                    })
-                };
-
-                menuItems.Add(menuItem);
-            }
-
-            ChangeLanguageMenuItem.Items = menuItems.ToArray();
-        }
-
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTree(e);
-
-            if (VisualRoot is MainWindow window)
-            {
-                Window = window;
-            }
-
-            ViewModel = Window.ViewModel;
-            DataContext = ViewModel;
-        }
-
-        private async void StopEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            await Window.ViewModel.AppHost?.ShowExitPrompt();
-        }
-
-        private async void PauseEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            await Task.Run(() =>
-            {
-                Window.ViewModel.AppHost?.Pause();
-            });
-        }
-
-        private async void ResumeEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            await Task.Run(() =>
-            {
-                Window.ViewModel.AppHost?.Resume();
-            });
-        }
-
-        public async void OpenSettings(object sender, RoutedEventArgs e)
-        {
-            Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
-
-            await Window.SettingsWindow.ShowDialog(Window);
-
-            ViewModel.LoadConfigurableHotKeys();
-        }
-
-        public void OpenMiiApplet(object sender, RoutedEventArgs e)
-        {
-            string contentPath = ViewModel.ContentManager.GetInstalledContentPath(0x0100000000001009, StorageId.BuiltInSystem, NcaContentType.Program);
-
-            if (!string.IsNullOrEmpty(contentPath))
-            {
-                ViewModel.LoadApplication(contentPath, false, "Mii Applet");
-            }
-        }
-
-        public async void OpenAmiiboWindow(object sender, RoutedEventArgs e)
-        {
-            if (!ViewModel.IsAmiiboRequested)
-            {
-                return;
-            }
-
-            if (ViewModel.AppHost.Device.System.SearchingForAmiibo(out int deviceId))
-            {
-                string titleId = ViewModel.AppHost.Device.Application.TitleIdText.ToUpper();
-                AmiiboWindow window = new(ViewModel.ShowAll, ViewModel.LastScannedAmiiboId, titleId);
-
-                await window.ShowDialog(Window);
-
-                if (window.IsScanned)
-                {
-                    ViewModel.ShowAll = window.ViewModel.ShowAllAmiibo;
-                    ViewModel.LastScannedAmiiboId = window.ScannedAmiibo.GetId();
-
-                    ViewModel.AppHost.Device.System.ScanAmiibo(deviceId, ViewModel.LastScannedAmiiboId, window.ViewModel.UseRandomUuid);
-                }
-            }
-        }
-
-        public async void OpenCheatManagerForCurrentApp(object sender, RoutedEventArgs e)
-        {
-            if (!ViewModel.IsGameRunning)
-            {
-                return;
-            }
-
-            ApplicationLoader application = ViewModel.AppHost.Device.Application;
-            if (application != null)
-            {
-                await new CheatWindow(Window.VirtualFileSystem, application.TitleIdText, application.TitleName).ShowDialog(Window);
-
-                ViewModel.AppHost.Device.EnableCheats();
-            }
-        }
-
-        private void ScanAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
-        {
-            if (sender is MenuItem)
-            {
-                ViewModel.IsAmiiboRequested = Window.ViewModel.AppHost.Device.System.SearchingForAmiibo(out _);
-            }
-        }
-
-        private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)
-        {
-            if (FileAssociationHelper.Install())
-            {
-                await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogInstallFileTypesSuccessMessage],
-                    string.Empty, LocaleManager.Instance[LocaleKeys.InputDialogOk], string.Empty, string.Empty);
-            }
-            else
-            {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogInstallFileTypesErrorMessage]);
-            }
-        }
-
-        private async void UninstallFileTypes_Click(object sender, RoutedEventArgs e)
-        {
-            if (FileAssociationHelper.Uninstall())
-            {
-                await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogUninstallFileTypesSuccessMessage],
-                    string.Empty, LocaleManager.Instance[LocaleKeys.InputDialogOk], string.Empty, string.Empty);
-            }
-            else
-            {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUninstallFileTypesErrorMessage]);
-            }
-        }
-
-        public async void CheckForUpdates(object sender, RoutedEventArgs e)
-        {
-            if (Updater.CanUpdate(true))
-            {
-                await Updater.BeginParse(Window, true);
-            }
-        }
-
-        public async void OpenAboutWindow(object sender, RoutedEventArgs e)
-        {
-            await AboutWindow.Show();
-        }
-
-        public void CloseWindow(object sender, RoutedEventArgs e)
-        {
-            Window.Close();
-        }
-    }
-}

Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml

@@ -1,218 +0,0 @@
-<UserControl 
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsGraphicsView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:CompileBindings="True"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="GraphicsPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsAPI}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsBackend}"
-                                Width="250" />
-                        <ComboBox Width="350"
-                                HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                SelectedIndex="{Binding GraphicsBackendIndex}">
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
-                                <TextBlock Text="Vulkan" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
-                                <TextBlock Text="OpenGL" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
-                        <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsPreferredGpu}"
-                                Width="250" />
-                        <ComboBox Width="350"
-                                HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                SelectedIndex="{Binding PreferredGpuIndex}"
-                                Items="{Binding AvailableGpus}"/>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableShaderCache}"
-                            ToolTip.Tip="{locale:Locale ShaderCacheToggleTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabGraphicsEnableShaderCache}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableTextureRecompression}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableTextureRecompressionTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableTextureRecompression}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableMacroHLE}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableMacroHLETooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableMacroHLE}" />
-                        </CheckBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsResolutionScale}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding ResolutionScale}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <ui:NumberBox
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale ResolutionScaleEntryTooltip}"
-                            MinWidth="150"
-                            SmallChange="0.1"
-                            LargeChange="1"
-                            SimpleNumberFormat="F2"
-                            SpinButtonPlacementMode="Inline"
-                            IsVisible="{Binding IsCustomResolutionScaleActive}"
-                            Maximum="100"
-                            Minimum="0.1"
-                            Value="{Binding CustomResolutionScale}" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding MaxAnisotropy}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAspectRatio}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding AspectRatio}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
-                                   Width="250" />
-                        <ComboBox Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
-                                  SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOn}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsDeveloperOptions}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsShaderDumpPath}"
-                                   Width="250" />
-                        <TextBox Text="{Binding ShaderDumpPath}"
-                                 Width="350"
-                                 ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}" />
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>

Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml

@@ -1,35 +0,0 @@
-<UserControl 
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsNetworkView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:CompileBindings="True"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="NetworkPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabNetworkConnection}" />
-                <CheckBox Margin="10,0,0,0" IsChecked="{Binding EnableInternetAccess}">
-                    <TextBlock Text="{locale:Locale SettingsTabSystemEnableInternetAccess}"
-                               ToolTip.Tip="{locale:Locale EnableInternetAccessTooltip}" />
-                </CheckBox>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>