Try and fix weird nullref

.github/labeler.yml

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

.github/workflows/build.yml

@@ -122,7 +122,7 @@ jobs:
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
+          name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
           path: publish_sdl2_headless
         if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
 
@@ -185,6 +185,6 @@ jobs:
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
           path: "publish_headless/*.tar.gz"
         if: github.event_name == 'pull_request'

.github/workflows/canary.yml

@@ -103,20 +103,20 @@ jobs:
 
       - name: Publish
         run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_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
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
 
       - name: Packing Windows builds
         if: matrix.platform.os == 'windows-latest'
         run: |
           pushd publish_ava
           rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
 
           pushd publish_sdl2_headless
           rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
         shell: bash
 
@@ -126,13 +126,13 @@ jobs:
           pushd publish_ava
           rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
 
           pushd publish_sdl2_headless
           rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
         shell: bash
       
@@ -236,11 +236,11 @@ jobs:
 
       - name: Publish macOS Ryujinx
         run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Publish macOS Ryujinx.Headless.SDL2
         run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Pushing new release
         uses: ncipollo/release-action@v1

.github/workflows/nightly_pr_comment.yml

@@ -38,12 +38,12 @@ jobs:
               return core.error(`No artifacts found`);
             }
             let body = `Download the artifacts for this pull request:\n`;
-            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less</summary>\n`;
+            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less (SDL2)</summary>\n`;
             let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
             for (const art of artifacts) {
               if(art.name.includes('Debug')) {
                 hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-              } else if(art.name.includes('nogui-ryujinx')) {
+              } else if(art.name.includes('sdl2-ryujinx-headless')) {
                 hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else {
                 body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;

.github/workflows/release.yml

@@ -102,8 +102,8 @@ jobs:
 
       - name: Publish
         run: |
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
-          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained -p:IncludeNativeLibrariesForSelfExtract=true
 
       - name: Packing Windows builds
         if: matrix.platform.os == 'windows-latest'
@@ -115,7 +115,7 @@ jobs:
 
           pushd publish_sdl2_headless
           rm libarmeilleure-jitsupport.dylib
-          7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
+          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
         shell: bash
       
@@ -166,7 +166,7 @@ jobs:
 
           pushd publish_sdl2_headless
           chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
           popd
         shell: bash
 
@@ -231,11 +231,11 @@ jobs:
 
       - name: Publish macOS Ryujinx
         run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Publish macOS Ryujinx.Headless.SDL2
         run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Pushing new release
         uses: ncipollo/release-action@v1

.gitignore

@@ -175,6 +175,3 @@ PublishProfiles/
 
 # Glade backup files
 *.glade~
-
-# Ignore MacOS Attribute Files
-._*

Directory.Packages.props

@@ -38,7 +38,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.6.6" />
+    <PackageVersion Include="Gommon" Version="2.6.5" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
@@ -52,4 +52,4 @@
     <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

README.md

@@ -42,7 +42,7 @@
   Guides and documentation can be found on the <a href="https://github.com/GreemDev/Ryujinx/wiki">Wiki tab</a>.
 </p>
 <p align="center">
-  If you would like a more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
+  If you would like a version more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
 </p>
 
 <p align="center">

distribution/macos/create_macos_build_ava.sh

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

distribution/macos/create_macos_build_headless.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$#" -lt 8 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
+if [ "$#" -lt 7 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
     exit 1
 fi
 
@@ -18,14 +18,13 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
 VERSION=$5
 SOURCE_REVISION_ID=$6
 CONFIGURATION=$7
-CANARY=$8
+EXTRA_ARGS=$8
 
-if [ "$CANARY" == "1" ]; then
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.tar
-elif [ "$VERSION" == "1.1.0" ]; then
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
+if [ "$VERSION" == "1.1.0" ];
+then
+  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
 else
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
+  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-$VERSION-macos_universal.tar
 fi
 
 ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
@@ -57,7 +56,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
 cp -R "$ARM64_OUTPUT/" "$UNIVERSAL_OUTPUT"
 rm "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH"
 
-# Make its libraries universal
+# Make it libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTPUT" "$X64_OUTPUT" "$UNIVERSAL_OUTPUT" "**/*.dylib"
 
 if ! [ -x "$(command -v lipo)" ];

src/ARMeilleure/ARMeilleure.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/ARMeilleure/Common/AddressTable.cs

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

src/ARMeilleure/Common/AddressTableLevel.cs

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

src/ARMeilleure/Common/AddressTablePresets.cs

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

src/ARMeilleure/Common/Allocator.cs

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

src/ARMeilleure/Common/IAddressTable.cs

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

src/ARMeilleure/Common/NativeAllocator.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace ARMeilleure.Common
 {
-    public unsafe sealed class NativeAllocator : Allocator
+    unsafe sealed class NativeAllocator : Allocator
     {
         public static NativeAllocator Instance { get; } = new();
 

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

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

src/ARMeilleure/Instructions/InstEmitSystem.cs

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

src/ARMeilleure/Signal/NativeSignalHandlerGenerator.cs

@@ -8,7 +8,7 @@ namespace ARMeilleure.Signal
 {
     public static class NativeSignalHandlerGenerator
     {
-        public const int MaxTrackedRanges = 16;
+        public const int MaxTrackedRanges = 8;
 
         private const int StructAddressOffset = 0;
         private const int StructWriteOffset = 4;

src/ARMeilleure/State/NativeContext.cs

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

src/ARMeilleure/Translation/ArmEmitterContext.cs

@@ -46,7 +46,7 @@ namespace ARMeilleure.Translation
         public IMemoryManager Memory { get; }
 
         public EntryTable<uint> CountTable { get; }
-        public IAddressTable<ulong> FunctionTable { get; }
+        public AddressTable<ulong> FunctionTable { get; }
         public TranslatorStubs Stubs { get; }
 
         public ulong EntryAddress { get; }
@@ -62,7 +62,7 @@ namespace ARMeilleure.Translation
         public ArmEmitterContext(
             IMemoryManager memory,
             EntryTable<uint> countTable,
-            IAddressTable<ulong> funcTable,
+            AddressTable<ulong> funcTable,
             TranslatorStubs stubs,
             ulong entryAddress,
             bool highCq,

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -30,7 +30,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 6992; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 6950; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
@@ -41,7 +41,6 @@ namespace ARMeilleure.Translation.PTC
         public static readonly Symbol PageTableSymbol = new(SymbolType.Special, 1);
         public static readonly Symbol CountTableSymbol = new(SymbolType.Special, 2);
         public static readonly Symbol DispatchStubSymbol = new(SymbolType.Special, 3);
-        public static readonly Symbol FunctionTableSymbol = new(SymbolType.Special, 4);
 
         private const byte FillingByte = 0x00;
         private const CompressionLevel SaveCompressionLevel = CompressionLevel.Fastest;
@@ -102,7 +101,7 @@ namespace ARMeilleure.Translation.PTC
             Disable();
         }
 
-        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode, string cacheSelector)
+        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode)
         {
             Wait();
 
@@ -128,8 +127,6 @@ namespace ARMeilleure.Translation.PTC
             DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
             _memoryMode = memoryMode;
 
-            Logger.Info?.Print(LogClass.Ptc, $"PPTC (v{InternalVersion}) Profile: {DisplayVersion}-{cacheSelector}");
-
             string workPathActual = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", ActualDir);
             string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", BackupDir);
 
@@ -143,8 +140,8 @@ namespace ARMeilleure.Translation.PTC
                 Directory.CreateDirectory(workPathBackup);
             }
 
-            CachePathActual = Path.Combine(workPathActual, DisplayVersion) + "-" + cacheSelector;
-            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion) + "-" + cacheSelector;
+            CachePathActual = Path.Combine(workPathActual, DisplayVersion);
+            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion);
 
             PreLoad();
             Profiler.PreLoad();
@@ -709,10 +706,6 @@ namespace ARMeilleure.Translation.PTC
                 {
                     imm = translator.Stubs.DispatchStub;
                 }
-                else if (symbol == FunctionTableSymbol)
-                {
-                    imm = translator.FunctionTable.Base;
-                }
 
                 if (imm == null)
                 {

src/ARMeilleure/Translation/Translator.cs

@@ -22,13 +22,33 @@ 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 IAddressTable<ulong> FunctionTable { get; }
+        internal AddressTable<ulong> FunctionTable { get; }
         internal EntryTable<uint> CountTable { get; }
         internal TranslatorStubs Stubs { get; }
         internal TranslatorQueue Queue { get; }
@@ -37,7 +57,7 @@ namespace ARMeilleure.Translation
         private Thread[] _backgroundTranslationThreads;
         private volatile int _threadCount;
 
-        public Translator(IJitMemoryAllocator allocator, IMemoryManager memory, IAddressTable<ulong> functionTable)
+        public Translator(IJitMemoryAllocator allocator, IMemoryManager memory, bool for64Bits)
         {
             _allocator = allocator;
             Memory = memory;
@@ -52,15 +72,15 @@ namespace ARMeilleure.Translation
 
             CountTable = new EntryTable<uint>();
             Functions = new TranslatorCache<TranslatedFunction>();
-            FunctionTable = functionTable;
+            FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
             Stubs = new TranslatorStubs(FunctionTable);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
         }
 
-        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
         {
-            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type, cacheSelector);
+            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type);
             return _ptc;
         }
 

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -19,7 +19,7 @@ namespace ARMeilleure.Translation
 
         private bool _disposed;
 
-        private readonly IAddressTable<ulong> _functionTable;
+        private readonly AddressTable<ulong> _functionTable;
         private readonly Lazy<nint> _dispatchStub;
         private readonly Lazy<DispatcherFunction> _dispatchLoop;
         private readonly Lazy<WrapperFunction> _contextWrapper;
@@ -86,7 +86,7 @@ namespace ARMeilleure.Translation
         /// </summary>
         /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
         /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(IAddressTable<ulong> functionTable)
+        public TranslatorStubs(AddressTable<ulong> functionTable)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
 

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

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio/Ryujinx.Audio.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs

@@ -2,7 +2,7 @@ namespace Ryujinx.Common.Configuration.Hid
 {
     public class KeyboardHotkeys
     {
-        public Key ToggleVSyncMode { get; set; }
+        public Key ToggleVsync { get; set; }
         public Key Screenshot { get; set; }
         public Key ShowUI { get; set; }
         public Key Pause { get; set; }
@@ -11,7 +11,5 @@ namespace Ryujinx.Common.Configuration.Hid
         public Key ResScaleDown { get; set; }
         public Key VolumeUp { get; set; }
         public Key VolumeDown { get; set; }
-        public Key CustomVSyncIntervalIncrement { get; set; }
-        public Key CustomVSyncIntervalDecrement { get; set; }
     }
 }

src/Ryujinx.Common/Configuration/VSyncMode.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Common.Configuration
-{
-    public enum VSyncMode
-    {
-        Switch,
-        Unbounded,
-        Custom
-    }
-}

src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs

@@ -69,10 +69,9 @@ namespace Ryujinx.Common.Logging.Targets
             }
 
             string version = ReleaseInformation.Version;
-            string appName = ReleaseInformation.IsCanaryBuild ? "Ryujinx_Canary" : "Ryujinx";
 
             // Get path for the current time
-            path = Path.Combine(logDir.FullName, $"{appName}_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
+            path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
 
             try
             {

src/Ryujinx.Common/ReleaseInformation.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace Ryujinx.Common
@@ -36,13 +35,5 @@ namespace Ryujinx.Common
         public static bool IsReleaseBuild => IsValid && ReleaseChannelName.Equals(ReleaseChannel);
 
         public static string Version => IsValid ? BuildVersion : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
-
-        public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
-            IsCanaryBuild 
-                ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
-                : $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/releases/tag/{newVersion}";
-        
-        public static string GetChangelogForVersion(Version version) =>
-            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/tag/{version}";
     }
 }

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Cpu/AddressTable.cs

@@ -1,482 +0,0 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
-using Ryujinx.Cpu.Signal;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using static Ryujinx.Cpu.MemoryEhMeilleure;
-
-namespace ARMeilleure.Common
-{
-    /// <summary>
-    /// Represents a table of guest address to a value.
-    /// </summary>
-    /// <typeparam name="TEntry">Type of the value</typeparam>
-    public unsafe class AddressTable<TEntry> : IAddressTable<TEntry> where TEntry : unmanaged
-    {
-        /// <summary>
-        /// Represents a page of the address table.
-        /// </summary>
-        private readonly struct AddressTablePage
-        {
-            /// <summary>
-            /// True if the allocation belongs to a sparse block, false otherwise.
-            /// </summary>
-            public readonly bool IsSparse;
-
-            /// <summary>
-            /// Base address for the page.
-            /// </summary>
-            public readonly IntPtr Address;
-
-            public AddressTablePage(bool isSparse, IntPtr address)
-            {
-                IsSparse = isSparse;
-                Address = address;
-            }
-        }
-
-        /// <summary>
-        /// A sparsely mapped block of memory with a signal handler to map pages as they're accessed.
-        /// </summary>
-        private readonly struct TableSparseBlock : IDisposable
-        {
-            public readonly SparseMemoryBlock Block;
-            private readonly TrackingEventDelegate _trackingEvent;
-
-            public TableSparseBlock(ulong size, Action<IntPtr> ensureMapped, PageInitDelegate pageInit)
-            {
-                var block = new SparseMemoryBlock(size, pageInit, null);
-
-                _trackingEvent = (ulong address, ulong size, bool write) =>
-                {
-                    ulong pointer = (ulong)block.Block.Pointer + address;
-                    ensureMapped((IntPtr)pointer);
-                    return pointer;
-                };
-
-                bool added = NativeSignalHandler.AddTrackedRegion(
-                    (nuint)block.Block.Pointer,
-                    (nuint)(block.Block.Pointer + (IntPtr)block.Block.Size),
-                    Marshal.GetFunctionPointerForDelegate(_trackingEvent));
-
-                if (!added)
-                {
-                    throw new InvalidOperationException("Number of allowed tracked regions exceeded.");
-                }
-
-                Block = block;
-            }
-
-            public void Dispose()
-            {
-                NativeSignalHandler.RemoveTrackedRegion((nuint)Block.Block.Pointer);
-
-                Block.Dispose();
-            }
-        }
-
-        private bool _disposed;
-        private TEntry** _table;
-        private readonly List<AddressTablePage> _pages;
-        private TEntry _fill;
-
-        private readonly MemoryBlock _sparseFill;
-        private readonly SparseMemoryBlock _fillBottomLevel;
-        private readonly TEntry* _fillBottomLevelPtr;
-
-        private readonly List<TableSparseBlock> _sparseReserved;
-        private readonly ReaderWriterLockSlim _sparseLock;
-
-        private ulong _sparseBlockSize;
-        private ulong _sparseReservedOffset;
-
-        public bool Sparse { get; }
-
-        /// <inheritdoc/>
-        public ulong Mask { get; }
-
-        /// <inheritdoc/>
-        public AddressTableLevel[] Levels { get; }
-
-        /// <inheritdoc/>
-        public TEntry Fill
-        {
-            get
-            {
-                return _fill;
-            }
-            set
-            {
-                UpdateFill(value);
-            }
-        }
-
-        /// <inheritdoc/>
-        public IntPtr Base
-        {
-            get
-            {
-                ObjectDisposedException.ThrowIf(_disposed, this);
-
-                lock (_pages)
-                {
-                    return (IntPtr)GetRootPage();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
-        /// <see cref="Level"/>.
-        /// </summary>
-        /// <param name="levels">Levels for the address table</param>
-        /// <param name="sparse">True if the bottom page should be sparsely mapped</param>
-        /// <exception cref="ArgumentNullException"><paramref name="levels"/> is null</exception>
-        /// <exception cref="ArgumentException">Length of <paramref name="levels"/> is less than 2</exception>
-        public AddressTable(AddressTableLevel[] levels, bool sparse)
-        {
-            ArgumentNullException.ThrowIfNull(levels);
-
-            _pages = new List<AddressTablePage>(capacity: 16);
-
-            Levels = levels;
-            Mask = 0;
-
-            foreach (var level in Levels)
-            {
-                Mask |= level.Mask;
-            }
-
-            Sparse = sparse;
-
-            if (sparse)
-            {
-                // If the address table is sparse, allocate a fill block
-
-                _sparseFill = new MemoryBlock(268435456ul, MemoryAllocationFlags.Mirrorable); //low Power TC uses size: 65536ul
-
-                ulong bottomLevelSize = (1ul << levels.Last().Length) * (ulong)sizeof(TEntry);
-
-                _fillBottomLevel = new SparseMemoryBlock(bottomLevelSize, null, _sparseFill);
-                _fillBottomLevelPtr = (TEntry*)_fillBottomLevel.Block.Pointer;
-
-                _sparseReserved = new List<TableSparseBlock>();
-                _sparseLock = new ReaderWriterLockSlim();
-
-                _sparseBlockSize = bottomLevelSize;
-            }
-        }
-
-        /// <summary>
-        /// Create an <see cref="AddressTable{TEntry}"/> instance for an ARM function table.
-        /// Selects the best table structure for A32/A64, taking into account the selected memory manager type.
-        /// </summary>
-        /// <param name="for64Bits">True if the guest is A64, false otherwise</param>
-        /// <param name="type">Memory manager type</param>
-        /// <returns>An <see cref="AddressTable{TEntry}"/> for ARM function lookup</returns>
-        public static AddressTable<TEntry> CreateForArm(bool for64Bits, MemoryManagerType type)
-        {
-            // Assume software memory means that we don't want to use any signal handlers.
-            bool sparse = type != MemoryManagerType.SoftwareMmu && type != MemoryManagerType.SoftwarePageTable;
-
-            return new AddressTable<TEntry>(AddressTablePresets.GetArmPreset(for64Bits, sparse), sparse);
-        }
-
-        /// <summary>
-        /// Update the fill value for the bottom level of the table.
-        /// </summary>
-        /// <param name="fillValue">New fill value</param>
-        private void UpdateFill(TEntry fillValue)
-        {
-            if (_sparseFill != null)
-            {
-                Span<byte> span = _sparseFill.GetSpan(0, (int)_sparseFill.Size);
-                MemoryMarshal.Cast<byte, TEntry>(span).Fill(fillValue);
-            }
-
-            _fill = fillValue;
-        }
-
-        /// <summary>
-        /// Signal that the given code range exists.
-        /// </summary>
-        /// <param name="address"></param>
-        /// <param name="size"></param>
-        public void SignalCodeRange(ulong address, ulong size)
-        {
-            AddressTableLevel bottom = Levels.Last();
-            ulong bottomLevelEntries = 1ul << bottom.Length;
-
-            ulong entryIndex = address >> bottom.Index;
-            ulong entries = size >> bottom.Index;
-            entries += entryIndex - BitUtils.AlignDown(entryIndex, bottomLevelEntries);
-
-            _sparseBlockSize = Math.Max(_sparseBlockSize, BitUtils.AlignUp(entries, bottomLevelEntries) * (ulong)sizeof(TEntry));
-        }
-
-        /// <inheritdoc/>
-        public bool IsValid(ulong address)
-        {
-            return (address & ~Mask) == 0;
-        }
-
-        /// <inheritdoc/>
-        public ref TEntry GetValue(ulong address)
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-
-            if (!IsValid(address))
-            {
-                throw new ArgumentException($"Address 0x{address:X} is not mapped onto the table.", nameof(address));
-            }
-
-            lock (_pages)
-            {
-                TEntry* page = GetPage(address);
-
-                int index = Levels[^1].GetValue(address);
-
-                EnsureMapped((IntPtr)(page + index));
-
-                return ref page[index];
-            }
-        }
-
-        /// <summary>
-        /// Gets the leaf page for the specified guest <paramref name="address"/>.
-        /// </summary>
-        /// <param name="address">Guest address</param>
-        /// <returns>Leaf page for the specified guest <paramref name="address"/></returns>
-        private TEntry* GetPage(ulong address)
-        {
-            TEntry** page = GetRootPage();
-
-            for (int i = 0; i < Levels.Length - 1; i++)
-            {
-                ref AddressTableLevel level = ref Levels[i];
-                ref TEntry* nextPage = ref page[level.GetValue(address)];
-
-                if (nextPage == null || nextPage == _fillBottomLevelPtr)
-                {
-                    ref AddressTableLevel nextLevel = ref Levels[i + 1];
-
-                    if (i == Levels.Length - 2)
-                    {
-                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, Fill, leaf: true);
-                    }
-                    else
-                    {
-                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, GetFillValue(i), leaf: false);
-                    }
-                }
-
-                page = (TEntry**)nextPage;
-            }
-
-            return (TEntry*)page;
-        }
-
-        /// <summary>
-        /// Ensure the given pointer is mapped in any overlapping sparse reservations.
-        /// </summary>
-        /// <param name="ptr">Pointer to be mapped</param>
-        private void EnsureMapped(IntPtr ptr)
-        {
-            if (Sparse)
-            {
-                // Check sparse allocations to see if the pointer is in any of them.
-                // Ensure the page is committed if there's a match.
-
-                _sparseLock.EnterReadLock();
-
-                try
-                {
-                    foreach (TableSparseBlock reserved in _sparseReserved)
-                    {
-                        SparseMemoryBlock sparse = reserved.Block;
-
-                        if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (IntPtr)sparse.Block.Size)
-                        {
-                            sparse.EnsureMapped((ulong)(ptr - sparse.Block.Pointer));
-
-                            break;
-                        }
-                    }
-                }
-                finally
-                {
-                    _sparseLock.ExitReadLock();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get the fill value for a non-leaf level of the table.
-        /// </summary>
-        /// <param name="level">Level to get the fill value for</param>
-        /// <returns>The fill value</returns>
-        private IntPtr GetFillValue(int level)
-        {
-            if (_fillBottomLevel != null && level == Levels.Length - 2)
-            {
-                return (IntPtr)_fillBottomLevelPtr;
-            }
-            else
-            {
-                return IntPtr.Zero;
-            }
-        }
-
-        /// <summary>
-        /// Lazily initialize and get the root page of the <see cref="AddressTable{TEntry}"/>.
-        /// </summary>
-        /// <returns>Root page of the <see cref="AddressTable{TEntry}"/></returns>
-        private TEntry** GetRootPage()
-        {
-            if (_table == null)
-            {
-                if (Levels.Length == 1)
-                    _table = (TEntry**)Allocate(1 << Levels[0].Length, Fill, leaf: true);
-                else
-                    _table = (TEntry**)Allocate(1 << Levels[0].Length, GetFillValue(0), leaf: false);
-            }
-
-            return _table;
-        }
-
-        /// <summary>
-        /// Initialize a leaf page with the fill value.
-        /// </summary>
-        /// <param name="page">Page to initialize</param>
-        private void InitLeafPage(Span<byte> page)
-        {
-            MemoryMarshal.Cast<byte, TEntry>(page).Fill(_fill);
-        }
-
-        /// <summary>
-        /// Reserve a new sparse block, and add it to the list.
-        /// </summary>
-        /// <returns>The new sparse block that was added</returns>
-        private TableSparseBlock ReserveNewSparseBlock()
-        {
-            var block = new TableSparseBlock(_sparseBlockSize, EnsureMapped, InitLeafPage);
-
-            _sparseReserved.Add(block);
-            _sparseReservedOffset = 0;
-
-            return block;
-        }
-
-        /// <summary>
-        /// Allocates a block of memory of the specified type and length.
-        /// </summary>
-        /// <typeparam name="T">Type of elements</typeparam>
-        /// <param name="length">Number of elements</param>
-        /// <param name="fill">Fill value</param>
-        /// <param name="leaf"><see langword="true"/> if leaf; otherwise <see langword="false"/></param>
-        /// <returns>Allocated block</returns>
-        private IntPtr Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
-        {
-            var size = sizeof(T) * length;
-
-            AddressTablePage page;
-
-            if (Sparse && leaf)
-            {
-                _sparseLock.EnterWriteLock();
-
-                SparseMemoryBlock block;
-
-                if (_sparseReserved.Count == 0)
-                {
-                    block = ReserveNewSparseBlock().Block;
-                }
-                else
-                {
-                    block = _sparseReserved.Last().Block;
-
-                    if (_sparseReservedOffset == block.Block.Size)
-                    {
-                        block = ReserveNewSparseBlock().Block;
-                    }
-                }
-
-                page = new AddressTablePage(true, block.Block.Pointer + (IntPtr)_sparseReservedOffset);
-
-                _sparseReservedOffset += (ulong)size;
-
-                _sparseLock.ExitWriteLock();
-            }
-            else
-            {
-                var address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
-                page = new AddressTablePage(false, address);
-
-                var span = new Span<T>((void*)page.Address, length);
-                span.Fill(fill);
-            }
-
-            _pages.Add(page);
-
-            //TranslatorEventSource.Log.AddressTableAllocated(size, leaf);
-
-            return page.Address;
-        }
-
-        /// <summary>
-        /// Releases all resources used by the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases all unmanaged and optionally managed resources used by the <see cref="AddressTable{TEntry}"/>
-        /// instance.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to dispose managed resources also; otherwise just unmanaged resouces</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                foreach (var page in _pages)
-                {
-                    if (!page.IsSparse)
-                    {
-                        Marshal.FreeHGlobal(page.Address);
-                    }
-                }
-
-                if (Sparse)
-                {
-                    foreach (TableSparseBlock block in _sparseReserved)
-                    {
-                        block.Dispose();
-                    }
-
-                    _sparseReserved.Clear();
-
-                    _fillBottomLevel.Dispose();
-                    _sparseFill.Dispose();
-                    _sparseLock.Dispose();
-                }
-
-                _disposed = true;
-            }
-        }
-
-        /// <summary>
-        /// Frees resources used by the <see cref="AddressTable{TEntry}"/> instance.
-        /// </summary>
-        ~AddressTable()
-        {
-            Dispose(false);
-        }
-    }
-}

src/Ryujinx.Cpu/AppleHv/HvCpuContext.cs

@@ -32,7 +32,7 @@ namespace Ryujinx.Cpu.AppleHv
         {
         }
 
-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
         {
             return new DummyDiskCacheLoadState();
         }

src/Ryujinx.Cpu/ICpuContext.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu
         /// <param name="displayVersion">Version of the application</param>
         /// <param name="enabled">True if the cache should be loaded from disk if it exists, false otherwise</param>
         /// <returns>Disk cache load progress reporter and manager</returns>
-        IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector);
+        IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled);
 
         /// <summary>
         /// Indicates that code has been loaded into guest memory, and that it might be executed in the future.

src/Ryujinx.Cpu/Jit/JitCpuContext.cs

@@ -1,4 +1,3 @@
-using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.Translation;
 using Ryujinx.Cpu.Signal;
@@ -10,13 +9,11 @@ namespace Ryujinx.Cpu.Jit
     {
         private readonly ITickSource _tickSource;
         private readonly Translator _translator;
-        private readonly AddressTable<ulong> _functionTable;
 
         public JitCpuContext(ITickSource tickSource, IMemoryManager memory, bool for64Bit)
         {
             _tickSource = tickSource;
-            _functionTable = AddressTable<ulong>.CreateForArm(for64Bit, memory.Type);
-            _translator = new Translator(new JitMemoryAllocator(forJit: true), memory, _functionTable);
+            _translator = new Translator(new JitMemoryAllocator(forJit: true), memory, for64Bit);
 
             if (memory.Type.IsHostMappedOrTracked())
             {
@@ -50,15 +47,14 @@ namespace Ryujinx.Cpu.Jit
         }
 
         /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
         {
-            return new JitDiskCacheLoadState(_translator.LoadDiskCache(titleIdText, displayVersion, enabled, cacheSelector));
+            return new JitDiskCacheLoadState(_translator.LoadDiskCache(titleIdText, displayVersion, enabled));
         }
 
         /// <inheritdoc/>
         public void PrepareCodeRange(ulong address, ulong size)
         {
-            _functionTable.SignalCodeRange(address, size);
             _translator.PrepareCodeRange(address, size);
         }
 

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitFlow.cs

@@ -140,10 +140,6 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             bool isTail = false)
         {
             int tempRegister;
-            int tempGuestAddress = -1;
-
-            bool inlineLookup = guestAddress.Kind != OperandKind.Constant && 
-                                funcTable is { Sparse: true };
 
             if (guestAddress.Kind == OperandKind.Constant)
             {
@@ -157,16 +153,9 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             else
             {
                 asm.StrRiUn(guestAddress, Register(regAlloc.FixedContextRegister), NativeContextOffsets.DispatchAddressOffset);
-
-                if (inlineLookup && guestAddress.Value == 0)
-                {
-                    // X0 will be overwritten. Move the address to a temp register.
-                    tempGuestAddress = regAlloc.AllocateTempGprRegister();
-                    asm.Mov(Register(tempGuestAddress), guestAddress);
-                }
             }
 
-            tempRegister = NextFreeRegister(1, tempGuestAddress);
+            tempRegister = regAlloc.FixedContextRegister == 1 ? 2 : 1;
 
             if (!isTail)
             {
@@ -187,40 +176,6 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
                 asm.Mov(rn, funcPtrLoc & ~0xfffUL);
                 asm.LdrRiUn(rn, rn, (int)(funcPtrLoc & 0xfffUL));
             }
-            else if (inlineLookup)
-            {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
-
-                Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
-
-                if (tempGuestAddress != -1)
-                {
-                    guestAddress = Register(tempGuestAddress);
-                }
-
-                ulong tableBase = (ulong)funcTable.Base;
-
-                // Index into the table.
-                asm.Mov(rn, tableBase);
-
-                for (int i = 0; i < funcTable.Levels.Length; i++)
-                {
-                    var level = funcTable.Levels[i];
-                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                    asm.Lsl(indexReg, indexReg, Const(3));
-
-                    // Index into the page.
-                    asm.Add(rn, rn, indexReg);
-
-                    // Load the page address.
-                    asm.LdrRiUn(rn, rn, 0);
-                }
-
-                if (tempGuestAddress != -1)
-                {
-                    regAlloc.FreeTempGprRegister(tempGuestAddress);
-                }
-            }
             else
             {
                 asm.Mov(rn, (ulong)funcPtr);
@@ -297,20 +252,5 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
         {
             return new Operand(register, RegisterType.Integer, type);
         }
-
-        private static Operand Const(long value, OperandType type = OperandType.I64)
-        {
-            return new Operand(type, (ulong)value);
-        }
-
-        private static int NextFreeRegister(int start, int avoid)
-        {
-            if (start == avoid)
-            {
-                start++;
-            }
-
-            return start;
-        }
     }
 }

src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/InstEmitSystem.cs

@@ -305,10 +305,6 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             bool isTail = false)
         {
             int tempRegister;
-            int tempGuestAddress = -1;
-
-            bool inlineLookup = guestAddress.Kind != OperandKind.Constant && 
-                                funcTable is { Sparse: true };
 
             if (guestAddress.Kind == OperandKind.Constant)
             {
@@ -322,16 +318,9 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             else
             {
                 asm.StrRiUn(guestAddress, Register(regAlloc.FixedContextRegister), NativeContextOffsets.DispatchAddressOffset);
-
-                if (inlineLookup && guestAddress.Value == 0)
-                {
-                    // X0 will be overwritten. Move the address to a temp register.
-                    tempGuestAddress = regAlloc.AllocateTempGprRegister();
-                    asm.Mov(Register(tempGuestAddress), guestAddress);
-                }
             }
 
-            tempRegister = NextFreeRegister(1, tempGuestAddress);
+            tempRegister = regAlloc.FixedContextRegister == 1 ? 2 : 1;
 
             if (!isTail)
             {
@@ -352,40 +341,6 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
                 asm.Mov(rn, funcPtrLoc & ~0xfffUL);
                 asm.LdrRiUn(rn, rn, (int)(funcPtrLoc & 0xfffUL));
             }
-            else if (inlineLookup)
-            {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
-
-                Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
-
-                if (tempGuestAddress != -1)
-                {
-                    guestAddress = Register(tempGuestAddress);
-                }
-
-                ulong tableBase = (ulong)funcTable.Base;
-
-                // Index into the table.
-                asm.Mov(rn, tableBase);
-
-                for (int i = 0; i < funcTable.Levels.Length; i++)
-                {
-                    var level = funcTable.Levels[i];
-                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                    asm.Lsl(indexReg, indexReg, Const(3));
-
-                    // Index into the page.
-                    asm.Add(rn, rn, indexReg);
-
-                    // Load the page address.
-                    asm.LdrRiUn(rn, rn, 0);
-                }
-
-                if (tempGuestAddress != -1)
-                {
-                    regAlloc.FreeTempGprRegister(tempGuestAddress);
-                }
-            }
             else
             {
                 asm.Mov(rn, (ulong)funcPtr);
@@ -658,20 +613,5 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
         {
             return new Operand(register, RegisterType.Integer, type);
         }
-
-        private static Operand Const(long value, OperandType type = OperandType.I64)
-        {
-            return new Operand(type, (ulong)value);
-        }
-
-        private static int NextFreeRegister(int start, int avoid)
-        {
-            if (start == avoid)
-            {
-                start++;
-            }
-
-            return start;
-        }
     }
 }

src/Ryujinx.Cpu/LightningJit/LightningJitCpuContext.cs

@@ -1,4 +1,3 @@
-using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using Ryujinx.Cpu.Jit;
 using Ryujinx.Cpu.LightningJit.State;
@@ -9,16 +8,11 @@ namespace Ryujinx.Cpu.LightningJit
     {
         private readonly ITickSource _tickSource;
         private readonly Translator _translator;
-        private readonly AddressTable<ulong> _functionTable;
 
         public LightningJitCpuContext(ITickSource tickSource, IMemoryManager memory, bool for64Bit)
         {
             _tickSource = tickSource;
-
-            _functionTable = AddressTable<ulong>.CreateForArm(for64Bit, memory.Type);
-
-            _translator = new Translator(memory, _functionTable);
-
+            _translator = new Translator(memory, for64Bit);
             memory.UnmapEvent += UnmapHandler;
         }
 
@@ -46,7 +40,7 @@ namespace Ryujinx.Cpu.LightningJit
         }
 
         /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)
         {
             return new DummyDiskCacheLoadState();
         }
@@ -54,7 +48,6 @@ namespace Ryujinx.Cpu.LightningJit
         /// <inheritdoc/>
         public void PrepareCodeRange(ulong address, ulong size)
         {
-            _functionTable.SignalCodeRange(address, size);
         }
 
         public void Dispose()

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -19,6 +19,25 @@ namespace Ryujinx.Cpu.LightningJit
         // Should be enabled on platforms that enforce W^X.
         private static bool IsNoWxPlatform => false;
 
+        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(23, 9),
+                new(15, 8),
+                new( 7, 8),
+                new( 1, 6),
+            };
+
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
         private readonly NoWxCache _noWxCache;
         private bool _disposed;
@@ -28,7 +47,7 @@ namespace Ryujinx.Cpu.LightningJit
         internal TranslatorStubs Stubs { get; }
         internal IMemoryManager Memory { get; }
 
-        public Translator(IMemoryManager memory, AddressTable<ulong> functionTable)
+        public Translator(IMemoryManager memory, bool for64Bits)
         {
             Memory = memory;
 
@@ -44,7 +63,7 @@ namespace Ryujinx.Cpu.LightningJit
             }
 
             Functions = new TranslatorCache<TranslatedFunction>();
-            FunctionTable = functionTable;
+            FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
             Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.Cpu.LightningJit
 
         private bool _disposed;
 
-        private readonly IAddressTable<ulong> _functionTable;
+        private readonly AddressTable<ulong> _functionTable;
         private readonly NoWxCache _noWxCache;
         private readonly GetFunctionAddressDelegate _getFunctionAddressRef;
         private readonly nint _getFunctionAddress;
@@ -79,7 +79,7 @@ namespace Ryujinx.Cpu.LightningJit
         /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
         /// <param name="noWxCache">Cache used on platforms that enforce W^X, otherwise should be null</param>
         /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(IAddressTable<ulong> functionTable, NoWxCache noWxCache)
+        public TranslatorStubs(AddressTable<ulong> functionTable, NoWxCache noWxCache)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
 

src/Ryujinx.Cpu/Ryujinx.Cpu.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Device/Ryujinx.Graphics.Device.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.GAL/IWindow.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.GAL
 
         void SetSize(int width, int height);
 
-        void ChangeVSyncMode(VSyncMode vSyncMode);
+        void ChangeVSyncMode(bool vsyncEnabled);
 
         void SetAntiAliasing(AntiAliasing antialiasing);
         void SetScalingFilter(ScalingFilter type);

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs

@@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _impl.Window.SetSize(width, height);
         }
 
-        public void ChangeVSyncMode(VSyncMode vSyncMode) { }
+        public void ChangeVSyncMode(bool vsyncEnabled) { }
 
         public void SetAntiAliasing(AntiAliasing effect) { }
 

src/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.GAL/VSyncMode.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Graphics.GAL
-{
-    public enum VSyncMode
-    {
-        Switch,
-        Unbounded,
-        Custom
-    }
-}

src/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Host1x/Ryujinx.Graphics.Host1x.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.OpenGL/Window.cs

@@ -54,7 +54,7 @@ namespace Ryujinx.Graphics.OpenGL
             GL.PixelStore(PixelStoreParameter.UnpackAlignment, 4);
         }
 
-        public void ChangeVSyncMode(VSyncMode vSyncMode) { }
+        public void ChangeVSyncMode(bool vsyncEnabled) { }
 
         public void SetSize(int width, int height)
         {

src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Video/Ryujinx.Graphics.Video.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.Vulkan/Window.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         private int _width;
         private int _height;
-        private VSyncMode _vSyncMode;
+        private bool _vsyncEnabled;
         private bool _swapchainIsDirty;
         private VkFormat _format;
         private AntiAliasing _currentAntiAliasing;
@@ -139,7 +139,7 @@ namespace Ryujinx.Graphics.Vulkan
                 ImageArrayLayers = 1,
                 PreTransform = capabilities.CurrentTransform,
                 CompositeAlpha = ChooseCompositeAlpha(capabilities.SupportedCompositeAlpha),
-                PresentMode = ChooseSwapPresentMode(presentModes, _vSyncMode),
+                PresentMode = ChooseSwapPresentMode(presentModes, _vsyncEnabled),
                 Clipped = true,
             };
 
@@ -279,9 +279,9 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        private static PresentModeKHR ChooseSwapPresentMode(PresentModeKHR[] availablePresentModes, VSyncMode vSyncMode)
+        private static PresentModeKHR ChooseSwapPresentMode(PresentModeKHR[] availablePresentModes, bool vsyncEnabled)
         {
-            if (vSyncMode == VSyncMode.Unbounded && availablePresentModes.Contains(PresentModeKHR.ImmediateKhr))
+            if (!vsyncEnabled && availablePresentModes.Contains(PresentModeKHR.ImmediateKhr))
             {
                 return PresentModeKHR.ImmediateKhr;
             }
@@ -634,10 +634,9 @@ namespace Ryujinx.Graphics.Vulkan
             _swapchainIsDirty = true;
         }
 
-        public override void ChangeVSyncMode(VSyncMode vSyncMode)
+        public override void ChangeVSyncMode(bool vsyncEnabled)
         {
-            _vSyncMode = vSyncMode;
-            //present mode may change, so mark the swapchain for recreation
+            _vsyncEnabled = vsyncEnabled;
             _swapchainIsDirty = true;
         }
 

src/Ryujinx.Graphics.Vulkan/WindowBase.cs

@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
         public abstract void Dispose();
         public abstract void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback);
         public abstract void SetSize(int width, int height);
-        public abstract void ChangeVSyncMode(VSyncMode vSyncMode);
+        public abstract void ChangeVSyncMode(bool vsyncEnabled);
         public abstract void SetAntiAliasing(AntiAliasing effect);
         public abstract void SetScalingFilter(ScalingFilter scalerType);
         public abstract void SetScalingFilterLevel(float scale);

src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj

@@ -6,7 +6,6 @@
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
         <IsRoslynComponent>true</IsRoslynComponent>
-        <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
     </PropertyGroup>
 
     <ItemGroup>

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -9,7 +9,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.HLE.UI;
 using System;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE
 {
@@ -85,14 +84,9 @@ namespace Ryujinx.HLE
         internal readonly RegionCode Region;
 
         /// <summary>
-        /// Control the initial state of the present interval in the SurfaceFlinger service (previously Vsync).
+        /// Control the initial state of the vertical sync in the SurfaceFlinger service.
         /// </summary>
-        internal readonly VSyncMode VSyncMode;
-
-        /// <summary>
-        /// Control the custom VSync interval, if enabled and active.
-        /// </summary>
-        internal readonly int CustomVSyncInterval;
+        internal readonly bool EnableVsync;
 
         /// <summary>
         /// Control the initial state of the docked mode.
@@ -201,7 +195,7 @@ namespace Ryujinx.HLE
                                 IHostUIHandler hostUIHandler,
                                 SystemLanguage systemLanguage,
                                 RegionCode region,
-                                VSyncMode vSyncMode,
+                                bool enableVsync,
                                 bool enableDockedMode,
                                 bool enablePtc,
                                 bool enableInternetAccess,
@@ -218,8 +212,7 @@ namespace Ryujinx.HLE
                                 MultiplayerMode multiplayerMode,
                                 bool multiplayerDisableP2p,
                                 string multiplayerLdnPassphrase,
-                                string multiplayerLdnServer,
-                                int customVSyncInterval)
+                                string multiplayerLdnServer)
         {
             VirtualFileSystem = virtualFileSystem;
             LibHacHorizonManager = libHacHorizonManager;
@@ -232,8 +225,7 @@ namespace Ryujinx.HLE
             HostUIHandler = hostUIHandler;
             SystemLanguage = systemLanguage;
             Region = region;
-            VSyncMode = vSyncMode;
-            CustomVSyncInterval = customVSyncInterval;
+            EnableVsync = enableVsync;
             EnableDockedMode = enableDockedMode;
             EnablePtc = enablePtc;
             EnableInternetAccess = enableInternetAccess;

src/Ryujinx.HLE/HOS/ArmProcessContext.cs

@@ -13,8 +13,7 @@ namespace Ryujinx.HLE.HOS
             string displayVersion,
             bool diskCacheEnabled,
             ulong codeAddress,
-            ulong codeSize,
-            string cacheSelector);
+            ulong codeSize);
     }
 
     class ArmProcessContext<T> : IArmProcessContext where T : class, IVirtualMemoryManagerTracked, IMemoryManager
@@ -68,11 +67,10 @@ namespace Ryujinx.HLE.HOS
             string displayVersion,
             bool diskCacheEnabled,
             ulong codeAddress,
-            ulong codeSize,
-            string cacheSelector)
+            ulong codeSize)
         {
             _cpuContext.PrepareCodeRange(codeAddress, codeSize);
-            return _cpuContext.LoadDiskCache(titleIdText, displayVersion, diskCacheEnabled, cacheSelector);
+            return _cpuContext.LoadDiskCache(titleIdText, displayVersion, diskCacheEnabled);
         }
 
         public void InvalidateCacheRegion(ulong address, ulong size)

src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs

@@ -114,7 +114,7 @@ namespace Ryujinx.HLE.HOS
                 }
             }
 
-            DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, "default"); //Ready for exefs profiles
+            DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize);
 
             return processContext;
         }

src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs

@@ -10,12 +10,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     class SurfaceFlinger : IConsumerListener, IDisposable
     {
+        private const int TargetFps = 60;
+
         private readonly Switch _device;
 
         private readonly Dictionary<long, Layer> _layers;
@@ -31,9 +32,6 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
         private readonly long _spinTicks;
         private readonly long _1msTicks;
 
-        private VSyncMode _vSyncMode;
-        private long _targetVSyncInterval;
-
         private int _swapInterval;
         private int _swapIntervalDelay;
 
@@ -90,8 +88,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
             }
             else
             {
-                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
-                _targetVSyncInterval = _device.TargetVSyncInterval;
+                _ticksPerFrame = Stopwatch.Frequency / TargetFps;
             }
         }
 
@@ -373,20 +370,15 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 
                 if (acquireStatus == Status.Success)
                 {
-                    if (_device.VSyncMode == VSyncMode.Unbounded)
+                    // If device vsync is disabled, reflect the change.
+                    if (!_device.EnableDeviceVsync)
                     {
                         if (_swapInterval != 0)
                         {
                             UpdateSwapInterval(0);
-                            _vSyncMode = _device.VSyncMode;
                         }
                     }
-                    else if (_device.VSyncMode != _vSyncMode)
-                    {
-                        UpdateSwapInterval(_device.VSyncMode == VSyncMode.Unbounded ? 0 : item.SwapInterval);
-                        _vSyncMode = _device.VSyncMode;
-                    }
-                    else if (item.SwapInterval != _swapInterval || _device.TargetVSyncInterval != _targetVSyncInterval)
+                    else if (item.SwapInterval != _swapInterval)
                     {
                         UpdateSwapInterval(item.SwapInterval);
                     }

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.HLE/Switch.cs

@@ -27,11 +27,7 @@ namespace Ryujinx.HLE
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
-        public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
-        public bool CustomVSyncIntervalEnabled { get; set; } = false;
-        public int CustomVSyncInterval { get; set; }
-
-        public long TargetVSyncInterval { get; set; } = 60;
+        public bool EnableDeviceVsync { get; set; }
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
@@ -63,14 +59,12 @@ namespace Ryujinx.HLE
             System.State.SetLanguage(Configuration.SystemLanguage);
             System.State.SetRegion(Configuration.Region);
 
-            VSyncMode                               = Configuration.VSyncMode;
-            CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
+            EnableDeviceVsync                       = Configuration.EnableVsync;
             System.State.DockedMode                 = Configuration.EnableDockedMode;
             System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
             System.EnablePtc                        = Configuration.EnablePtc;
             System.FsIntegrityCheckLevel            = Configuration.FsIntegrityCheckLevel;
             System.GlobalAccessLogMode              = Configuration.FsGlobalAccessLogMode;
-            UpdateVSyncInterval();
 #pragma warning restore IDE0055
         }
 
@@ -81,34 +75,6 @@ namespace Ryujinx.HLE
             Gpu.GPFifo.DispatchCalls();
         }
 
-        public void IncrementCustomVSyncInterval()
-        {
-            CustomVSyncInterval += 1;
-            UpdateVSyncInterval();
-        }
-
-        public void DecrementCustomVSyncInterval()
-        {
-            CustomVSyncInterval -= 1;
-            UpdateVSyncInterval();
-        }
-
-        public void UpdateVSyncInterval()
-        {
-            switch (VSyncMode)
-            {
-                case VSyncMode.Custom:
-                    TargetVSyncInterval = CustomVSyncInterval;
-                    break;
-                case VSyncMode.Switch:
-                    TargetVSyncInterval = 60;
-                    break;
-                case VSyncMode.Unbounded:
-                    TargetVSyncInterval = 1;
-                    break;
-            }
-        }
-
         public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
         public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
         public bool LoadNca(string ncaFile) => Processes.LoadNca(ncaFile);

src/Ryujinx.Headless.SDL2/Options.cs

@@ -115,11 +115,8 @@ namespace Ryujinx.Headless.SDL2
         [Option("fs-global-access-log-mode", Required = false, Default = 0, HelpText = "Enables FS access log output to the console.")]
         public int FsGlobalAccessLogMode { get; set; }
 
-        [Option("vsync-mode", Required = false, Default = VSyncMode.Switch, HelpText = "Sets the emulated VSync mode (Switch, Unbounded, or Custom).")]
-        public VSyncMode VSyncMode { get; set; }
-
-        [Option("custom-refresh-rate", Required = false, Default = 90, HelpText = "Sets the custom refresh rate target value (integer).")]
-        public int CustomVSyncInterval { get; set; }
+        [Option("disable-vsync", Required = false, HelpText = "Disables Vertical Sync.")]
+        public bool DisableVSync { get; set; }
 
         [Option("disable-shader-cache", Required = false, HelpText = "Disables Shader cache.")]
         public bool DisableShaderCache { get; set; }

src/Ryujinx.Headless.SDL2/Program.cs

@@ -563,7 +563,7 @@ namespace Ryujinx.Headless.SDL2
                 window,
                 options.SystemLanguage,
                 options.SystemRegion,
-                options.VSyncMode,
+                !options.DisableVSync,
                 !options.DisableDockedMode,
                 !options.DisablePTC,
                 options.EnableInternetAccess,
@@ -580,8 +580,7 @@ namespace Ryujinx.Headless.SDL2
                 Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
                 false,
                 "",
-                "",
-                options.CustomVSyncInterval);
+                "");
 
             return new Switch(configuration);
         }

src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj

@@ -9,7 +9,6 @@
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
     <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
     <TieredPGO>true</TieredPGO>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Headless.SDL2/StatusUpdatedEventArgs.cs

@@ -3,7 +3,7 @@ using System;
 namespace Ryujinx.Headless.SDL2
 {
     class StatusUpdatedEventArgs(
-        string vSyncMode,
+        bool vSyncEnabled,
         string dockedMode,
         string aspectRatio,
         string gameStatus,
@@ -11,7 +11,7 @@ namespace Ryujinx.Headless.SDL2
         string gpuName)
         : EventArgs
     {
-        public string VSyncMode = vSyncMode;
+        public bool VSyncEnabled = vSyncEnabled;
         public string DockedMode = dockedMode;
         public string AspectRatio = aspectRatio;
         public string GameStatus = gameStatus;

src/Ryujinx.Headless.SDL2/WindowBase.cs

@@ -314,7 +314,7 @@ namespace Ryujinx.Headless.SDL2
                         }
 
                         StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                            Device.VSyncMode.ToString(),
+                            Device.EnableDeviceVsync,
                             dockedMode,
                             Device.Configuration.AspectRatio.ToText(),
                             $"Game: {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",

src/Ryujinx.Horizon.Common/Ryujinx.Horizon.Common.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon.Kernel.Generators/Ryujinx.Horizon.Kernel.Generators.csproj

@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon/Ryujinx.Horizon.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Input.SDL2/Ryujinx.Input.SDL2.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Input/Ryujinx.Input.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Memory/Ryujinx.Memory.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Memory/SparseMemoryBlock.cs

@@ -1,125 +0,0 @@
-using Ryujinx.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-
-namespace Ryujinx.Memory
-{
-    public delegate void PageInitDelegate(Span<byte> page);
-
-    public class SparseMemoryBlock : IDisposable
-    {
-        private const ulong MapGranularity = 1UL << 17;
-
-        private readonly PageInitDelegate _pageInit;
-
-        private readonly object _lock = new object();
-        private readonly ulong _pageSize;
-        private readonly MemoryBlock _reservedBlock;
-        private readonly List<MemoryBlock> _mappedBlocks;
-        private ulong _mappedBlockUsage;
-
-        private readonly ulong[] _mappedPageBitmap;
-
-        public MemoryBlock Block => _reservedBlock;
-
-        public SparseMemoryBlock(ulong size, PageInitDelegate pageInit, MemoryBlock fill)
-        {
-            _pageSize = MemoryBlock.GetPageSize();
-            _reservedBlock = new MemoryBlock(size, MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible);
-            _mappedBlocks = new List<MemoryBlock>();
-            _pageInit = pageInit;
-
-            int pages = (int)BitUtils.DivRoundUp(size, _pageSize);
-            int bitmapEntries = BitUtils.DivRoundUp(pages, 64);
-            _mappedPageBitmap = new ulong[bitmapEntries];
-
-            if (fill != null)
-            {
-                // Fill the block with mappings from the fill block.
-
-                if (fill.Size % _pageSize != 0)
-                {
-                    throw new ArgumentException("Fill memory block should be page aligned.", nameof(fill));
-                }
-
-                int repeats = (int)BitUtils.DivRoundUp(size, fill.Size);
-
-                ulong offset = 0;
-                for (int i = 0; i < repeats; i++)
-                {
-                    _reservedBlock.MapView(fill, 0, offset, Math.Min(fill.Size, size - offset));
-                    offset += fill.Size;
-                }
-            }
-
-            // If a fill block isn't provided, the pages that aren't EnsureMapped are unmapped.
-            // The caller can rely on signal handler to fill empty pages instead.
-        }
-
-        private void MapPage(ulong pageOffset)
-        {
-            // Take a page from the latest mapped block.
-            MemoryBlock block = _mappedBlocks.LastOrDefault();
-
-            if (block == null || _mappedBlockUsage == MapGranularity)
-            {
-                // Need to map some more memory.
-
-                block = new MemoryBlock(MapGranularity, MemoryAllocationFlags.Mirrorable);
-
-                _mappedBlocks.Add(block);
-
-                _mappedBlockUsage = 0;
-            }
-
-            _pageInit(block.GetSpan(_mappedBlockUsage, (int)_pageSize));
-            _reservedBlock.MapView(block, _mappedBlockUsage, pageOffset, _pageSize);
-
-            _mappedBlockUsage += _pageSize;
-        }
-
-        public void EnsureMapped(ulong offset)
-        {
-            int pageIndex = (int)(offset / _pageSize);
-            int bitmapIndex = pageIndex >> 6;
-
-            ref ulong entry = ref _mappedPageBitmap[bitmapIndex];
-            ulong bit = 1UL << (pageIndex & 63);
-
-            if ((Volatile.Read(ref entry) & bit) == 0)
-            {
-                // Not mapped.
-
-                lock (_lock)
-                {
-                    // Check the bit while locked to make sure that this only happens once.
-
-                    ulong lockedEntry = Volatile.Read(ref entry);
-
-                    if ((lockedEntry & bit) == 0)
-                    {
-                        MapPage(offset & ~(_pageSize - 1));
-
-                        lockedEntry |= bit;
-
-                        Interlocked.Exchange(ref entry, lockedEntry);
-                    }
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            _reservedBlock.Dispose();
-
-            foreach (MemoryBlock block in _mappedBlocks)
-            {
-                block.Dispose();
-            }
-
-            GC.SuppressFinalize(this);
-        }
-    }
-}

src/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release</Configurations>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup>

src/Ryujinx.Tests/Cpu/CpuContext.cs

@@ -1,4 +1,3 @@
-using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
@@ -13,7 +12,7 @@ namespace Ryujinx.Tests.Cpu
 
         public CpuContext(IMemoryManager memory, bool for64Bit)
         {
-            _translator = new Translator(new JitMemoryAllocator(), memory, AddressTable<ulong>.CreateForArm(for64Bit, memory.Type));
+            _translator = new Translator(new JitMemoryAllocator(), memory, for64Bit);
             memory.UnmapEvent += UnmapHandler;
         }
 

src/Ryujinx.Tests/Cpu/EnvironmentTests.cs

@@ -1,5 +1,3 @@
-using ARMeilleure.Common;
-using ARMeilleure.Memory;
 using ARMeilleure.Translation;
 using NUnit.Framework;
 using Ryujinx.Cpu.Jit;
@@ -19,10 +17,7 @@ namespace Ryujinx.Tests.Cpu
         private static void EnsureTranslator()
         {
             // Create a translator, as one is needed to register the signal handler or emit methods.
-            _translator ??= new Translator(
-                new JitMemoryAllocator(), 
-                new MockMemoryManager(),
-                AddressTable<ulong>.CreateForArm(true, MemoryManagerType.SoftwarePageTable));
+            _translator ??= new Translator(new JitMemoryAllocator(), new MockMemoryManager(), true);
         }
 
         [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]

src/Ryujinx.Tests/Memory/PartialUnmaps.cs

@@ -1,5 +1,3 @@
-using ARMeilleure.Common;
-using ARMeilleure.Memory;
 using ARMeilleure.Signal;
 using ARMeilleure.Translation;
 using NUnit.Framework;
@@ -55,10 +53,7 @@ namespace Ryujinx.Tests.Memory
         private static void EnsureTranslator()
         {
             // Create a translator, as one is needed to register the signal handler or emit methods.
-            _translator ??= new Translator(
-                new JitMemoryAllocator(), 
-                new MockMemoryManager(), 
-                AddressTable<ulong>.CreateForArm(true, MemoryManagerType.SoftwarePageTable));
+            _translator ??= new Translator(new JitMemoryAllocator(), new MockMemoryManager(), true);
         }
 
         [Test]

src/Ryujinx.Tests/Ryujinx.Tests.csproj

@@ -10,7 +10,6 @@
     <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">linux</TargetOS>
     <Configurations>Debug;Release</Configurations>
     <RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup>

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -17,7 +16,7 @@ namespace Ryujinx.UI.Common.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 57;
+        public const int CurrentVersion = 56;
 
         /// <summary>
         /// Version of the configuration file format
@@ -192,25 +191,8 @@ namespace Ryujinx.UI.Common.Configuration
         /// <summary>
         /// Enables or disables Vertical Sync
         /// </summary>
-        /// <remarks>Kept for file format compatibility (to avoid possible failure when parsing configuration on old versions)</remarks>
-        /// TODO: Remove this when those older versions aren't in use anymore.
         public bool EnableVsync { get; set; }
 
-        /// <summary>
-        /// Current VSync mode; 60 (Switch), unbounded ("Vsync off"), or custom
-        /// </summary>
-        public VSyncMode VSyncMode { get; set; }
-
-        /// <summary>
-        /// Enables or disables the custom present interval
-        /// </summary>
-        public bool EnableCustomVSyncInterval { get; set; }
-
-        /// <summary>
-        /// The custom present interval value
-        /// </summary>
-        public int CustomVSyncInterval { get; set; }
-
         /// <summary>
         /// Enables or disables Shader cache
         /// </summary>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs

@@ -82,7 +82,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                 };
 
                 configurationFileUpdated = true;
@@ -276,7 +276,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                     Screenshot = Key.F8,
                 };
 
@@ -289,7 +289,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                     Screenshot = Key.F8,
                     ShowUI = Key.F4,
                 };
@@ -332,7 +332,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                     Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                     ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                     Pause = Key.F5,
@@ -347,7 +347,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                     Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                     ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                     Pause = configurationFileFormat.Hotkeys.Pause,
@@ -421,7 +421,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                     Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                     ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                     Pause = configurationFileFormat.Hotkeys.Pause,
@@ -448,7 +448,7 @@ namespace Ryujinx.UI.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                     Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                     ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                     Pause = configurationFileFormat.Hotkeys.Pause,
@@ -611,33 +611,6 @@ namespace Ryujinx.UI.Common.Configuration
                 configurationFileUpdated = true;
             }
 
-            if (configurationFileFormat.Version < 57)
-            {
-                Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 57.");
-
-                configurationFileFormat.VSyncMode = VSyncMode.Switch;
-                configurationFileFormat.EnableCustomVSyncInterval = false;
-
-                configurationFileFormat.Hotkeys = new KeyboardHotkeys
-                {
-                    ToggleVSyncMode = Key.F1,
-                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
-                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
-                    Pause = configurationFileFormat.Hotkeys.Pause,
-                    ToggleMute = configurationFileFormat.Hotkeys.ToggleMute,
-                    ResScaleUp = configurationFileFormat.Hotkeys.ResScaleUp,
-                    ResScaleDown = configurationFileFormat.Hotkeys.ResScaleDown,
-                    VolumeUp = configurationFileFormat.Hotkeys.VolumeUp,
-                    VolumeDown = configurationFileFormat.Hotkeys.VolumeDown,
-                    CustomVSyncIntervalIncrement = Key.Unbound,
-                    CustomVSyncIntervalDecrement = Key.Unbound,
-                };
-
-                configurationFileFormat.CustomVSyncInterval = 120;
-
-                configurationFileUpdated = true;
-            }
-
             Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
             Graphics.ResScale.Value = configurationFileFormat.ResScale;
             Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
@@ -673,9 +646,7 @@ namespace Ryujinx.UI.Common.Configuration
             ShowTitleBar.Value = configurationFileFormat.ShowTitleBar;
             EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration;
             HideCursor.Value = configurationFileFormat.HideCursor;
-            Graphics.VSyncMode.Value = configurationFileFormat.VSyncMode;
-            Graphics.EnableCustomVSyncInterval.Value = configurationFileFormat.EnableCustomVSyncInterval;
-            Graphics.CustomVSyncInterval.Value = configurationFileFormat.CustomVSyncInterval;
+            Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync;
             Graphics.EnableShaderCache.Value = configurationFileFormat.EnableShaderCache;
             Graphics.EnableTextureRecompression.Value = configurationFileFormat.EnableTextureRecompression;
             Graphics.EnableMacroHLE.Value = configurationFileFormat.EnableMacroHLE;

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs

@@ -1,4 +1,4 @@
-using ARMeilleure;
+using ARMeilleure;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -474,19 +474,9 @@ namespace Ryujinx.UI.Common.Configuration
             public ReactiveObject<string> ShadersDumpPath { get; private set; }
 
             /// <summary>
-            /// Toggles the present interval mode. Options are Switch (60Hz), Unbounded (previously Vsync off), and Custom, if enabled.
+            /// Enables or disables Vertical Sync
             /// </summary>
-            public ReactiveObject<VSyncMode> VSyncMode { get; private set; }
-
-            /// <summary>
-            /// Enables or disables the custom present interval mode.
-            /// </summary>
-            public ReactiveObject<bool> EnableCustomVSyncInterval { get; private set; }
-
-            /// <summary>
-            /// Changes the custom present interval.
-            /// </summary>
-            public ReactiveObject<int> CustomVSyncInterval { get; private set; }
+            public ReactiveObject<bool> EnableVsync { get; private set; }
 
             /// <summary>
             /// Enables or disables Shader cache
@@ -546,12 +536,8 @@ namespace Ryujinx.UI.Common.Configuration
                 AspectRatio = new ReactiveObject<AspectRatio>();
                 AspectRatio.LogChangesToValue(nameof(AspectRatio));
                 ShadersDumpPath = new ReactiveObject<string>();
-                VSyncMode = new ReactiveObject<VSyncMode>();
-                VSyncMode.LogChangesToValue(nameof(VSyncMode));
-                EnableCustomVSyncInterval = new ReactiveObject<bool>();
-                EnableCustomVSyncInterval.LogChangesToValue(nameof(EnableCustomVSyncInterval));
-                CustomVSyncInterval = new ReactiveObject<int>();
-                CustomVSyncInterval.LogChangesToValue(nameof(CustomVSyncInterval));
+                EnableVsync = new ReactiveObject<bool>();
+                EnableVsync.LogChangesToValue(nameof(EnableVsync));
                 EnableShaderCache = new ReactiveObject<bool>();
                 EnableShaderCache.LogChangesToValue(nameof(EnableShaderCache));
                 EnableTextureRecompression = new ReactiveObject<bool>();

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -64,9 +64,7 @@ namespace Ryujinx.UI.Common.Configuration
                 ShowTitleBar = ShowTitleBar,
                 EnableHardwareAcceleration = EnableHardwareAcceleration,
                 HideCursor = HideCursor,
-                VSyncMode = Graphics.VSyncMode,
-                EnableCustomVSyncInterval = Graphics.EnableCustomVSyncInterval,
-                CustomVSyncInterval = Graphics.CustomVSyncInterval,
+                EnableVsync = Graphics.EnableVsync,
                 EnableShaderCache = Graphics.EnableShaderCache,
                 EnableTextureRecompression = Graphics.EnableTextureRecompression,
                 EnableMacroHLE = Graphics.EnableMacroHLE,
@@ -181,9 +179,7 @@ namespace Ryujinx.UI.Common.Configuration
             ShowTitleBar.Value = !OperatingSystem.IsWindows();
             EnableHardwareAcceleration.Value = true;
             HideCursor.Value = HideCursorMode.OnIdle;
-            Graphics.VSyncMode.Value = VSyncMode.Switch;
-            Graphics.CustomVSyncInterval.Value = 120;
-            Graphics.EnableCustomVSyncInterval.Value = false;
+            Graphics.EnableVsync.Value = true;
             Graphics.EnableShaderCache.Value = true;
             Graphics.EnableTextureRecompression.Value = false;
             Graphics.EnableMacroHLE.Value = true;
@@ -244,7 +240,7 @@ namespace Ryujinx.UI.Common.Configuration
             Hid.EnableMouse.Value = false;
             Hid.Hotkeys.Value = new KeyboardHotkeys
             {
-                ToggleVSyncMode = Key.F1,
+                ToggleVsync = Key.F1,
                 ToggleMute = Key.F2,
                 Screenshot = Key.F8,
                 ShowUI = Key.F4,

src/Ryujinx.UI.Common/DiscordIntegrationModule.cs

@@ -247,7 +247,6 @@ namespace Ryujinx.UI.Common
             "0100dbf01000a000", // Burnout Paradise Remastered
             "0100744001588000", // Cars 3: Driven to Win
             "0100b41013c82000", // Cruis'n Blast
-            "01001b300b9be000", // Diablo III: Eternal Collection
             "01008c8012920000", // Dying Light Platinum Edition
             "010073c01af34000", // LEGO Horizon Adventures
             "0100770008dd8000", // Monster Hunter Generations Ultimate
@@ -265,7 +264,6 @@ namespace Ryujinx.UI.Common
             "0100800015926000", // Suika Game
             "0100e46006708000", // Terraria
             "01000a10041ea000", // The Elder Scrolls V: Skyrim
-            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
             "010080b00ad66000", // Undertale
         ];
     }

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.UI.LocaleGenerator/Ryujinx.UI.LocaleGenerator.csproj

@@ -5,7 +5,6 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx/AppHost.cs

@@ -57,8 +57,6 @@ using Key = Ryujinx.Input.Key;
 using MouseButton = Ryujinx.Input.MouseButton;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Size = Avalonia.Size;
-using Switch = Ryujinx.HLE.Switch;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.Ava
 {
@@ -205,9 +203,6 @@ namespace Ryujinx.Ava
             ConfigurationState.Instance.Graphics.ScalingFilter.Event += UpdateScalingFilter;
             ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;
             ConfigurationState.Instance.Graphics.EnableColorSpacePassthrough.Event += UpdateColorSpacePassthrough;
-            ConfigurationState.Instance.Graphics.VSyncMode.Event += UpdateVSyncMode;
-            ConfigurationState.Instance.Graphics.CustomVSyncInterval.Event += UpdateCustomVSyncIntervalValue;
-            ConfigurationState.Instance.Graphics.EnableCustomVSyncInterval.Event += UpdateCustomVSyncIntervalEnabled;
 
             ConfigurationState.Instance.System.EnableInternetAccess.Event += UpdateEnableInternetAccessState;
             ConfigurationState.Instance.Multiplayer.LanInterfaceId.Event += UpdateLanInterfaceIdState;
@@ -300,66 +295,6 @@ namespace Ryujinx.Ava
             _renderer.Window?.SetColorSpacePassthrough((bool)ConfigurationState.Instance.Graphics.EnableColorSpacePassthrough.Value);
         }
 
-        public void UpdateVSyncMode(object sender, ReactiveEventArgs<VSyncMode> e)
-        {
-            if (Device != null)
-            {
-                Device.VSyncMode = e.NewValue;
-                Device.UpdateVSyncInterval();
-            }
-            _renderer.Window?.ChangeVSyncMode((Ryujinx.Graphics.GAL.VSyncMode)e.NewValue);
-
-            _viewModel.ShowCustomVSyncIntervalPicker = (e.NewValue == VSyncMode.Custom);
-        }
-
-        public void VSyncModeToggle()
-        {
-            VSyncMode oldVSyncMode = Device.VSyncMode;
-            VSyncMode newVSyncMode = VSyncMode.Switch;
-            bool customVSyncIntervalEnabled = ConfigurationState.Instance.Graphics.EnableCustomVSyncInterval.Value;
-
-            switch (oldVSyncMode)
-            {
-                case VSyncMode.Switch:
-                    newVSyncMode = VSyncMode.Unbounded;
-                    break;
-                case VSyncMode.Unbounded:
-                    if (customVSyncIntervalEnabled)
-                    {
-                        newVSyncMode = VSyncMode.Custom;
-                    }
-                    else
-                    {
-                        newVSyncMode = VSyncMode.Switch;
-                    }
-
-                    break;
-                case VSyncMode.Custom:
-                    newVSyncMode = VSyncMode.Switch;
-                    break;
-            }
-
-            UpdateVSyncMode(this, new ReactiveEventArgs<VSyncMode>(oldVSyncMode, newVSyncMode));
-        }
-
-        private void UpdateCustomVSyncIntervalValue(object sender, ReactiveEventArgs<int> e)
-        {
-            if (Device != null)
-            {
-                Device.TargetVSyncInterval = e.NewValue;
-                Device.UpdateVSyncInterval();
-            }
-        }
-
-        private void UpdateCustomVSyncIntervalEnabled(object sender, ReactiveEventArgs<bool> e)
-        {
-            if (Device != null)
-            {
-                Device.CustomVSyncIntervalEnabled = e.NewValue;
-                Device.UpdateVSyncInterval();
-            }
-        }
-
         private void ShowCursor()
         {
             Dispatcher.UIThread.Post(() =>
@@ -417,7 +352,11 @@ namespace Ryujinx.Ava
 
                         string filename = $"{sanitizedApplicationName}_{currentTime.Year}-{currentTime.Month:D2}-{currentTime.Day:D2}_{currentTime.Hour:D2}-{currentTime.Minute:D2}-{currentTime.Second:D2}.png";
 
-                        string directory = Path.Combine(AppDataManager.BaseDirPath, "screenshots");
+                        string directory = AppDataManager.Mode switch
+                        {
+                            AppDataManager.LaunchMode.Portable or AppDataManager.LaunchMode.Custom => Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
+                            _ => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx"),
+                        };
 
                         string path = Path.Combine(directory, filename);
 
@@ -570,6 +509,12 @@ namespace Ryujinx.Ava
             Device.Configuration.MultiplayerDisableP2p = e.NewValue;
         }
 
+        public void ToggleVSync()
+        {
+            Device.EnableDeviceVsync = !Device.EnableDeviceVsync;
+            _renderer.Window.ChangeVSyncMode(Device.EnableDeviceVsync);
+        }
+
         public void Stop()
         {
             _isActive = false;
@@ -923,7 +868,7 @@ namespace Ryujinx.Ava
                 _viewModel.UiHandler,
                 (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
                 (RegionCode)ConfigurationState.Instance.System.Region.Value,
-                ConfigurationState.Instance.Graphics.VSyncMode,
+                ConfigurationState.Instance.Graphics.EnableVsync,
                 ConfigurationState.Instance.System.EnableDockedMode,
                 ConfigurationState.Instance.System.EnablePtc,
                 ConfigurationState.Instance.System.EnableInternetAccess,
@@ -940,8 +885,7 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Multiplayer.Mode,
                 ConfigurationState.Instance.Multiplayer.DisableP2p,
                 ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.LdnServer,
-                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value));
+                ConfigurationState.Instance.Multiplayer.LdnServer));
         }
 
         private static IHardwareDeviceDriver InitializeAudio()
@@ -1062,7 +1006,7 @@ namespace Ryujinx.Ava
                 Device.Gpu.SetGpuThread();
                 Device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
 
-                _renderer.Window.ChangeVSyncMode((Ryujinx.Graphics.GAL.VSyncMode)Device.VSyncMode);
+                _renderer.Window.ChangeVSyncMode(Device.EnableDeviceVsync);
 
                 while (_isActive)
                 {
@@ -1123,7 +1067,6 @@ namespace Ryujinx.Ava
         {
             // Run a status update only when a frame is to be drawn. This prevents from updating the ui and wasting a render when no frame is queued.
             string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? LocaleManager.Instance[LocaleKeys.Docked] : LocaleManager.Instance[LocaleKeys.Handheld];
-            string vSyncMode = Device.VSyncMode.ToString();
 
             UpdateShaderCount();
 
@@ -1133,7 +1076,7 @@ namespace Ryujinx.Ava
             }
 
             StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                vSyncMode,
+                Device.EnableDeviceVsync,
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
@@ -1236,16 +1179,8 @@ namespace Ryujinx.Ava
                 {
                     switch (currentHotkeyState)
                     {
-                        case KeyboardHotkeyState.ToggleVSyncMode:
-                            VSyncModeToggle();
-                            break;
-                        case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            Device.DecrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval -= 1;
-                            break;
-                        case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            Device.IncrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval += 1;
+                        case KeyboardHotkeyState.ToggleVSync:
+                            ToggleVSync();
                             break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;
@@ -1332,9 +1267,9 @@ namespace Ryujinx.Ava
         {
             KeyboardHotkeyState state = KeyboardHotkeyState.None;
 
-            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ToggleVSyncMode))
+            if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ToggleVsync))
             {
-                state = KeyboardHotkeyState.ToggleVSyncMode;
+                state = KeyboardHotkeyState.ToggleVSync;
             }
             else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Screenshot))
             {
@@ -1368,14 +1303,6 @@ namespace Ryujinx.Ava
             {
                 state = KeyboardHotkeyState.VolumeDown;
             }
-            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.CustomVSyncIntervalIncrement))
-            {
-                state = KeyboardHotkeyState.CustomVSyncIntervalIncrement;
-            }
-            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.CustomVSyncIntervalDecrement))
-            {
-                state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
-            }
 
             return state;
         }

src/Ryujinx/Assets/Locales/ar_SA.json

@@ -1,7 +1,6 @@
 {
   "Language": "اَلْعَرَبِيَّةُ",
   "MenuBarFileOpenApplet": "فتح التطبيق المصغر",
-  "MenuBarFileOpenAppletOpenMiiApplet": "Mii Edit Applet",
   "MenuBarFileOpenAppletOpenMiiAppletToolTip": "‫افتح تطبيق تحرير Mii في الوضع المستقل",
   "SettingsTabInputDirectMouseAccess": "الوصول المباشر للفأرة",
   "SettingsTabSystemMemoryManagerMode": "وضع إدارة الذاكرة:",
@@ -34,7 +33,6 @@
   "MenuBarToolsManageFileTypes": "إدارة أنواع الملفات",
   "MenuBarToolsInstallFileTypes": "تثبيت أنواع الملفات",
   "MenuBarToolsUninstallFileTypes": "إزالة أنواع الملفات",
-  "MenuBarToolsXCITrimmer": "Trim XCI Files",
   "MenuBarView": "_عرض",
   "MenuBarViewWindow": "حجم النافذة",
   "MenuBarViewWindow720": "720p",
@@ -86,11 +84,8 @@
   "GameListContextMenuOpenModsDirectoryToolTip": "يفتح المجلد الذي يحتوي على تعديلات‫(mods) التطبيق",
   "GameListContextMenuOpenSdModsDirectory": "فتح مجلد تعديلات‫(mods) أتموسفير",
   "GameListContextMenuOpenSdModsDirectoryToolTip": "يفتح مجلد أتموسفير لبطاقة SD البديلة الذي يحتوي على تعديلات التطبيق. مفيد للتعديلات التي تم تعبئتها للأجهزة الحقيقية.",
-  "GameListContextMenuTrimXCI": "Check and Trim XCI File",
-  "GameListContextMenuTrimXCIToolTip": "Check and Trim XCI File to Save Disk Space",
   "StatusBarGamesLoaded": "{0}/{1} لعبة تم تحميلها",
   "StatusBarSystemVersion": "إصدار النظام: {0}",
-  "StatusBarXCIFileTrimming": "Trimming XCI File '{0}'",
   "LinuxVmMaxMapCountDialogTitle": "الحد الأدنى لتعيينات الذاكرة المكتشفة",
   "LinuxVmMaxMapCountDialogTextPrimary": "هل ترغب في زيادة قيمة vm.max_map_count إلى {0}",
   "LinuxVmMaxMapCountDialogTextSecondary": "قد تحاول بعض الألعاب إنشاء المزيد من تعيينات الذاكرة أكثر مما هو مسموح به حاليا. سيغلق ريوجينكس بمجرد تجاوز هذا الحد.",
@@ -405,8 +400,6 @@
   "InputDialogTitle": "حوار الإدخال",
   "InputDialogOk": "موافق",
   "InputDialogCancel": "إلغاء",
-  "InputDialogCancelling": "Cancelling",
-  "InputDialogClose": "Close",
   "InputDialogAddNewProfileTitle": "اختر اسم الملف الشخصي",
   "InputDialogAddNewProfileHeader": "الرجاء إدخال اسم الملف الشخصي",
   "InputDialogAddNewProfileSubtext": "(الطول الأقصى: {0})",
@@ -458,7 +451,6 @@
   "DialogUpdaterExtractionMessage": "جاري استخراج التحديث...",
   "DialogUpdaterRenamingMessage": "إعادة تسمية التحديث...",
   "DialogUpdaterAddingFilesMessage": "إضافة تحديث جديد...",
-  "DialogUpdaterShowChangelogMessage": "Show Changelog",
   "DialogUpdaterCompleteMessage": "اكتمل التحديث",
   "DialogUpdaterRestartMessage": "هل تريد إعادة تشغيل ريوجينكس الآن؟",
   "DialogUpdaterNoInternetMessage": "أنت غير متصل بالإنترنت.",
@@ -477,7 +469,6 @@
   "DialogUninstallFileTypesSuccessMessage": "تم إلغاء تثبيت أنواع الملفات بنجاح!",
   "DialogUninstallFileTypesErrorMessage": "فشل إلغاء تثبيت أنواع الملفات.",
   "DialogOpenSettingsWindowLabel": "فتح نافذة الإعدادات",
-  "DialogOpenXCITrimmerWindowLabel": "XCI Trimmer Window",
   "DialogControllerAppletTitle": "تطبيق وحدة التحكم المصغر",
   "DialogMessageDialogErrorExceptionMessage": "خطأ في عرض مربع حوار الرسالة: {0}",
   "DialogSoftwareKeyboardErrorExceptionMessage": "خطأ في عرض لوحة مفاتيح البرامج: {0}",
@@ -680,12 +671,6 @@
   "TitleUpdateVersionLabel": "الإصدار: {0}",
   "TitleBundledUpdateVersionLabel": "Bundled: Version {0}",
   "TitleBundledDlcLabel": "Bundled:",
-  "TitleXCIStatusPartialLabel": "Partial",
-  "TitleXCIStatusTrimmableLabel": "Untrimmed",
-  "TitleXCIStatusUntrimmableLabel": "Trimmed",
-  "TitleXCIStatusFailedLabel": "(Failed)",
-  "TitleXCICanSaveLabel": "Save {0:n0} Mb",
-  "TitleXCISavingLabel": "Saved {0:n0} Mb",
   "RyujinxInfo": "ريوجينكس - معلومات",
   "RyujinxConfirm": "ريوجينكس - تأكيد",
   "FileDialogAllTypes": "كل الأنواع",
@@ -738,37 +723,11 @@
   "SelectDlcDialogTitle": "حدد ملفات المحتوي الإضافي",
   "SelectUpdateDialogTitle": "حدد ملفات التحديث",
   "SelectModDialogTitle": "حدد مجلد التعديل",
-  "TrimXCIFileDialogTitle": "Check and Trim XCI File",
-  "TrimXCIFileDialogPrimaryText": "This function will first check the empty space and then trim the XCI File to save disk space.",
-  "TrimXCIFileDialogSecondaryText": "Current File Size: {0:n} MB\nGame Data Size: {1:n} MB\nDisk Space Savings: {2:n} MB",
-  "TrimXCIFileNoTrimNecessary": "XCI File does not need to be trimmed. Check logs for further details",
-  "TrimXCIFileNoUntrimPossible": "XCI File cannot be untrimmed. Check logs for further details",
-  "TrimXCIFileReadOnlyFileCannotFix": "XCI File is Read Only and could not be made writable. Check logs for further details",
-  "TrimXCIFileFileSizeChanged": "XCI File has changed in size since it was scanned. Please check the file is not being written to and try again.",
-  "TrimXCIFileFreeSpaceCheckFailed": "XCI File has data in the free space area, it is not safe to trim",
-  "TrimXCIFileInvalidXCIFile": "XCI File contains invalid data. Check logs for further details",
-  "TrimXCIFileFileIOWriteError": "XCI File could not be opened for writing. Check logs for further details",
-  "TrimXCIFileFailedPrimaryText": "Trimming of the XCI file failed",
-  "TrimXCIFileCancelled": "The operation was cancelled",
-  "TrimXCIFileFileUndertermined": "No operation was performed",
   "UserProfileWindowTitle": "مدير الملفات الشخصية للمستخدمين",
   "CheatWindowTitle": "مدير الغش",
   "DlcWindowTitle": "إدارة المحتوى القابل للتنزيل لـ {0} ({1})",
   "ModWindowTitle": "إدارة التعديلات لـ {0} ({1})",
   "UpdateWindowTitle": "مدير تحديث العنوان",
-  "XCITrimmerWindowTitle": "XCI File Trimmer",
-  "XCITrimmerTitleStatusCount": "{0} of {1} Title(s) Selected",
-  "XCITrimmerTitleStatusCountWithFilter": "{0} of {1} Title(s) Selected ({2} displayed)",
-  "XCITrimmerTitleStatusTrimming": "Trimming {0} Title(s)...",
-  "XCITrimmerTitleStatusUntrimming": "Untrimming {0} Title(s)...",
-  "XCITrimmerTitleStatusFailed": "Failed",
-  "XCITrimmerPotentialSavings": "Potential Savings",
-  "XCITrimmerActualSavings": "Actual Savings",
-  "XCITrimmerSavingsMb": "{0:n0} Mb",
-  "XCITrimmerSelectDisplayed": "Select Shown",
-  "XCITrimmerDeselectDisplayed": "Deselect Shown",
-  "XCITrimmerSortName": "Title",
-  "XCITrimmerSortSaved": "Space Savings",
   "XCITrimmerTrim": "Trim",
   "XCITrimmerUntrim": "Untrim",
   "UpdateWindowUpdateAddedMessage": "{0} new update(s) added",
@@ -784,7 +743,6 @@
   "AutoloadUpdateRemovedMessage": "{0} missing update(s) removed",
   "ModWindowHeading": "{0} تعديل",
   "UserProfilesEditProfile": "تعديل المحدد",
-  "Continue": "Continue",
   "Cancel": "إلغاء",
   "Save": "حفظ",
   "Discard": "تجاهل",
@@ -852,17 +810,5 @@
   "MultiplayerMode": "الوضع:",
   "MultiplayerModeTooltip": "تغيير وضع LDN متعدد اللاعبين.\n\nسوف يقوم LdnMitm بتعديل وظيفة اللعب المحلية/اللاسلكية المحلية في الألعاب لتعمل كما لو كانت شبكة LAN، مما يسمح باتصالات الشبكة المحلية نفسها مع محاكيات ريوجينكس الأخرى وأجهزة نينتندو سويتش المخترقة التي تم تثبيت وحدة ldn_mitm عليها.\n\nيتطلب وضع اللاعبين المتعددين أن يكون جميع اللاعبين على نفس إصدار اللعبة (على سبيل المثال، يتعذر على الإصدار 13.0.1 من سوبر سماش برذرز ألتميت الاتصال بالإصدار 13.0.0).\n\nاتركه معطلا إذا لم تكن متأكدا.",
   "MultiplayerModeDisabled": "معطل",
-  "MultiplayerModeLdnMitm": "ldn_mitm",
-  "MultiplayerModeLdnRyu": "RyuLDN",
-  "MultiplayerDisableP2P": "Disable P2P Network Hosting (may increase latency)",
-  "MultiplayerDisableP2PTooltip": "Disable P2P network hosting, peers will proxy through the master server instead of connecting to you directly.",
-  "LdnPassphrase": "Network Passphrase:",
-  "LdnPassphraseTooltip": "You will only be able to see hosted games with the same passphrase as you.",
-  "LdnPassphraseInputTooltip": "Enter a passphrase in the format Ryujinx-<8 hex chars>. You will only be able to see hosted games with the same passphrase as you.",
-  "LdnPassphraseInputPublic": "(public)",
-  "GenLdnPass": "Generate Random",
-  "GenLdnPassTooltip": "Generates a new passphrase, which can be shared with other players.",
-  "ClearLdnPass": "Clear",
-  "ClearLdnPassTooltip": "Clears the current passphrase, returning to the public network.",
-  "InvalidLdnPassphrase": "Invalid Passphrase! Must be in the format \"Ryujinx-<8 hex chars>\""
+  "MultiplayerModeLdnMitm": "ldn_mitm"
 }