Revert "mono-jit (#167)" (#172)

This reverts the mono jit PR.
It had several issues that i haven't had time to fix yet.
Expect mono jit v2 in the future with said fixes.

JitCache alignement fixes are still included/fixed.

Co-authored-by: LotP1 <68976644+LotP1@users.noreply.github.com>
Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/172

.forgejo/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
 
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -66,7 +66,7 @@ jobs:
         if: forgejo.event_name == 'pull_request'
 
       - name: 'Cache: ~/.nuget/packages'
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: |
             ~/.nuget/packages
@@ -148,7 +148,7 @@ jobs:
         configuration: [ Release ]
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -185,7 +185,7 @@ jobs:
         if: forgejo.event_name == 'pull_request'
 
       - name: 'Cache: ~/.nuget/packages'
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: |
             ~/.nuget/packages

.forgejo/workflows/canary.yml

@@ -36,7 +36,7 @@ jobs:
           - { name: linux-x64,   os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_arm64 }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -151,7 +151,7 @@ jobs:
     container:
       image: ghcr.io/catthehacker/ubuntu:act-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -217,7 +217,7 @@ jobs:
       - macos_release
       - release
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         
       - name: Install GLI
         uses: actions/setup-gli@v1

.forgejo/workflows/pr_triage.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       # Grab sources to get latest labeler.yml
       - name: Fetch sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
            # Ensure we pin the source origin as pull_request_target run under forks.
            fetch-depth: 0

.forgejo/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
           - { name: linux-x64,   os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_arm64 }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -145,7 +145,7 @@ jobs:
     name: Release MacOS universal
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: actions/setup-dotnet@v5
         with:
@@ -210,7 +210,7 @@ jobs:
       - macos_release
       - release
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         
       - name: Install GLI
         uses: actions/setup-gli@v1

Directory.Packages.props

@@ -3,65 +3,102 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    
+    <!-- Packages included in Ryujinx should be the latest stable releases -->
+    <!-- unless otherwise required for improved functionality or regressions ocurred. -->
+    
+    <!-- Packages are listed by module/function first, then alphabetical order. -->
+    
+    <!-- UI -->
+    <!-- TODO: Avalonia >= 12.0.0 requires refactoring -->
     <PackageVersion Include="Avalonia" Version="11.3.18" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.3.18" />
+    <!-- TODO: Replace Avalonia.Diagnostics (Deprecated). -->
+    <!-- <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" /> -->
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.18" />
     <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.18" />
-    <PackageVersion Include="SharpCompress" Version="0.49.1" />
-    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.5" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.50" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    
+    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.1" />
+
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
-    <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.501.0" />
-    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageVersion Include="Concentus" Version="2.2.2" />
-    <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
-    <PackageVersion Include="DynamicData" Version="9.4.31" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.1" />
-    <PackageVersion Include="Humanizer" Version="2.14.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
-    <PackageVersion Include="NetCoreServer" Version="8.0.7" />
-    <PackageVersion Include="NUnit" Version="3.14.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="OpenTK.Core" Version="4.9.4" />
-    <PackageVersion Include="OpenTK.Graphics" Version="4.9.4" />
-    <!-- OpenTk.Audio.OpenAL has moved to OpenTk.Audio -->
-    <!--<PackageVersion Include="OpenTK.Audio" Version="5.0.0-pre.15" />-->
-    <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
-    <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
-    <!-- Ryujinx.Audio.OpenAL.Dependencies is from the original project, last updated 12/30/20 -->
-    <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
-    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.2" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.4" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
-    <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
-    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
-    <PackageVersion Include="Gommon" Version="2.8.1.2" />
-    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="Sep" Version="0.15.0" />
-    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Shaderc" Version="2.23.0" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.23.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.23.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
+
+    <!-- TODO: SkiaSharp > 2.88.9 requires refactoring -->
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
-    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
+    
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.5" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
+    
+    <!-- Building & Packaging -->
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageVersion Include="DynamicData" Version="9.4.33" />
+    <PackageVersion Include="Gommon" Version="2.8.1.2" />
+    <PackageVersion Include="Humanizer" Version="3.0.10" />
+    
+    <!-- TODO: Microsoft.CodeAnalysis.Analyzers > 3.3.4 needs refactoring -->
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" /> <!-- Must be updated with Analyzers -->
+    
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.50" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    
+    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
+    <PackageVersion Include="NetCoreServer" Version="8.0.7" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    
+    <PackageVersion Include="NUnit" Version="3.14.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
+
+    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
+    <PackageVersion Include="Sep" Version="0.15.0" />
+    
+    <PackageVersion Include="SharpCompress" Version="0.50.0" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
+    
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.9" />
+    
+    <!--Don't touch this, we're freezing the Unicorn package due to an issue with bindngs.-->
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
+
+    <!-- Internal Dependencies -->
+    <!-- Ryujinx.Audio.OpenAL.Dependencies is from the original project, last updated 12/30/20 -->
+    <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
+    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.2" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.5" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
+    <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.707.0" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
+    <PackageVersion Include="SPB" Version="0.0.4-build32" />
+    
+    <!-- External Dependencies -->
+    <PackageVersion Include="Concentus" Version="2.2.2" />
+    <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
+    
+    <PackageVersion Include="OpenTK.Core" Version="4.9.4" />
+    <PackageVersion Include="OpenTK.Graphics" Version="4.9.4" />
+    <!-- TODO: OpenTk.Audio.OpenAL has moved to OpenTk.Audio -->
+    <!--       OpenTk.Audio.OpenAL > 4.9.4 requires refactoring -->
+    <!--<PackageVersion Include="OpenTK.Audio" Version="5.0.0-pre.16" />-->
+    <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
+    
+    <!-- TODO: Consider replacing with SharpOpenNat. -->
+    <PackageVersion Include="Open.Nat.V2" Version="3.2.1" />
+    
+    <PackageVersion Include="Silk.NET.Shaderc" Version="2.23.0" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.23.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.23.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
+    
   </ItemGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100",
+    "version": "10.0.301",
     "rollForward": "latestFeature"
   }
 }

src/ARMeilleure/Common/AddressTablePresets.cs

@@ -19,22 +19,46 @@ namespace ARMeilleure.Common
                 new( 7,  8),
                 new( 1,  6)
         ];
-        
-        private static readonly AddressTableLevel[] _monoSparse64Bit =
+
+        private static readonly AddressTableLevel[] _levels64BitSparseTiny =
         [
-            new( 2, 37)
+            new( 11, 28),
+                new( 2, 9)
         ];
 
-        private static readonly AddressTableLevel[] _monoSparse32Bit =
+        private static readonly AddressTableLevel[] _levels32BitSparseTiny =
         [
-            new( 1, 31)
+            new( 10, 22),
+                new( 1, 9)
         ];
-        
-        public static AddressTableLevel[] GetArmPreset(bool for64Bits, bool sparse)
+
+        private static readonly AddressTableLevel[] _levels64BitSparseGiant =
+        [
+            new( 38, 1),
+                new( 2, 36)
+        ];
+
+        private static readonly AddressTableLevel[] _levels32BitSparseGiant =
+        [
+            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)
             {
-                return for64Bits ? _monoSparse64Bit : _monoSparse32Bit;
+                if (lowPower)
+                {
+                    return for64Bits ? _levels64BitSparseTiny : _levels32BitSparseTiny;
+                }
+                else
+                {
+                    return for64Bits ? _levels64BitSparseGiant : _levels32BitSparseGiant;
+                }
             }
             else
             {

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -5,7 +5,7 @@ using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
 using ARMeilleure.Translation.PTC;
-using System.Linq;
+
 using static ARMeilleure.Instructions.InstEmitHelper;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -238,7 +238,7 @@ namespace ARMeilleure.Instructions
             }
             else if (table.Sparse)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
                 // Deliberately attempts to avoid branches.
 
                 Operand tableBase = !context.HasPtc ?
@@ -247,15 +247,18 @@ namespace ARMeilleure.Instructions
 
                 hostAddress = tableBase;
 
-                AddressTableLevel level = table.Levels.Last();
-                int clearBits = 64 - (level.Index + level.Length);
+                for (int i = 0; i < table.Levels.Length; i++)
+                {
+                    AddressTableLevel 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)
-                );
+                    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));
+                    hostAddress = context.Load(OperandType.I64, context.Add(hostAddress, index));
+                }
             }
             else
             {

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -132,7 +132,7 @@ namespace ARMeilleure.Translation.Cache
             int regionEnd = endOffs % (int)CacheSize == 0
                 ? (((int)CacheSize) + _pageMask) & ~_pageMask
                 : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
-
+            
             GetRegion(offset).Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -34,7 +34,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 7018; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7019; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -161,7 +161,7 @@ namespace ARMeilleure.Translation
             context.BranchIfTrue(lblFallback, masked);
 
             Operand index = default;
-            Operand page = Const(_functionTable.Base);
+            Operand page = Const((long)_functionTable.Base);
 
             for (int i = 0; i < _functionTable.Levels.Length; i++)
             {

src/Ryujinx.Cpu/AddressTable.cs

@@ -81,13 +81,12 @@ namespace ARMeilleure.Common
 
         private bool _disposed;
         private TEntry** _table;
-        private TEntry* _sparseTable;
         private readonly List<AddressTablePage> _pages;
         private TEntry _fill;
 
-        private MemoryBlock _sparseFill;
-        private SparseMemoryBlock _fillBottomLevel;
-        private TEntry* _fillBottomLevelPtr;
+        private readonly MemoryBlock _sparseFill;
+        private readonly SparseMemoryBlock _fillBottomLevel;
+        private readonly TEntry* _fillBottomLevelPtr;
 
         private readonly List<TableSparseBlock> _sparseReserved;
         private readonly ReaderWriterLockSlim _sparseLock;
@@ -123,23 +122,16 @@ namespace ARMeilleure.Common
             {
                 ObjectDisposedException.ThrowIf(_disposed, this);
 
-                if (Sparse)
+                lock (_pages)
                 {
-                    return (nint)_sparseTable;
-                }
-                else
-                {
-                    lock (_pages)
-                    {
-                        return (nint)GetRootPage();
-                    }
+                    return (nint)GetRootPage();
                 }
             }
         }
 
         /// <summary>
         /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
-        /// <see cref="AddressTableLevel"/>.
+        /// <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>
@@ -164,8 +156,18 @@ namespace ARMeilleure.Common
             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 = [];
                 _sparseLock = new ReaderWriterLockSlim();
+
+                _sparseBlockSize = bottomLevelSize;
             }
         }
 
@@ -207,24 +209,13 @@ namespace ARMeilleure.Common
         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;
-            
-            if (Sparse)
-            {
-                ulong bottomLevelSize = (ulong)BitUtils.Pow2RoundUp((int)entries) * (ulong)sizeof(TEntry);
-                
-                _sparseFill = new MemoryBlock(bottomLevelSize, MemoryAllocationFlags.Mirrorable);
+            entries += entryIndex - BitUtils.AlignDown(entryIndex, bottomLevelEntries);
 
-                _fillBottomLevel = new SparseMemoryBlock(bottomLevelSize, null, _sparseFill);
-                _fillBottomLevelPtr = (TEntry*)_fillBottomLevel.Block.Pointer;
-
-                _sparseBlockSize = bottomLevelSize;
-                
-                _sparseTable = (TEntry*)Allocate((int)entries, Fill, leaf: true);
-
-                _sparseTable -= Levels.Last().GetValue(address);
-            }
+            _sparseBlockSize = Math.Max(_sparseBlockSize, BitUtils.AlignUp(entries, bottomLevelEntries) * (ulong)sizeof(TEntry));
         }
 
         /// <inheritdoc/>
@@ -243,26 +234,15 @@ namespace ARMeilleure.Common
                 throw new ArgumentException($"Address 0x{address:X} is not mapped onto the table.", nameof(address));
             }
 
-            if (Sparse)
+            lock (_pages)
             {
-                long index = Levels.Last().GetValue(address);
-                
-                EnsureMapped((nint)(_sparseTable + index));
-                
-                return ref _sparseTable[index];
-            }
-            else
-            {
-                lock (_pages)
-                {
-                    TEntry* page = GetPage(address);
+                TEntry* page = GetPage(address);
 
-                    long index = Levels.Last().GetValue(address);
+                long index = Levels[^1].GetValue(address);
 
-                    EnsureMapped((nint)(page + index));
+                EnsureMapped((nint)(page + index));
 
-                    return ref page[index];
-                }
+                return ref page[index];
             }
         }
 

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

@@ -3,7 +3,6 @@ using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
@@ -190,7 +189,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -204,15 +203,18 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                AddressTableLevel level = funcTable.Levels.Last();
-                asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                asm.Lsl(indexReg, indexReg, Const(3));
+                for (int i = 0; i < funcTable.Levels.Length; i++)
+                {
+                    AddressTableLevel 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);
+                    // Index into the page.
+                    asm.Add(rn, rn, indexReg);
 
-                // Load the page address.
-                asm.LdrRiUn(rn, rn, 0);
+                    // Load the page address.
+                    asm.LdrRiUn(rn, rn, 0);
+                }
 
                 if (tempGuestAddress != -1)
                 {

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

@@ -3,7 +3,6 @@ using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -356,7 +355,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -370,15 +369,18 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                AddressTableLevel level = funcTable.Levels.Last();
-                asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                asm.Lsl(indexReg, indexReg, Const(3));
+                for (int i = 0; i < funcTable.Levels.Length; i++)
+                {
+                    AddressTableLevel 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);
+                    // Index into the page.
+                    asm.Add(rn, rn, indexReg);
 
-                // Load the page address.
-                asm.LdrRiUn(rn, rn, 0);
+                    // Load the page address.
+                    asm.LdrRiUn(rn, rn, 0);
+                }
 
                 if (tempGuestAddress != -1)
                 {

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -106,7 +106,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             int endOffs = offset + size;
             int regionStart = (offset % (int)CacheSize) & ~_pageMask;
-            int regionEnd = ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
             GetRegion(offset).Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
@@ -115,7 +117,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             int endOffs = offset + size;
             int regionStart = (offset % (int)CacheSize) & ~_pageMask;
-            int regionEnd = ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
             GetRegion(offset).Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="SkiaSharp.NativeAssets.macOS" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
     <PackageReference Include="NetCoreServer" />
-    <PackageReference Include="Open.NAT.Core" />
+    <PackageReference Include="Open.Nat.V2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ryujinx/Utilities/ValueFormatUtils.cs

@@ -1,5 +1,4 @@
 using Humanizer;
-using Humanizer.Localisation;
 using Ryujinx.Ava.Common.Locale;
 using System;
 using System.Globalization;