SDL: Update game controller database on launch (#177)

Expands upon existing custom SDL mappings functionality: b82e789d4f

Downloads an updated game controller database (gamecontrollerdb.txt) on launch, which only updates when a new file is available. This keeps the database updated between SDL releases.

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/177

.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>

assets/Locales/Amiibo.json

@@ -0,0 +1,229 @@
+{
+  "Locales": [
+		{
+      "ID": "WindowTitle",
+      "Translations": {
+        "ar_SA": "أميبو",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Amiibo",
+        "es_ES": null,
+        "fr_FR": null,
+        "he_IL": "אמיבו",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": null,
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": null,
+        "ru_RU": null,
+        "sv_SE": null,
+        "th_TH": "อมิโบ้",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
+    {
+      "ID": "SeriesLabel",
+      "Translations": {
+        "ar_SA": "سلسلة",
+        "de_DE": "Serie",
+        "el_GR": "Σειρά",
+        "en_US": "Series",
+        "es_ES": "Serie",
+        "fr_FR": "Séries",
+        "he_IL": "סדרה",
+        "it_IT": "Serie",
+        "ja_JP": "シリーズ",
+        "ko_KR": "시리즈",
+        "no_NO": "Serie",
+        "pl_PL": "Seria",
+        "pt_BR": "Série",
+        "ru_RU": "Серия",
+        "sv_SE": "Serie",
+        "th_TH": "ซีรีส์",
+        "tr_TR": "Seri",
+        "uk_UA": "Серія",
+        "zh_CN": "系列",
+        "zh_TW": "系列"
+      }
+    },
+    {
+      "ID": "ShowAllAmiiboLabel",
+      "Translations": {
+        "ar_SA": "إظهار الكل Amiibo",
+        "de_DE": "Alle Amiibo anzeigen",
+        "el_GR": "Εμφάνιση Όλων των Amiibo",
+        "en_US": "Show All Amiibo",
+        "es_ES": "Mostrar Todas las Amiibo",
+        "fr_FR": "Afficher Tous les Amiibo",
+        "he_IL": "הצג הכל Amiibo",
+        "it_IT": "Mostra tutti gli Amiibo",
+        "ja_JP": "すべてのAmiiboを表示",
+        "ko_KR": "모든 Amiibo 표시",
+        "no_NO": "Vis alle Amiibo",
+        "pl_PL": "Pokaż Wszystkie Amiibo",
+        "pt_BR": "Mostrar Todos os Amiibo",
+        "ru_RU": "Показывать все Amiibo",
+        "sv_SE": "Visa alla Amiibo",
+        "th_TH": "แสดง Amiibo ทั้งหมด",
+        "tr_TR": "Tüm Amiibo'ları Göster",
+        "uk_UA": "Показати всі Amiibo",
+        "zh_CN": "显示所有 Amiibo",
+        "zh_TW": "顯示所有 Amiibo"
+      }
+    },
+    {
+      "ID": "UseRandomUuidLabel",
+      "Translations": {
+        "ar_SA": "استخدام UUID عشوائي",
+        "de_DE": "Zufällige UUID verwenden",
+        "el_GR": "Χρήση τυχαίου UUID",
+        "en_US": "Use Random UUID",
+        "es_ES": "Usar UUID aleatorio",
+        "fr_FR": "Utiliser un UUID aléatoire",
+        "he_IL": "השתמש ב-UUID אקראי",
+        "it_IT": "Usa UUID casuale",
+        "ja_JP": "ランダム UUID を使用",
+        "ko_KR": "무작위 UUID 사용",
+        "no_NO": "Bruk tilfeldig UUID",
+        "pl_PL": "Użyj losowego UUID",
+        "pt_BR": "Usar UUID aleatório",
+        "ru_RU": "Использовать случайный UUID",
+        "sv_SE": "Använd slumpmässig UUID",
+        "th_TH": "ใช้ UUID แบบสุ่ม",
+        "tr_TR": "Rastgele UUID kullan",
+        "uk_UA": "Використовувати випадковий UUID",
+        "zh_CN": "使用随机 UUID",
+        "zh_TW": "使用隨機 UUID"
+      }
+    },
+    {
+      "ID": "PauseEmulationWhileScanningAmiibo",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Emulation während des Scannens pausieren",
+        "el_GR": "",
+        "en_US": "Pause Emulation While Scanning",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "Приостанавливать эмуляцию во время сканирования",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "UsageLabel",
+      "Translations": {
+        "ar_SA": "الاستخدام:",
+        "de_DE": "Nutzung:",
+        "el_GR": "Χρήση:",
+        "en_US": "Usage:",
+        "es_ES": "Uso:",
+        "fr_FR": "Utilisation :",
+        "he_IL": "שימוש:",
+        "it_IT": "Utilizzo:",
+        "ja_JP": "使用法：",
+        "ko_KR": "사용법:",
+        "no_NO": "Forbruk:",
+        "pl_PL": "Użycie:",
+        "pt_BR": "Uso:",
+        "ru_RU": "Применение:",
+        "sv_SE": "Användning:",
+        "th_TH": "การใช้งาน:",
+        "tr_TR": "Kullanım:",
+        "uk_UA": "Використання:",
+        "zh_CN": "用法：",
+        "zh_TW": "用途："
+      }
+    },
+    {
+      "ID": "WritableLabel",
+      "Translations": {
+        "ar_SA": "الاستخدام (يمكنه حفظ البيانات):",
+        "de_DE": "Nutzung (Kann Daten speichern):",
+        "el_GR": "Χρήση (Μπορεί να αποθηκεύσει δεδομένα):",
+        "en_US": "Usage (Can Save Data):",
+        "es_ES": "Uso (Puede guardar datos):",
+        "fr_FR": "Utilisation (Peut enregistrer des données) :",
+        "he_IL": "שימוש (יכול לשמור נתונים):",
+        "it_IT": "Utilizzo (Può salvare dati):",
+        "ja_JP": "使用法（データを保存できます）：",
+        "ko_KR": "사용법 (데이터 저장 가능):",
+        "no_NO": "Bruk (Kan lagre data):",
+        "pl_PL": "Użycie (Może zapisywać dane):",
+        "pt_BR": "Uso (Pode salvar dados):",
+        "ru_RU": "Применение (Может сохранять данные):",
+        "sv_SE": "Användning (Kan spara data):",
+        "th_TH": "การใช้งาน (สามารถบันทึกข้อมูลได้):",
+        "tr_TR": "Kullanım (Veri kaydedebilir):",
+        "uk_UA": "Використання (Може зберігати дані):",
+        "zh_CN": "用法（可保存数据）：",
+        "zh_TW": "用途（可儲存資料）："
+      }
+    },
+    {
+      "ID": "UnknownLabel",
+      "Translations": {
+        "ar_SA": "غير معروف",
+        "de_DE": "Unbekannt",
+        "el_GR": "Άγνωστο",
+        "en_US": "Unknown",
+        "es_ES": "Desconocido",
+        "fr_FR": "Inconnu",
+        "he_IL": "לא ידוע",
+        "it_IT": "Sconosciuto",
+        "ja_JP": "不明",
+        "ko_KR": "알 수 없음",
+        "no_NO": "Ukjent",
+        "pl_PL": "Nieznane",
+        "pt_BR": "Desconhecido",
+        "ru_RU": "Неизвестно",
+        "sv_SE": "Okänt",
+        "th_TH": "ไม่รู้จัก",
+        "tr_TR": "Bilinmeyen",
+        "uk_UA": "Невідомо",
+        "zh_CN": "未知",
+        "zh_TW": "未知"
+      }
+    },
+	  {
+      "ID": "ScanButton",
+      "Translations": {
+        "ar_SA": "فحص Amiibo",
+        "de_DE": "Amiibo einscannen",
+        "el_GR": "Σαρώστε το Amiibo",
+        "en_US": "Scan Amiibo",
+        "es_ES": "Escanear Amiibo",
+        "fr_FR": "Scanner l'Amiibo",
+        "he_IL": "סרוק את ה-Amiibo",
+        "it_IT": "Scansiona l'Amiibo",
+        "ja_JP": "Amiiboをスキャン",
+        "ko_KR": "Amiibo 스캔하기",
+        "no_NO": "Skanne Amiibo",
+        "pl_PL": "Zeskanuj Amiibo",
+        "pt_BR": "Escanear Amiibo",
+        "ru_RU": "Сканировать Amiibo",
+        "sv_SE": "Skanna Amiibo",
+        "th_TH": "สแกน Amiibo",
+        "tr_TR": "Amiibo'yu tara",
+        "uk_UA": "Сканувати Amiibo",
+        "zh_CN": "扫描 Amiibo",
+        "zh_TW": "掃描 Amiibo"
+      }
+    }
+  ]
+}

assets/Locales/Common_Buttons.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "Cancel",
+      "Translations": {
+        "ar_SA": "إلغاء",
+        "de_DE": "Abbrechen",
+        "el_GR": "Ακύρωση",
+        "en_US": "Cancel",
+        "es_ES": "Cancelar",
+        "fr_FR": "Annuler",
+        "he_IL": "ביטול",
+        "it_IT": "Annulla",
+        "ja_JP": "キャンセル",
+        "ko_KR": "취소",
+        "no_NO": "Avbryt",
+        "pl_PL": "Anuluj",
+        "pt_BR": "Cancelar",
+        "ru_RU": "Отмена",
+        "sv_SE": "Avbryt",
+        "th_TH": "ยกเลิก",
+        "tr_TR": "İptal",
+        "uk_UA": "Скасувати",
+        "zh_CN": "取消",
+        "zh_TW": "取消"
+      }
+    }
+  ]
+}

assets/Locales/Common_FilePicker.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "AllSupportedFormats",
+      "Translations": {
+        "ar_SA": "كل التنسيقات المدعومة",
+        "de_DE": "Alle unterstützten Formate",
+        "el_GR": "Όλες Οι Υποστηριζόμενες Μορφές",
+        "en_US": "All Supported Formats",
+        "es_ES": "Todos los Formatos Soportados",
+        "fr_FR": "Tous les Formats Supportés",
+        "he_IL": "כל הפורמטים הנתמכים",
+        "it_IT": "Tutti i formati supportati",
+        "ja_JP": "すべての対応フォーマット",
+        "ko_KR": "지원되는 모든 형식",
+        "no_NO": "Alle støttede formater",
+        "pl_PL": "Wszystkie Obsługiwane Formaty",
+        "pt_BR": "Todos os Formatos Suportados",
+        "ru_RU": "Все поддерживаемые форматы",
+        "sv_SE": "Alla format som stöds",
+        "th_TH": "รูปแบบที่รองรับทั้งหมด",
+        "tr_TR": "Tüm Desteklenen Formatlar",
+        "uk_UA": "Усі підтримувані формати",
+        "zh_CN": "所有支持的格式",
+        "zh_TW": "所有支援的格式"
+      }
+    }
+  ]
+}

assets/Locales/Common_Search.json

@@ -1,5 +1,30 @@
 {
   "Locales": [
+    {
+      "ID": "SearchAmiiboWatermark",
+      "Translations": {
+        "ar_SA": "بحث Amiibo...",
+        "de_DE": "Amiibo suchen...",
+        "el_GR": "Αναζήτηση Amiibo...",
+        "en_US": "Search Amiibo...",
+        "es_ES": "Buscar Amiibo...",
+        "fr_FR": "Rechercher Amiibo...",
+        "he_IL": "חפש Amiibo...",
+        "it_IT": "Cerca Amiibo...",
+        "ja_JP": "Amiiboを検索...",
+        "ko_KR": "Amiibo 검색...",
+        "no_NO": "Søk Amiibo...",
+        "pl_PL": "Wyszukaj Amiibo...",
+        "pt_BR": "Buscar Amiibo...",
+        "ru_RU": "Поиск Amiibo...",
+        "sv_SE": "Sök Amiibo...",
+        "th_TH": "ค้นหา Amiibo...",
+        "tr_TR": "Amiibo Ara...",
+        "uk_UA": "Пошук Amiibo...",
+        "zh_CN": "搜索 Amiibo...",
+        "zh_TW": "搜尋 Amiibo..."
+      }
+    },
     {
       "ID": "SearchWatermark",
       "Translations": {

assets/Locales/Common_Sort.json

@@ -54,7 +54,7 @@
       "ID": "TrimStatusLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmstatus",
         "el_GR": "",
         "en_US": "Trim Status",
         "es_ES": "Estado del recorte",

assets/Locales/Dialog_Amiibo.json

@@ -0,0 +1,179 @@
+{
+  "Locales": [
+    {
+      "ID": "ScanAmiiboFromBinFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle eine BIN-Datei aus, um ein Amiibo zu scannen.",
+        "el_GR": "",
+        "en_US": "Select a BIN file to scan an Amiibo from",
+        "es_ES": "Selecciona un archivo BIN para escanear un Amiibo",
+        "fr_FR": "Sélectionnez un fichier BIN pour scanner un Amiibo",
+        "he_IL": "",
+        "it_IT": "Seleziona un file BIN da cui scansionare un Amiibo",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione um arquivo BIN para escanear um Amiibo",
+        "ru_RU": "Выберите BIN-файл для сканирования Amiibo",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть BIN-файл для сканування Amiibo",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "APITitle",
+      "Translations": {
+        "ar_SA": "أميبو API",
+        "de_DE": "Amiibo-API",
+        "el_GR": "API για Amiibo.",
+        "en_US": "Amiibo API",
+        "es_ES": "API Amiibo",
+        "fr_FR": "API Amiibo",
+        "he_IL": "ממשק תכנות אמיבו",
+        "it_IT": "API Amiibo",
+        "ja_JP": "",
+        "ko_KR": null,
+        "no_NO": "",
+        "pl_PL": "API Amiibo",
+        "pt_BR": "API Amiibo",
+        "ru_RU": "API Amiibo",
+        "sv_SE": "Amiibo-API",
+        "th_TH": "อามิโบ้ API",
+        "tr_TR": "",
+        "uk_UA": "API Amiibo",
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
+    {
+      "ID": "APIFailFetchMessage",
+      "Translations": {
+        "ar_SA": "حدث خطأ أثناء جلب المعلومات من API.",
+        "de_DE": "Beim Abrufen von Informationen aus der API ist ein Fehler aufgetreten.",
+        "el_GR": "Παρουσιάστηκε σφάλμα κατά την ανάκτηση πληροφοριών από το API.",
+        "en_US": "An error occured while fetching information from the API.",
+        "es_ES": "Ocurrió un error al recibir información de la API.",
+        "fr_FR": "Une erreur est survenue lors de la récupération des informations de l'API.",
+        "he_IL": "אירעה שגיאה בעת שליפת מידע מהממשק.",
+        "it_IT": "Si è verificato un errore durante il recupero delle informazioni dall'API.",
+        "ja_JP": "API からの情報取得中にエラーが発生しました.",
+        "ko_KR": "API에서 정보를 가져오는 중에 오류가 발생했습니다.",
+        "no_NO": "En feil oppstod under henting av informasjon fra API.",
+        "pl_PL": "Wystąpił błąd podczas pobierania informacji z API.",
+        "pt_BR": "Um erro ocorreu ao tentar obter informações da API.",
+        "ru_RU": "Произошла ошибка при получении информации из API.",
+        "sv_SE": "Ett fel inträffade vid hämtning av information från API.",
+        "th_TH": "เกิดข้อผิดพลาดขณะเรียกข้อมูลจาก API",
+        "tr_TR": "API'dan bilgi alırken bir hata oluştu.",
+        "uk_UA": "Під час отримання інформації з API сталася помилка.",
+        "zh_CN": "从 API 获取信息时出错。",
+        "zh_TW": "從 API 取得資訊時出現錯誤。"
+      }
+    },
+    {
+      "ID": "APIConnectErrorMessage",
+      "Translations": {
+        "ar_SA": "غير قادر على الاتصال بخادم API أميبو. قد تكون الخدمة معطلة أو قد تحتاج إلى التحقق من اتصالك بالإنترنت.",
+        "de_DE": "Verbindung zum Amiibo API Server kann nicht hergestellt werden. Der Dienst ist möglicherweise nicht verfügbar oder es existiert keine Internetverbindung.",
+        "el_GR": "Δεν είναι δυνατή η σύνδεση με τον διακομιστή Amiibo API. Η υπηρεσία μπορεί να είναι εκτός λειτουργίας ή μπορεί να χρειαστεί να επαληθεύσετε ότι έχετε ενεργή σύνδεσή στο Διαδίκτυο.",
+        "en_US": "Unable to connect to Amiibo API server. The service may be down or you may need to verify your internet connection is online.",
+        "es_ES": "No se pudo conectar al servidor de la API Amiibo. El servicio puede estar caído o tu conexión a internet puede haberse desconectado.",
+        "fr_FR": "Impossible de se connecter au serveur API Amiibo. Le service est peut-être hors service ou vous devriez peut-être vérifier que votre connexion internet est connectée.",
+        "he_IL": "לא ניתן להתחבר לממשק שרת האמיבו. ייתכן שהשירות מושבת או שתצטרך לוודא שהחיבור לאינטרנט שלך מקוון.",
+        "it_IT": "Impossibile connettersi al server dell'API Amiibo. Il servizio potrebbe non essere disponibile o potresti non essere connesso a Internet.",
+        "ja_JP": "Amiibo API サーバに接続できませんでした. サーバがダウンしているか, インターネット接続に問題があるかもしれません.",
+        "ko_KR": "Amiibo API 서버에 연결할 수 없습니다. 서비스가 다운되었거나 인터넷 연결이 온라인 상태인지 확인이 필요합니다.",
+        "no_NO": "Kan ikke koble til Amiibo API server. Tjenesten kan være nede, eller du må kanskje verifisere at din internettforbindelse er tilkoblet.",
+        "pl_PL": "Nie można połączyć się z serwerem API Amiibo. Usługa może nie działać lub może być konieczne sprawdzenie, czy połączenie internetowe jest online.",
+        "pt_BR": "Não foi possível conectar ao servidor da API Amiibo. O serviço pode estar fora do ar ou você precisa verificar sua conexão com a Internet.",
+        "ru_RU": "Не удалось подключиться к серверу Amiibo API. Служба может быть недоступна или вам может потребоваться проверить ваше интернет-соединение.",
+        "sv_SE": "Kunde inte ansluta till Amiibo API-server. Tjänsten kanske är nere eller så behöver du kontrollera att din internetanslutning fungerar.",
+        "th_TH": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ Amiibo API บางบริการอาจหยุดทำงาน หรือไม่คุณต้องทำการตรวจสอบว่าอินเทอร์เน็ตของคุณอยู่ในสถานะเชื่อมต่ออยู่หรือไม่",
+        "tr_TR": "Amiibo API sunucusuna bağlanılamadı. Sunucu çevrimdışı olabilir veya uygun bir internet bağlantınızın olduğunu kontrol etmeniz gerekebilir.",
+        "uk_UA": "Неможливо підключитися до сервера Amiibo API. Можливо, служба не працює або вам потрібно перевірити, чи є підключення до Інтернету.",
+        "zh_CN": "无法连接到 Amiibo API 服务器，服务可能已关闭，或者没有连接互联网。",
+        "zh_TW": "無法連接 Amiibo API 伺服器。服務可能已停機，或者您可能需要確認網際網路連線是否在線上。"
+      }
+    },
+    {
+      "ID": "RenameAmiiboTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Amiibo umbenennen",
+        "el_GR": "",
+        "en_US": "Rename Amiibo",
+        "es_ES": "Renombrar Amiibo",
+        "fr_FR": "Renommer l'Amiibo",
+        "he_IL": "",
+        "it_IT": "Rinomina Amiibo",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Renomear Amiibo",
+        "ru_RU": "Переименовать Amiibo",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Перейменувати Amiibo",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+	  {
+      "ID": "ScanAmiiboTitle",
+      "Translations": {
+        "ar_SA": "فحص Amiibo",
+        "de_DE": "Amiibo einscannen",
+        "el_GR": "Σαρώστε το Amiibo",
+        "en_US": "Scan Amiibo",
+        "es_ES": "Escanear Amiibo",
+        "fr_FR": "Scanner l'Amiibo",
+        "he_IL": "סרוק את ה-Amiibo",
+        "it_IT": "Scansiona l'Amiibo",
+        "ja_JP": "Amiiboをスキャン",
+        "ko_KR": "Amiibo 스캔하기",
+        "no_NO": "Skanne Amiibo",
+        "pl_PL": "Zeskanuj Amiibo",
+        "pt_BR": "Escanear Amiibo",
+        "ru_RU": "Сканировать Amiibo",
+        "sv_SE": "Skanna Amiibo",
+        "th_TH": "สแกน Amiibo",
+        "tr_TR": "Amiibo'yu tara",
+        "uk_UA": "Сканувати Amiibo",
+        "zh_CN": "扫描 Amiibo",
+        "zh_TW": "掃描 Amiibo"
+      }
+    },
+    {
+      "ID": "ScanAmiiboMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Bitte scanne jetzt dein Amiibo.",
+        "el_GR": "",
+        "en_US": "Please scan your Amiibo now.",
+        "es_ES": "Escanea tu Amiibo ahora.",
+        "fr_FR": "Veuillez scannez votre Amiibo.",
+        "he_IL": "",
+        "it_IT": "Scansiona ora il tuo Amiibo.",
+        "ja_JP": "",
+        "ko_KR": "지금 Amiibo를 스캔하세요.",
+        "no_NO": "Vennligst skann Amiiboene dine nå.",
+        "pl_PL": "",
+        "pt_BR": "Por favor, escaneie seu Amiibo agora.",
+        "ru_RU": "Пожалуйста, сканируйте ваш Amiibo.",
+        "sv_SE": "Skanna din Amiibo nu.",
+        "th_TH": "กรุณาสแกน Amiibo ของคุณตอนนี้",
+        "tr_TR": "",
+        "uk_UA": "Будь ласка, проскануйте Ваш Amiibo.",
+        "zh_CN": "请现在扫描你的 Amiibo",
+        "zh_TW": "請掃描你的 Amiibo。"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_ContentLoading.json

@@ -4,7 +4,7 @@
       "ID": "UpdatesAddedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Updates hinzugefügt: {0}",
         "el_GR": "",
         "en_US": "Updates Added: {0}",
         "es_ES": "Actualizaciones Añadidas: {0}",
@@ -29,7 +29,7 @@
       "ID": "UpdatesRemovedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Updates entfernt: {0}",
         "el_GR": "",
         "en_US": "Updates Removed: {0}",
         "es_ES": "Actualizaciones Eliminadas: {0}",
@@ -54,7 +54,7 @@
       "ID": "DLCAddedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "DLC hinzugefügt: {0}",
         "el_GR": "",
         "en_US": "DLC Added: {0}",
         "es_ES": "DLC Añadidos: {0}",
@@ -79,7 +79,7 @@
       "ID": "DLCRemovedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "DLC entfernt: {0}",
         "el_GR": "",
         "en_US": "DLC Removed: {0}",
         "es_ES": "DLC Eliminados: {0}",

assets/Locales/Dialog_FileMenu.json

@@ -4,7 +4,7 @@
       "ID": "LoadApplicationFromFileFilePickerTitle",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Wähle eine Switch-Anwendungsdatei zum Laden aus",
         "el_GR": "",
         "en_US": "Select a Switch application file to load",
         "es_ES": "Selecciona un archivo de aplicación de Switch para cargar",
@@ -29,7 +29,7 @@
       "ID": "LoadUnpackedApplicationFromFolderFilePickerTitle",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Wähle einen Ordner mit einer entpackten Switch-Anwendung zum Laden",
         "el_GR": "",
         "en_US": "Select a folder containing an unpacked Switch application to load",
         "es_ES": "Selecciona una carpeta que contenga una aplicación de Switch descomprimida para cargar",
@@ -54,7 +54,7 @@
       "ID": "LoadUpdatesAndDLCFromFolderFilePickerTitle",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Wähle einen oder mehrere Ordner zum Laden von Updates und DLC aus",
         "el_GR": "",
         "en_US": "Select one or more folders to bulk load updates and DLC from",
         "es_ES": "Selecciona una o más carpetas para cargar de forma masiva actualizaciones y DLC",

assets/Locales/Dialog_Skylanders.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "ScanSkylanderFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle eine BIN-, SKY-, DMP- oder DUMP-Datei aus, um einen Skylander zu scannen.",
+        "el_GR": "",
+        "en_US": "Select a BIN, SKY, DMP, or DUMP file to scan a Skylander from",
+        "es_ES": "Selecciona un archivo BIN, SKY, DMP o DUMP para escanear un Skylander",
+        "fr_FR": "Sélectionnez un fichier BIN, SKY, DMP ou DUMP pour scanner un Skylander",
+        "he_IL": "",
+        "it_IT": "Seleziona un file BIN, SKY, DMP o DUMP da cui scansionare uno Skylander",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione um arquivo BIN, SKY, DMP ou DUMP para escanear um Skylander",
+        "ru_RU": "Выберите файл BIN, SKY, DMP или DUMP для сканирования Skylander",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть файл BIN, SKY, DMP або DUMP для сканування Skylander",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    }
+  ]
+}

assets/Locales/Dialog_XCITrimmer.json

@@ -4,7 +4,7 @@
       "ID": "PrimaryMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Entfernt ungenutzten Speicherplatz aus der XCI-Datei, um ihre Dateigröße zu verringern.",
         "el_GR": "",
         "en_US": "Removes unused space from the XCI to reduce its file size.",
         "es_ES": "Elimina el espacio no utilizado del XCI para reducir su tamaño.",
@@ -29,7 +29,7 @@
       "ID": "SecondaryMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Datei: {0:n} MB • Spiel: {1:n} MB\n\nErsparnis: {2:n} MB",
         "el_GR": "",
         "en_US": "File: {0:n} MB • Game: {1:n} MB\n\nSavings: {2:n} MB",
         "es_ES": "Archivo: {0:n} MB • Juego: {1:n} MB\n\nAhorro: {2:n} MB",
@@ -47,18 +47,18 @@
         "tr_TR": "",
         "uk_UA": "Файл: {0:n} МБ • Гра: {1:n} МБ\n\nЕкономія: {2:n} МБ",
         "zh_CN": "文件: {0:n} MB • 游戏: {1:n} MB\n\n节省: {2:n} MB",
-        "zh_TW": "檔案: {0:n} MB • 遊戲: {1:n} MB\n\n節省: {2:n} MB" 
+        "zh_TW": "檔案: {0:n} MB • 遊戲: {1:n} MB\n\n節省: {2:n} MB"
       }
     },
     {
       "ID": "NoTrimNecessaryMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI muss nicht getrimmt werden. Prüfen Sie die Logs für Details.",
         "el_GR": "",
         "en_US": "XCI does not require trimming. Check logs for details.",
         "es_ES": "El XCI no necesita ser recortado. Verifica los logs para detalles.",
-		    "fr_FR": "Le XCI n’a pas besoin d’être réduit. Référez-vous aux journaux pour détails.",
+        "fr_FR": "Le XCI n’a pas besoin d’être réduit. Référez-vous aux journaux pour détails.",
         "he_IL": "",
         "it_IT": "Non è necessario ridurre la dimensione del XCI. Controlla i log per dettagli.",
         "ja_JP": "",
@@ -79,7 +79,7 @@
       "ID": "NoUntrimPossibleMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Das Trimmen der XCI kann nicht rückgängig gemacht werden. Prüfen Sie die Logs für Details.",
         "el_GR": "",
         "en_US": "XCI cannot be untrimmed. Check logs for details.",
         "es_ES": "El recorte del XCI no puede ser deshecho. Verifica los registros para detalles.",
@@ -104,7 +104,7 @@
       "ID": "ReadOnlyFileCannotFixMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI ist schreibgeschützt und konnte nicht schreibbar gemacht werden. Prüfen Sie die Logs für Details.",
         "el_GR": "",
         "en_US": "XCI is read-only and could not be made writable. Check logs for details.",
         "es_ES": "XCI es solo lectura y no se puede escribir. Verifica los registros para detalles.",
@@ -120,7 +120,7 @@
         "sv_SE": "XCI-filen är skrivskyddad och kunde inte göras skrivbar. Kontrollera loggen för mer information",
         "th_TH": "XCI เป็นอ่านอย่างเดียวและไม่สามารถเขียนได้ ตรวจสอบบันทึกสำหรับรายละเอียด",
         "tr_TR": "",
-		    "uk_UA": "XCI тільки для читання і не можна записати. Перевірте логи для деталей.",
+        "uk_UA": "XCI тільки для читання і не можна записати. Перевірте логи для деталей.",
         "zh_CN": "XCI 只读，无法写入。查看日志以获取详情。",
         "zh_TW": "XCI 檔案唯讀，無法寫入。檢查日誌以取得詳情。"
       }
@@ -129,11 +129,11 @@
       "ID": "SizeChangedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI-Größe hat sich seit dem letzten Scan geändert. Stellen Sie sicher, dass die Datei nicht beschrieben wird, und versuchen Sie es erneut.",
         "el_GR": "",
         "en_US": "XCI size changed since last scan. Ensure the file is not being written to and try again.",
         "es_ES": "El tamaño de XCI ha cambiado desde que fue escaneado. Verifica que no se esté escribiendo al archivo y vuelve a intentarlo.",
-		    "fr_FR": "La taille de XCI a changé depuis son analyse. Vérifiez que le fichier n’est pas en cours d’écriture, puis réessayez.",
+        "fr_FR": "La taille de XCI a changé depuis son analyse. Vérifiez que le fichier n’est pas en cours d’écriture, puis réessayez.",
         "he_IL": "",
         "it_IT": "La dimensione di XCI è cambiata da quando è stato scansionato. Controlla che il file non sia scritto e riprova.",
         "ja_JP": "",
@@ -154,7 +154,7 @@
       "ID": "FreeSpaceCheckFailedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI enthält Daten im freien Speicherbereich. Es ist unsicher zu trimmen.",
         "el_GR": "",
         "en_US": "XCI has data in the free space area. It is not safe to trim.",
         "es_ES": "XCI tiene datos en el área de espacio libre. No es seguro recortarlo.",
@@ -166,7 +166,7 @@
         "no_NO": "XCI har data i den ledige plassen. Det er ikke trygt å trimme den.",
         "pl_PL": "XCI zawiera dane w obszarze wolnego miejsca. Nie jest bezpieczne go przycinać.",
         "pt_BR": "XCI tem dados na área de espaço livre. Não é seguro reduzi-lo.",
-		    "ru_RU": "XCI содержит данные в свободной области. Его обрезка небезопасна.",
+        "ru_RU": "XCI содержит данные в свободной области. Его обрезка небезопасна.",
         "sv_SE": "XCI har data i det lediga utrymmet. Det är inte säkert att optimera.",
         "th_TH": "XCI มีข้อมูลในพื้นที่ว่าง จึงไม่ปลอดภัยที่จะทำการตัดแต่ง",
         "tr_TR": "",
@@ -179,7 +179,7 @@
       "ID": "InvalidDataMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI enthält ungültige Daten. Prüfen Sie die Logs für Details.",
         "el_GR": "",
         "en_US": "XCI contains invalid data. Check logs for details.",
         "es_ES": "XCI contiene datos inválidos. Lee el registro para detalles.",
@@ -204,7 +204,7 @@
       "ID": "WriteErrorMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI konnte nicht zum Schreiben geöffnet werden. Prüfen Sie die Logs für Details.",
         "el_GR": "",
         "en_US": "XCI could not be opened for writing. Check logs for details.",
         "es_ES": "XCI no se puede abrir para escribir. Lee el registro para detalles.",
@@ -216,11 +216,11 @@
         "no_NO": "XCI kunne ikke åpnes for skriving. Sjekk loggene for detaljer.",
         "pl_PL": "Nie można otworzyć XCI do zapisu. Sprawdź dzienniki, aby uzyskać szczegóły.",
         "pt_BR": "XCI não pôde ser aberto para gravação. Verifique os logs para detalhes.",
-		    "ru_RU": "Не удалось открыть XCI для записи. Проверьте журналы для подробностей.",
+        "ru_RU": "Не удалось открыть XCI для записи. Проверьте журналы для подробностей.",
         "sv_SE": "XCI kunde inte öppnas för skrivning. Kontrollera loggen för detaljer.",
         "th_TH": "ไม่สามารถเปิด XCI เพื่อเขียนข้อมูลได้ โปรดตรวจสอบบันทึกสำหรับรายละเอียด",
         "tr_TR": "",
-		    "uk_UA": "Не вдалося відкрити XCI для запису. Перевірте журнали для деталей.",
+        "uk_UA": "Не вдалося відкрити XCI для запису. Перевірте журнали для деталей.",
         "zh_CN": "XCI 不能写入。查看日志以获得更多细节。",
         "zh_TW": "XCI 無法開啟以進行寫入。請檢查日誌以取得更多資訊。"
       }
@@ -229,7 +229,7 @@
       "ID": "TrimFailedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmen der XCI fehlgeschlagen.",
         "el_GR": "",
         "en_US": "Failed to trim XCI.",
         "es_ES": "El recorte del XCI falló.",
@@ -254,7 +254,7 @@
       "ID": "TrimCancelledMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Der Vorgang wurde abgebrochen.",
         "el_GR": "",
         "en_US": "The operation was cancelled.",
         "es_ES": "La operación fue cancelada.",
@@ -279,7 +279,7 @@
       "ID": "NoOperationPerformedMessage",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Es wurde keine Aktion durchgeführt.",
         "el_GR": "",
         "en_US": "No operation was performed.",
         "es_ES": "No se realizó ninguna operación.",
@@ -301,4 +301,4 @@
       }
     }
   ]
-}
+}

assets/Locales/Error.json

@@ -29,7 +29,7 @@
       "ID": "NoUnpackedApplicationFoundInFolder",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Bitte wähle einen entpackten Anwendungsordner mit gültigem ExeFS oder NSO/NRO aus.",
         "el_GR": "",
         "en_US": "Please select an unpacked application folder with a valid ExeFS or NSO/NRO.",
         "es_ES": "",

assets/Locales/GameListContextMenu.json

@@ -3,7 +3,7 @@
     {
       "ID": "TrimXCIButton",
       "Translations": {
-	      "ar_SA": "تقليم XCI",
+        "ar_SA": "تقليم XCI",
         "de_DE": "Zuschneiden der XCI",
         "el_GR": "Κοπή XCI",
         "en_US": "Trim XCI",
@@ -19,11 +19,11 @@
         "ru_RU": "Обрезать XCI",
         "sv_SE": "Optimera XCI",
         "th_TH": "ลดขนาด XCI",
-		    "tr_TR": "XCI'yi Kırp",
+        "tr_TR": "XCI'yi Kırp",
         "uk_UA": "Нарізка XCI",
         "zh_CN": "精简 XCI",
         "zh_TW": "修剪 XCI"
       }
     }
   ]
-}
+}

assets/Locales/MenuBar_Actions.json

@@ -228,7 +228,7 @@
     {
       "ID": "XCITrimmerButton",
       "Translations": {
-	      "ar_SA": "",
+        "ar_SA": "",
         "de_DE": "XCI-Trimmer",
         "el_GR": "",
         "en_US": "XCI Trimmer",
@@ -378,26 +378,26 @@
     {
       "ID": "ScanAmiiboFromBinButton",
       "Translations": {
-        "ar_SA": "مسح Amiibo (.BIN)",
-        "de_DE": "Amiibo scannen (.BIN)",
-        "el_GR": "Σάρωση Amiibo (.BIN)",
-        "en_US": "Scan Amiibo (.BIN)",
-        "es_ES": "Escanear un Amiibo (.BIN)",
-        "fr_FR": "Scanner un Amiibo (.BIN)",
-        "he_IL": "סרוק Amiibo (.BIN)",
-        "it_IT": "Scansiona un Amiibo (.BIN)",
-        "ja_JP": "Amiibo をスキャン (.BIN)",
-        "ko_KR": "Amiibo 스캔 (.BIN)",
-        "no_NO": "Skann en Amiibo (.BIN)",
-        "pl_PL": "Skanuj Amiibo (.BIN)",
-        "pt_BR": "Escaneie um Amiibo (.BIN)",
-        "ru_RU": "Сканировать Amiibo (.BIN)",
-        "sv_SE": "Skanna en Amiibo (.BIN)",
-        "th_TH": "สแกนอามีโบ (.BIN)",
-        "tr_TR": "Amiibo Tara (.BIN)",
-        "uk_UA": "Сканувати Amiibo (.BIN)",
-        "zh_CN": "扫描 Amiibo (.BIN)",
-        "zh_TW": "掃瞄 Amiibo (.BIN)"
+        "ar_SA": "مسح Amiibo (BIN)",
+        "de_DE": "Amiibo scannen (BIN)",
+        "el_GR": "Σάρωση Amiibo (BIN)",
+        "en_US": "Scan Amiibo (BIN)",
+        "es_ES": "Escanear un Amiibo (BIN)",
+        "fr_FR": "Scanner un Amiibo (BIN)",
+        "he_IL": "סרוק Amiibo (BIN)",
+        "it_IT": "Scansiona un Amiibo (BIN)",
+        "ja_JP": "Amiibo をスキャン (BIN)",
+        "ko_KR": "Amiibo 스캔 (BIN)",
+        "no_NO": "Skann en Amiibo (BIN)",
+        "pl_PL": "Skanuj Amiibo (BIN)",
+        "pt_BR": "Escaneie um Amiibo (BIN)",
+        "ru_RU": "Сканировать Amiibo (BIN)",
+        "sv_SE": "Skanna en Amiibo (BIN)",
+        "th_TH": "สแกนอามีโบ (BIN)",
+        "tr_TR": "Amiibo Tara (BIN)",
+        "uk_UA": "Сканувати Amiibo (BIN)",
+        "zh_CN": "扫描 Amiibo (BIN)",
+        "zh_TW": "掃瞄 Amiibo (BIN)"
       }
     },
     {

assets/Locales/MenuBar_File.json

@@ -154,7 +154,7 @@
       "ID": "OpenScreenshotsFolderButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "Screenshots-Ordner öffnen",
+        "de_DE": "Bildschirmfoto-Ordner öffnen",
         "el_GR": "",
         "en_US": "Open Screenshots Folder",
         "es_ES": "Abrir Carpeta de Capturas de Pantalla",
@@ -179,7 +179,7 @@
       "ID": "AssociateFileTypesButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Dateitypen zuordnen",
         "el_GR": "",
         "en_US": "Associate File Types",
         "es_ES": "",
@@ -204,7 +204,7 @@
       "ID": "RemoveFileTypeAssociationsButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Dateityp-Zuordnungen entfernen",
         "el_GR": "",
         "en_US": "Remove File Type Associations",
         "es_ES": "",
@@ -229,7 +229,7 @@
       "ID": "FileTypeAssociationsToolTip",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Ordnet unterstützte Dateitypen (NSP, XCI, NCA, NRO, NSO) Ryujinx zu, sodass sie beim Doppelklick im Dateimanager automatisch geöffnet werden. Das Entfernen der Dateityp-Zuordnungen deaktiviert dieses Verhalten.",
         "el_GR": "",
         "en_US": "Associates supported file types (NSP, XCI, NCA, NRO, NSO) with Ryujinx so they open automatically when double-clicked in your file manager. Removing file type associations stops this behavior.",
         "es_ES": "",

assets/Locales/Settings_Interface.json

@@ -54,7 +54,7 @@
       "ID": "StartGamesWithoutUICheckboxLabelToolTip",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Blendet die Benutzeroberfläche von Ryujinx automatisch aus, sobald ein Spiel gestartet wird. Während des Spiels kann die Oberfläche mit F4 eingeblendet werden.",
         "el_GR": "",
         "en_US": "Automatically hides Ryujinx's UI whenever a game launches. While in-game, press F4 to show the UI.",
         "es_ES": "",

assets/Locales/StatusBar.json

@@ -1,6 +1,6 @@
 {
   "Locales": [
-	  {
+    {
       "ID": "TrimmingXCILabel",
       "Translations": {
         "ar_SA": "جاري تقليم: {0}",
@@ -19,7 +19,7 @@
         "ru_RU": "Обрезка: {0}",
         "sv_SE": "Trimmar: {0}",
         "th_TH": "กำลังตัด: {0}",
-		    "tr_TR": "{0} Kısaltılıyor:",
+        "tr_TR": "{0} Kısaltılıyor:",
         "uk_UA": "Обрізка: {0}",
         "zh_CN": "正在修剪: {0}",
         "zh_TW": "正在修剪: {0}"

assets/Locales/XCITrimmer.json

@@ -4,7 +4,7 @@
       "ID": "StatusCountLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI ausgewählt: {0}/{1}",
         "el_GR": "",
         "en_US": "XCI Selected: {0}/{1}",
         "es_ES": "XCI Seleccionados: {0}/{1}",
@@ -29,7 +29,7 @@
       "ID": "StatusCountWithFilterLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "XCI ausgewählt: {0}/{1} (Sichtbar: {2})",
         "el_GR": "",
         "en_US": "XCI Selected: {0}/{1} (Displayed: {2})",
         "es_ES": "XCI Seleccionados: {0}/{1} (Mostrados: {2})",
@@ -48,13 +48,13 @@
         "uk_UA": "Вибрано XCI: {0}/{1} (Відображається: {2})",
         "zh_CN": "XCI 已选: {0}/{1}（显示: {2}）",
         "zh_TW": "XCI 已選擇: {0}/{1}（顯示: {2}）"
-          }
+      }
     },
     {
       "ID": "StatusTrimmingLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmen: {0}/{1}...",
         "el_GR": "",
         "en_US": "Trimming: {0}/{1}...",
         "es_ES": "Recortando: {0}/{1}...",
@@ -79,7 +79,7 @@
       "ID": "StatusUntrimmingLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmung von {0} wieder aufheben...",
         "el_GR": "",
         "en_US": "Untrimming {0}...",
         "es_ES": "Deshaciendo el recorte {0}...",
@@ -103,7 +103,7 @@
     {
       "ID": "SelectAllButton",
       "Translations": {
-		    "ar_SA": "اختر الكل",
+        "ar_SA": "اختر الكل",
         "de_DE": "Alles auswählen",
         "el_GR": "Επιλογή όλων",
         "en_US": "Select All",
@@ -154,7 +154,7 @@
       "ID": "TrimmedLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Getrimmt",
         "el_GR": "",
         "en_US": "Trimmed",
         "es_ES": "Recortado",
@@ -179,7 +179,7 @@
       "ID": "UntrimmedLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Ungetrimmt",
         "el_GR": "",
         "en_US": "Untrimmed",
         "es_ES": "Sin Recortar",
@@ -204,7 +204,7 @@
       "ID": "PartialLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Teilweise",
         "el_GR": "",
         "en_US": "Partial",
         "es_ES": "Parcial",
@@ -229,7 +229,7 @@
       "ID": "FailedLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Fehlgeschlagen",
         "el_GR": "",
         "en_US": "Failed",
         "es_ES": "Fallido",
@@ -304,7 +304,7 @@
       "ID": "SavedLabel",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Gespeichert:",
         "el_GR": "",
         "en_US": "Saved:",
         "es_ES": "Ahorrado:",
@@ -366,7 +366,7 @@
         "no_NO": null,
         "pl_PL": null,
         "pt_BR": null,
-		    "ru_RU": "{0} МБ",
+        "ru_RU": "{0} МБ",
         "sv_SE": null,
         "th_TH": null,
         "tr_TR": null,
@@ -379,7 +379,7 @@
       "ID": "TrimButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmen",
         "el_GR": "",
         "en_US": "Trim",
         "es_ES": "Recortar",
@@ -404,7 +404,7 @@
       "ID": "UntrimButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "",
+        "de_DE": "Trimmen aufheben",
         "el_GR": "",
         "en_US": "Untrim",
         "es_ES": "Desrecortar",

docs/compatibility.csv

@@ -2667,7 +2667,8 @@
 0100C52011460000,"Sky: Children of the Light",cpu;online-broken,nothing,2023-02-23 10:57:10
 010041C01014E000,"Skybolt Zack",,playable,2021-04-12 18:28:00
 0100A0A00D1AA000,"SKYHILL",,playable,2021-03-05 15:19:11
-0100CCC0002E6000,"Skylanders Imaginators",crash;services,boots,2020-05-30 18:49:18
+010048D000BFC000,"Skylanders Imaginators",,playable,2026-07-02 22:43:30
+0100CCC0002E6000,"Skylanders Imaginators",,playable,2026-07-02 22:43:30
 010021A00ABEE000,"SKYPEACE",,playable,2020-05-29 14:14:30
 0100EA400BF44000,"SkyScrappers",,playable,2020-05-28 22:11:25
 0100F3C00C400000,"SkyTime",slow,ingame,2020-05-30 09:24:51

global.json

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

src/ARMeilleure/CodeGen/CompiledFunction.cs

@@ -8,7 +8,7 @@ namespace ARMeilleure.CodeGen
     /// <summary>
     /// Represents a compiled function.
     /// </summary>
-    readonly struct CompiledFunction
+    public readonly struct CompiledFunction
     {
         /// <summary>
         /// Gets the machine code of the <see cref="CompiledFunction"/>.
@@ -44,10 +44,11 @@ namespace ARMeilleure.CodeGen
         /// <typeparamref name="T"/> pointing to the mapped function.
         /// </summary>
         /// <typeparam name="T">Type of delegate</typeparam>
+        /// <param name="jitCache">The jit cache to map the function into</param>
         /// <returns>A delegate of type <typeparamref name="T"/> pointing to the mapped function</returns>
-        public T Map<T>()
+        public T Map<T>(JitCache jitCache)
         {
-            return MapWithPointer<T>(out _);
+            return MapWithPointer<T>(jitCache, out _);
         }
 
         /// <summary>
@@ -55,11 +56,12 @@ namespace ARMeilleure.CodeGen
         /// <typeparamref name="T"/> pointing to the mapped function.
         /// </summary>
         /// <typeparam name="T">Type of delegate</typeparam>
+        /// <param name="jitCache">The jit cache to map the function into</param>
         /// <param name="codePointer">Pointer to the function code in memory</param>
         /// <returns>A delegate of type <typeparamref name="T"/> pointing to the mapped function</returns>
-        public T MapWithPointer<T>(out nint codePointer)
+        public T MapWithPointer<T>(JitCache jitCache, out nint codePointer)
         {
-            codePointer = JitCache.Map(this);
+            codePointer = jitCache.Map(this);
 
             return Marshal.GetDelegateForFunctionPointer<T>(codePointer);
         }

src/ARMeilleure/CodeGen/Linking/RelocEntry.cs

@@ -3,7 +3,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents a relocation.
     /// </summary>
-    readonly struct RelocEntry
+    public readonly struct RelocEntry
     {
         public const int Stride = 13; // Bytes.
 

src/ARMeilleure/CodeGen/Linking/RelocInfo.cs

@@ -5,7 +5,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents relocation information about a <see cref="CompiledFunction"/>.
     /// </summary>
-    readonly struct RelocInfo
+    public readonly struct RelocInfo
     {
         /// <summary>
         /// Gets an empty <see cref="RelocInfo"/>.

src/ARMeilleure/CodeGen/Linking/Symbol.cs

@@ -5,7 +5,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents a symbol.
     /// </summary>
-    readonly struct Symbol
+    public readonly struct Symbol
     {
         private readonly ulong _value;
 

src/ARMeilleure/CodeGen/Linking/SymbolType.cs

@@ -3,7 +3,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Types of <see cref="Symbol"/>.
     /// </summary>
-    enum SymbolType : byte
+    public enum SymbolType : byte
     {
         /// <summary>
         /// Refers to nothing, i.e no symbol.

src/ARMeilleure/CodeGen/Unwinding/UnwindInfo.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    struct UnwindInfo
+    public struct UnwindInfo
     {
         public const int Stride = 4; // Bytes.
 

src/ARMeilleure/CodeGen/Unwinding/UnwindPseudoOp.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    enum UnwindPseudoOp
+    public enum UnwindPseudoOp
     {
         PushReg = 0,
         SetFrame = 1,

src/ARMeilleure/CodeGen/Unwinding/UnwindPushEntry.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    struct UnwindPushEntry
+    public struct UnwindPushEntry
     {
         public const int Stride = 16; // Bytes.
 

src/ARMeilleure/Common/AddressTableLevel.cs

@@ -6,7 +6,7 @@ namespace ARMeilleure.Common
     public readonly struct AddressTableLevel
     {
         /// <summary>
-        /// Gets the index of the <see cref="Level"/> in the guest address.
+        /// Gets the index of the <see cref="Index"/> in the guest address.
         /// </summary>
         public int Index { get; }
 

src/ARMeilleure/Common/AddressTablePresets.cs

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

src/ARMeilleure/Common/AddressTableType.cs

@@ -0,0 +1,8 @@
+namespace ARMeilleure.Common
+{
+    public enum AddressTableType
+    {
+        Default,
+        Sparse
+    }
+}

src/ARMeilleure/Common/BitUtils.cs

@@ -53,5 +53,14 @@ namespace ARMeilleure.Common
         {
             return (bits >> shift) | (bits << (size - shift));
         }
+        
+        public static T AlignUp<T>(T value, T size) where T : IBinaryInteger<T>
+            => (value + (size - T.One)) & -size;
+
+        public static T AlignDown<T>(T value, T size) where T : IBinaryInteger<T>
+            => value & -size;
+
+        public static T DivRoundUp<T>(T value, T dividend) where T : IBinaryInteger<T>
+            => (value + (dividend - T.One)) / dividend;
     }
 }

src/ARMeilleure/Common/IAddressTable.cs

@@ -5,11 +5,10 @@ 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.
+        /// Gets the <see cref="AddressTableType"/> of the <see cref="IAddressTable{TEntry}"/> instance.
         /// </summary>
-        bool Sparse { get; }
-
+        AddressTableType TableType { get; }
+        
         /// <summary>
         /// Gets the bits used by the <see cref="Levels"/> of the <see cref="IAddressTable{TEntry}"/> instance.
         /// </summary>
@@ -31,6 +30,13 @@ namespace ARMeilleure.Common
         /// <exception cref="ObjectDisposedException"><see cref="EntryTable{TEntry}"/> instance was disposed</exception>
         nint Base { get; }
 
+        /// <summary>
+        /// Signal that the given code range exists.
+        /// </summary>
+        /// <param name="address">Guest code range address</param>
+        /// <param name="size">Guest code range size</param>
+        void SignalCodeRange(ulong address, ulong size);
+
         /// <summary>
         /// Determines if the specified <paramref name="address"/> is in the range of the
         /// <see cref="IAddressTable{TEntry}"/>.

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;
 
@@ -236,9 +236,9 @@ namespace ARMeilleure.Instructions
 
                 hostAddress = context.Load(OperandType.I64, hostAddressAddr);
             }
-            else if (table.Sparse)
+            else if (table.TableType ==  AddressTableType.Sparse)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
                 // Deliberately attempts to avoid branches.
 
                 Operand tableBase = !context.HasPtc ?
@@ -247,24 +247,21 @@ namespace ARMeilleure.Instructions
 
                 hostAddress = tableBase;
 
-                for (int i = 0; i < table.Levels.Length; i++)
-                {
-                    AddressTableLevel level = table.Levels[i];
-                    int clearBits = 64 - (level.Index + level.Length);
+                AddressTableLevel level = table.Levels.Last();
+                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
             {
                 hostAddress = !context.HasPtc ?
-                    Const((long)context.Stubs.DispatchStub) :
-                    Const((long)context.Stubs.DispatchStub, Ptc.DispatchStubSymbol);
+                    Const(context.Stubs.DispatchStub) :
+                    Const(context.Stubs.DispatchStub, Ptc.DispatchStubSymbol);
             }
 
             if (isJump)

src/ARMeilleure/Memory/ReservedRegion.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace ARMeilleure.Memory
 {
-    public class ReservedRegion
+    public class ReservedRegion : IDisposable
     {
         public const int DefaultGranularity = 65536; // Mapping granularity in Windows.
 

src/ARMeilleure/Signal/TestMethods.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
+using ARMeilleure.Translation.Cache;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -17,7 +18,7 @@ namespace ARMeilleure.Signal
         public delegate int DebugThreadLocalMapGetOrReserve(int threadId, int initialState);
         public delegate void DebugNativeWriteLoop(nint nativeWriteLoopPtr, nint writePtr);
 
-        public static DebugPartialUnmap GenerateDebugPartialUnmap()
+        public static DebugPartialUnmap GenerateDebugPartialUnmap(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -31,10 +32,10 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugPartialUnmap>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugPartialUnmap>(jitCache);
         }
 
-        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(nint structPtr)
+        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(JitCache jitCache, nint structPtr)
         {
             EmitterContext context = new();
 
@@ -48,10 +49,10 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugThreadLocalMapGetOrReserve>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugThreadLocalMapGetOrReserve>(jitCache);
         }
 
-        public static DebugNativeWriteLoop GenerateDebugNativeWriteLoop()
+        public static DebugNativeWriteLoop GenerateDebugNativeWriteLoop(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -77,7 +78,7 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.None, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugNativeWriteLoop>();
+            return Compiler.Compile(cfg, argTypes, OperandType.None, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugNativeWriteLoop>(jitCache);
         }
     }
 }

src/ARMeilleure/Translation/Cache/CacheEntry.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace ARMeilleure.Translation.Cache
 {
-    readonly struct CacheEntry : IComparable<CacheEntry>
+    public readonly struct CacheEntry : IComparable<CacheEntry>
     {
         public int Offset { get; }
         public int Size { get; }

src/ARMeilleure/Translation/Cache/CacheMemoryAllocator.cs

@@ -22,12 +22,31 @@ namespace ARMeilleure.Translation.Cache
                 return Offset.CompareTo(other.Offset);
             }
         }
+        
+        private readonly int _regionSize;
+        private int _regionCount;
 
         private readonly List<MemoryBlock> _blocks = [];
 
-        public CacheMemoryAllocator(int capacity)
+        public CacheMemoryAllocator(int regionSize, int initialRegionCount = 1)
         {
-            _blocks.Add(new MemoryBlock(0, capacity));
+            _regionCount = 0;
+            _regionSize = regionSize;
+            
+            for (; initialRegionCount > 0; initialRegionCount--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
+        }
+
+        public void AddNewBlocks(int count)
+        {
+            for (; count > 0; count--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
         }
 
         public int Allocate(int size)
@@ -65,13 +84,14 @@ namespace ARMeilleure.Translation.Cache
             {
                 index = ~index;
             }
+            
+            int endOffs = block.Offset + block.Size;
 
-            if (index < _blocks.Count)
+            // Don't merge blocks from different allocations
+            if (index < _blocks.Count && endOffs % _regionSize != 0)
             {
                 MemoryBlock next = _blocks[index];
 
-                int endOffs = block.Offset + block.Size;
-
                 if (next.Offset == endOffs)
                 {
                     block = new MemoryBlock(block.Offset, block.Size + next.Size);
@@ -79,7 +99,8 @@ namespace ARMeilleure.Translation.Cache
                 }
             }
 
-            if (index > 0)
+            // Don't merge blocks from different allocations
+            if (index > 0 && block.Offset % _regionSize != 0)
             {
                 MemoryBlock prev = _blocks[index - 1];
 

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -14,62 +14,35 @@ using System.Threading;
 
 namespace ARMeilleure.Translation.Cache
 {
-    static partial class JitCache
+    public partial class JitCache : IDisposable
     {
         private static readonly int _pageSize = (int)MemoryBlock.GetPageSize();
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        private const int CacheSize = 256 * 1024 * 1024;
+        private const uint CacheSize = 256 * 1024 * 1024;
 
-        private static JitCacheInvalidation _jitCacheInvalidator;
+        private readonly JitCacheInvalidation _jitCacheInvalidator;
 
-        private static readonly List<CacheMemoryAllocator> _cacheAllocators = [];
+        private readonly CacheMemoryAllocator _cacheAllocator;
 
-        private static readonly List<CacheEntry> _cacheEntries = [];
+        private readonly List<CacheEntry> _cacheEntries = [];
 
-        private static readonly Lock _lock = new();
-        private static bool _initialized;
+        private readonly Lock _lock = new();
 
-        private static readonly List<ReservedRegion> _jitRegions = [];
-        private static int _activeRegionIndex = 0;
+        private readonly List<ReservedRegion> _jitRegions = [];
 
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
+        private static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
 
-        public static void Initialize(IJitMemoryAllocator allocator)
+        public JitCache(IJitMemoryAllocator allocator)
         {
             lock (_lock)
             {
-                if (_initialized)
-                {
-                    if (OperatingSystem.IsWindows())
-                    {
-                        JitUnwindWindows.RemoveFunctionTableHandler(
-                            _jitRegions[0].Pointer);
-                    }
+                _jitRegions.Add(new(allocator, CacheSize));
 
-                    for (int i = 0; i < _jitRegions.Count; i++)
-                    {
-                        _jitRegions[i].Dispose();
-                    }
-
-                    _jitRegions.Clear();
-                    _cacheAllocators.Clear();
-                }
-                else
-                {
-                    _initialized = true;
-                }
-
-                _activeRegionIndex = 0;
-
-                ReservedRegion firstRegion = new(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-
-                CacheMemoryAllocator firstCacheAllocator = new(CacheSize);
-                _cacheAllocators.Add(firstCacheAllocator);
+                _cacheAllocator = new((int)CacheSize);
 
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
@@ -79,23 +52,20 @@ namespace ARMeilleure.Translation.Cache
                 if (OperatingSystem.IsWindows())
                 {
                     JitUnwindWindows.InstallFunctionTableHandler(
-                        firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
+                        this, _jitRegions[0].Pointer, CacheSize, _jitRegions[0].Pointer + Allocate(_pageSize)
                     );
                 }
             }
         }
 
-        public static nint Map(CompiledFunction func)
+        public nint Map(CompiledFunction func)
         {
             byte[] code = func.Code;
 
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = GetFunctionPtr(funcOffset);
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -109,9 +79,9 @@ namespace ARMeilleure.Translation.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
                     Marshal.Copy(code, 0, funcPtr, code.Length);
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
                     if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                     {
@@ -129,25 +99,24 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        public static void Unmap(nint pointer)
+        public void Unmap(nint pointer)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
-                foreach (ReservedRegion region in _jitRegions)
+                for (int i = 0; i < _jitRegions.Count; i++)
                 {
-                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                    ReservedRegion jitRegion = _jitRegions[i];
+                    if (pointer.ToInt64() < jitRegion.Pointer.ToInt64() ||
+                        pointer.ToInt64() >= (jitRegion.Pointer + (nint)CacheSize).ToInt64())
                     {
                         continue;
                     }
 
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
+                    int funcOffset = (int)(pointer.ToInt64() - jitRegion.Pointer.ToInt64() + i * CacheSize);
 
                     if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                     {
-                        _cacheAllocators[_activeRegionIndex].Free(funcOffset, AlignCodeSize(entry.Size));
+                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
                         _cacheEntries.RemoveAt(entryIndex);
                     }
 
@@ -156,53 +125,67 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
-
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            int regionStart = (offset % (int)CacheSize) & ~_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));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static int Allocate(int codeSize)
+        private int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
 
-            int allocOffset = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
+            int allocOffset = _cacheAllocator.Allocate(codeSize);
 
             if (allocOffset >= 0)
             {
-                _jitRegions[_activeRegionIndex].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
+                GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
                 return allocOffset;
             }
 
-            int exhaustedRegion = _activeRegionIndex;
+            _cacheAllocator.AddNewBlocks(1);
             ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
+            
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache of size {(_jitRegions.Count * CacheSize).Bytes()} exhausted, creating new Cache Region ({((_jitRegions.Count + 1) * CacheSize).Bytes()} Total Allocation).");
+
             _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
-
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {_activeRegionIndex} ({((long)(_activeRegionIndex + 1) * CacheSize).Bytes()} Total Allocation).");
-
-            _cacheAllocators.Add(new CacheMemoryAllocator(CacheSize));
-
-            int allocOffsetNew = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
-            if (allocOffsetNew < 0)
+            
+            allocOffset = _cacheAllocator.Allocate(codeSize);
+            if (allocOffset < 0)
             {
                 throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
             }
 
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
+            GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+            return allocOffset;
+        }
+
+        private nint GetFunctionPtr(int offset)
+        {
+            return GetRegion(offset).Pointer + (offset % (int)CacheSize);
+        }
+
+        private ReservedRegion GetRegion(int offset)
+        {
+            int index = offset / (int)CacheSize;
+
+            return _jitRegions[index];
         }
 
         private static int AlignCodeSize(int codeSize)
@@ -210,7 +193,7 @@ namespace ARMeilleure.Translation.Cache
             return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
         }
 
-        private static void Add(int offset, int size, UnwindInfo unwindInfo)
+        private void Add(int offset, int size, UnwindInfo unwindInfo)
         {
             CacheEntry entry = new(offset, size, unwindInfo);
 
@@ -224,25 +207,22 @@ namespace ARMeilleure.Translation.Cache
             _cacheEntries.Insert(index, entry);
         }
 
-        public static bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
+        public bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
         {
             lock (_lock)
             {
-                foreach (ReservedRegion _ in _jitRegions)
+                int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+
+                if (index < 0)
                 {
-                    int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+                    index = ~index - 1;
+                }
 
-                    if (index < 0)
-                    {
-                        index = ~index - 1;
-                    }
-
-                    if (index >= 0)
-                    {
-                        entry = _cacheEntries[index];
-                        entryIndex = index;
-                        return true;
-                    }
+                if (index >= 0)
+                {
+                    entry = _cacheEntries[index];
+                    entryIndex = index;
+                    return true;
                 }
             }
 
@@ -250,5 +230,18 @@ namespace ARMeilleure.Translation.Cache
             entryIndex = 0;
             return false;
         }
+
+        public void Dispose()
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                JitUnwindWindows.RemoveFunctionTableHandler(_jitRegions[0].Pointer);
+            }
+
+            foreach (ReservedRegion jitRegion in _jitRegions)
+            {
+                jitRegion.Dispose();
+            }
+        }
     }
 }

src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -2,6 +2,8 @@
 
 using ARMeilleure.CodeGen.Unwinding;
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
@@ -26,6 +28,29 @@ namespace ARMeilleure.Translation.Cache
             public byte FrameRegister;
             public unsafe fixed ushort UnwindCodes[MaxUnwindCodesArraySize];
         }
+        
+        private unsafe struct InternalFunctionHandler
+        {
+            public InternalFunctionHandler(JitCache jitCache, nint workBufferPtr)
+            {
+                _jitCache = jitCache;
+                
+                _runtimeFunction = (RuntimeFunction*)workBufferPtr;
+
+                _unwindInfo = (UnwindInfo*)(workBufferPtr + _sizeOfRuntimeFunction);
+            }
+
+            readonly JitCache _jitCache;
+
+            readonly RuntimeFunction* _runtimeFunction;
+
+            readonly UnwindInfo* _unwindInfo;
+            
+            public RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
+            {
+                return JitUnwindWindows.FunctionTableHandler(_jitCache, _runtimeFunction, _unwindInfo,  controlPc,  context);
+            }
+        }
 
         private enum UnwindOp
         {
@@ -59,27 +84,28 @@ namespace ARMeilleure.Translation.Cache
 
         private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;
 
-        private static int _sizeOfRuntimeFunction;
+        private static readonly int _sizeOfRuntimeFunction;
+        
+        private static readonly ConcurrentDictionary<ulong, InternalFunctionHandler> _functionTableHandlers = new();
 
-        private unsafe static RuntimeFunction* _runtimeFunction;
+        static JitUnwindWindows()
+        {
+            _sizeOfRuntimeFunction = Marshal.SizeOf<RuntimeFunction>();
+        }
 
-        private unsafe static UnwindInfo* _unwindInfo;
-
-        public static void InstallFunctionTableHandler(nint codeCachePointer, uint codeCacheLength, nint workBufferPtr)
+        public static void InstallFunctionTableHandler(JitCache jitCache, nint codeCachePointer, uint codeCacheLength, nint workBufferPtr)
         {
             ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
 
-            _sizeOfRuntimeFunction = Marshal.SizeOf<RuntimeFunction>();
-
             bool result;
 
+            InternalFunctionHandler handler;
+
             unsafe
             {
-                _runtimeFunction = (RuntimeFunction*)workBufferPtr;
+                handler =  new InternalFunctionHandler(jitCache, workBufferPtr);
 
-                _unwindInfo = (UnwindInfo*)(workBufferPtr + _sizeOfRuntimeFunction);
-
-                _getRuntimeFunctionCallback = new GetRuntimeFunctionCallback(FunctionTableHandler);
+                _getRuntimeFunctionCallback = handler.FunctionTableHandler;
 
                 result = RtlInstallFunctionTableCallback(
                     codeCachePtr | 3,
@@ -94,6 +120,8 @@ namespace ARMeilleure.Translation.Cache
             {
                 throw new InvalidOperationException("Failure installing function table callback.");
             }
+
+            _functionTableHandlers.TryAdd(codeCachePtr, handler);
         }
 
         public static void RemoveFunctionTableHandler(nint codeCachePointer)
@@ -111,24 +139,26 @@ namespace ARMeilleure.Translation.Cache
             {
                 throw new InvalidOperationException("Failure removing function table callback.");
             }
+            
+            _functionTableHandlers.Remove(codeCachePtr, out _);
         }
 
-        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
+        private static unsafe RuntimeFunction* FunctionTableHandler(JitCache jitCache, RuntimeFunction* runtimeFunction, UnwindInfo* unwindInfo, ulong controlPc, nint context)
         {
             int offset = (int)((long)controlPc - context.ToInt64());
 
-            if (!JitCache.TryFind(offset, out CacheEntry funcEntry, out _))
+            if (!jitCache.TryFind(offset, out CacheEntry funcEntry, out _))
             {
                 return null; // Not found.
             }
 
-            CodeGen.Unwinding.UnwindInfo unwindInfo = funcEntry.UnwindInfo;
+            CodeGen.Unwinding.UnwindInfo funcUnwindInfo = funcEntry.UnwindInfo;
 
             int codeIndex = 0;
 
-            for (int index = unwindInfo.PushEntries.Length - 1; index >= 0; index--)
+            for (int index = funcUnwindInfo.PushEntries.Length - 1; index >= 0; index--)
             {
-                UnwindPushEntry entry = unwindInfo.PushEntries[index];
+                UnwindPushEntry entry = funcUnwindInfo.PushEntries[index];
 
                 switch (entry.PseudoOp)
                 {
@@ -140,14 +170,14 @@ namespace ARMeilleure.Translation.Cache
 
                             if (stackOffset <= 0xFFFF0)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128, entry.PrologOffset, entry.RegIndex);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset / 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128, entry.PrologOffset, entry.RegIndex);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset / 16);
                             }
                             else
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128Far, entry.PrologOffset, entry.RegIndex);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128Far, entry.PrologOffset, entry.RegIndex);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 16);
                             }
 
                             break;
@@ -161,18 +191,18 @@ namespace ARMeilleure.Translation.Cache
 
                             if (allocSize <= 128)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocSmall, entry.PrologOffset, (allocSize / 8) - 1);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocSmall, entry.PrologOffset, (allocSize / 8) - 1);
                             }
                             else if (allocSize <= 0x7FFF8)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize / 8);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize / 8);
                             }
                             else
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 1);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 1);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 16);
                             }
 
                             break;
@@ -180,7 +210,7 @@ namespace ARMeilleure.Translation.Cache
 
                     case UnwindPseudoOp.PushReg:
                         {
-                            _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.PushNonvol, entry.PrologOffset, entry.RegIndex);
+                            unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.PushNonvol, entry.PrologOffset, entry.RegIndex);
 
                             break;
                         }
@@ -192,16 +222,16 @@ namespace ARMeilleure.Translation.Cache
 
             Debug.Assert(codeIndex <= MaxUnwindCodesArraySize);
 
-            _unwindInfo->VersionAndFlags = 1; // Flags: The function has no handler.
-            _unwindInfo->SizeOfProlog = (byte)unwindInfo.PrologSize;
-            _unwindInfo->CountOfUnwindCodes = (byte)codeIndex;
-            _unwindInfo->FrameRegister = 0;
+            unwindInfo->VersionAndFlags = 1; // Flags: The function has no handler.
+            unwindInfo->SizeOfProlog = (byte)funcUnwindInfo.PrologSize;
+            unwindInfo->CountOfUnwindCodes = (byte)codeIndex;
+            unwindInfo->FrameRegister = 0;
 
-            _runtimeFunction->BeginAddress = (uint)funcEntry.Offset;
-            _runtimeFunction->EndAddress = (uint)(funcEntry.Offset + funcEntry.Size);
-            _runtimeFunction->UnwindData = (uint)_sizeOfRuntimeFunction;
+            runtimeFunction->BeginAddress = (uint)funcEntry.Offset;
+            runtimeFunction->EndAddress = (uint)(funcEntry.Offset + funcEntry.Size);
+            runtimeFunction->UnwindData = (uint)_sizeOfRuntimeFunction;
 
-            return _runtimeFunction;
+            return runtimeFunction;
         }
 
         private static ushort PackUnwindOp(UnwindOp op, int prologOffset, int opInfo)

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -4,6 +4,7 @@ using ARMeilleure.CodeGen.Unwinding;
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.State;
+using ARMeilleure.Translation.Cache;
 using Humanizer;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -33,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 = 7010; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7020; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
@@ -50,6 +51,8 @@ namespace ARMeilleure.Translation.PTC
         private const CompressionLevel SaveCompressionLevel = CompressionLevel.Fastest;
 
         public PtcProfiler Profiler { get; }
+        
+        private readonly JitCache _jitCache;
 
         // Carriers.
         private MemoryStream _infosStream;
@@ -81,7 +84,7 @@ namespace ARMeilleure.Translation.PTC
         private volatile int _translateTotalCount;
         public event Action<PtcLoadingState, int, int> PtcStateChanged;
 
-        public Ptc()
+        public Ptc(JitCache jitCache)
         {
             Profiler = new PtcProfiler(this);
 
@@ -92,6 +95,8 @@ namespace ARMeilleure.Translation.PTC
 
             _waitEvent = new ManualResetEvent(true);
 
+            _jitCache = jitCache;
+
             _disposed = false;
 
             TitleIdText = TitleIdTextDefault;
@@ -782,7 +787,7 @@ namespace ARMeilleure.Translation.PTC
             return new UnwindInfo(pushEntries, prologueSize);
         }
 
-        private static TranslatedFunction FastTranslate(
+        private TranslatedFunction FastTranslate(
             byte[] code,
             Counter<uint> callCounter,
             ulong guestSize,
@@ -790,7 +795,7 @@ namespace ARMeilleure.Translation.PTC
             bool highCq)
         {
             CompiledFunction cFunc = new(code, unwindInfo, RelocInfo.Empty);
-            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
+            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(_jitCache, out nint gFuncPointer);
 
             return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
         }

src/ARMeilleure/Translation/Translator.cs

@@ -24,10 +24,11 @@ namespace ARMeilleure.Translation
         private readonly IJitMemoryAllocator _allocator;
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
 
+        public readonly JitCache JitCache;
         private readonly Ptc _ptc;
 
         internal TranslatorCache<TranslatedFunction> Functions { get; }
-        internal IAddressTable<ulong> FunctionTable { get; }
+        public IAddressTable<ulong> FunctionTable { get; }
         internal EntryTable<uint> CountTable { get; }
         internal TranslatorStubs Stubs { get; }
         internal TranslatorQueue Queue { get; }
@@ -43,16 +44,19 @@ namespace ARMeilleure.Translation
 
             _oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>>();
 
-            _ptc = new Ptc();
+            JitCache = new JitCache(allocator);
+            
+            _ptc = new Ptc(JitCache);
 
             Queue = new TranslatorQueue();
 
-            JitCache.Initialize(allocator);
 
             CountTable = new EntryTable<uint>();
             Functions = new TranslatorCache<TranslatedFunction>();
+            
             FunctionTable = functionTable;
-            Stubs = new TranslatorStubs(FunctionTable);
+            
+            Stubs = new TranslatorStubs(JitCache, FunctionTable);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
         }
@@ -167,6 +171,7 @@ namespace ARMeilleure.Translation
                 }
 
                 ClearJitCache();
+                JitCache.Dispose();
 
                 Stubs.Dispose();
                 FunctionTable.Dispose();
@@ -305,7 +310,7 @@ namespace ARMeilleure.Translation
                 _ptc.WriteCompiledFunction(address, funcSize, hash, highCq, compiledFunc);
             }
 
-            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(out nint funcPointer);
+            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(JitCache, out nint funcPointer);
 
             Allocators.ResetAll();
 

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -14,6 +14,8 @@ namespace ARMeilleure.Translation
     /// </summary>
     class TranslatorStubs : IDisposable
     {
+        private readonly JitCache _jitCache;
+        
         private readonly Lazy<nint> _slowDispatchStub;
 
         private bool _disposed;
@@ -83,11 +85,14 @@ namespace ARMeilleure.Translation
         /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
         /// <see cref="Translator"/> instance.
         /// </summary>
+        /// <param name="jitCache">Jit cache to map functions in</param>
         /// <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(JitCache jitCache, IAddressTable<ulong> functionTable)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
+            
+            _jitCache = jitCache;
 
             _functionTable = functionTable;
             _slowDispatchStub = new(GenerateSlowDispatchStub, isThreadSafe: true);
@@ -115,12 +120,12 @@ namespace ARMeilleure.Translation
             {
                 if (_dispatchStub.IsValueCreated)
                 {
-                    JitCache.Unmap(_dispatchStub.Value);
+                    _jitCache.Unmap(_dispatchStub.Value);
                 }
 
                 if (_dispatchLoop.IsValueCreated)
                 {
-                    JitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
+                    _jitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
                 }
 
                 _disposed = true;
@@ -188,7 +193,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64];
 
-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>(_jitCache);
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -213,7 +218,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64];
 
-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>(_jitCache);
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -290,7 +295,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.None;
             OperandType[] argTypes = [OperandType.I64, OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>();
+            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>(_jitCache);
         }
 
         /// <summary>
@@ -314,7 +319,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64, OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>();
+            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>(_jitCache);
         }
     }
 }

src/ARMeilleure/Translation/TranslatorTestMethods.cs

@@ -1,6 +1,7 @@
 using ARMeilleure.CodeGen.X86;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
+using ARMeilleure.Translation.Cache;
 using System;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
@@ -59,7 +60,7 @@ namespace ARMeilleure.Translation
             return context.VectorExtract(OperandType.I32, vec, 0);
         }
 
-        public static FpFlagsPInvokeTest GenerateFpFlagsPInvokeTest()
+        public static FpFlagsPInvokeTest GenerateFpFlagsPInvokeTest(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -141,7 +142,7 @@ namespace ARMeilleure.Translation
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<FpFlagsPInvokeTest>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<FpFlagsPInvokeTest>(jitCache);
         }
     }
 }

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -128,7 +128,7 @@ namespace Ryujinx.BuildValidationTasks
 
                 using (StreamWriter sw = new(path))
                 {
-                    sw.Write(jsonString);
+                    sw.Write($"{jsonString}\n");
                 }
             }
 

src/Ryujinx.Common/Logging/Logger.cs

@@ -162,6 +162,7 @@ namespace Ryujinx.Common.Logging
         {
             if (_logTargets.Any(t => t.Name == target.Name))
             {
+                target.Dispose();
                 return;
             }
 

src/Ryujinx.Common/TitleIDs.cs

@@ -17,6 +17,7 @@ namespace Ryujinx.Common
                           //Dragon Quest Franchise
             "010008900705c000", // Dragon Quest Builders
             "010042000a986000", // Dragon Quest Builders 2
+            "010021701c45e000", // Dragon Quest VII Reimagined Demo
             
                           //Fire Emblem Franchise
             "0100a6301214e000", // Fire Emblem Engage
@@ -33,7 +34,6 @@ namespace Ryujinx.Common
             "01007e3006dda000", // Kirby Star Allies
             "01003fb00c5a8000", // Super Kirby Clash
             
-            
                           //The Zelda Franchise
             "01000b900d8b0000", // Cadence of Hyrule
             "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
@@ -43,8 +43,7 @@ namespace Ryujinx.Common
             "01002da013484000", // The Legend of Zelda: Skyward Sword HD
             "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
             "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
-            
-
+                
                           //Luigi Franchise
             "010048701995e000", // Luigi's Mansion 2 HD
             "0100dca0064a6000", // Luigi's Mansion 3
@@ -75,16 +74,13 @@ namespace Ryujinx.Common
             "010049900f546002", // Super Mario 3D All-Stars | Super Mario Sunshine
             "010049900f546003", // Super Mario 3D All-Stars | Super Mario Galaxy
             "010028600ebda000", // Super Mario 3D World + Bowser's Fury
-            "010049900F546001", // Super Mario 64
             "0100ea80032ea000", // Super Mario Bros. U Deluxe
             "010015100b514000", // Super Mario Bros. Wonder
-            "010049900F546003", // Super Mario Galaxy
             "01009b90006dc000", // Super Mario Maker 2
             "0100000000010000", // SUPER MARIO ODYSSEY
             "010036b0034e4000", // Super Mario Party
             "0100965017338000", // Super Mario Party Jamboree
             "0100bc0018138000", // Super Mario RPG
-            "010049900F546002", // Super Mario Sunshine
             "0100a3900c3e2000", // Paper Mario: The Origami King
             "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
             "01009cC022b96000", // Super Mario Galaxy
@@ -149,6 +145,7 @@ namespace Ryujinx.Common
             "010067b017588000", // Endless Ocean Luminous
             "01003da010e8a000", // Miitopia
             "01006b5012b32000", // Part Time UFO
+            "0100107027310000", // Rhythm Heave Groove: Starter Demo
             "0100704000B3A000", // Snipperclips
             "01006a800016e000", // Super Smash Bros. Ultimate
             "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore
@@ -176,7 +173,7 @@ namespace Ryujinx.Common
             "01004ad014bf0000", // Sonic Frontiers
             "01009aa000faa000", // Sonic Mania
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
-            "01005ea01c0fc001", // ^
+            "01005ea01c0fc001", // ^ TODO: (Needs to be differentiated like 3D All Stars)
             "01006e001823c000", // Sonic Racing: CrossWorlds
             "010064b0242be000", // Sonic Racing: CrossWorlds - Demo
 
@@ -199,6 +196,7 @@ namespace Ryujinx.Common
             "0100744001588000", // Cars 3: Driven to Win
             "0100b41013c82000", // Cruis'n Blast
             "010085900337e000", // Death Squared
+            "0100a0d022a68000", // DELTARUNE
             "01001b300b9be000", // Diablo III: Eternal Collection
             "010027400cdc6000", // Divinity Original 2 - Definitive Edition
             "01008c8012920000", // Dying Light Platinum Edition
@@ -211,6 +209,8 @@ namespace Ryujinx.Common
             "010013c00e930000", // Hollow Knight: Silksong
             "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
+            "0100653026dde000", // MARVEL Cosmic Invasion Demo
+            "0100419014456000", // Mary Skelter Finale
             "0100d71004694000", // Minecraft
             "01007430037f6000", // Monopoly
             "0100853015e86000", // No Man's Sky
@@ -231,6 +231,8 @@ namespace Ryujinx.Common
             "01008d100d43e000", // Saints Row IV
             "0100de600beee000", // Saints Row: The Third - The Full Package
             "01001180021fa000", // Shovel Knight: Specter of Torment
+            "0100ccc0002e6000", // Skylanders Imaginators (US)
+            "010048d000bfc000", // Skylanders Imaginators (EU)
             "010079f00671c000", // Sparkle 2: Evo
             "010077b00e046000", // Spyro: Reignited Trilogy
             "0100e1D01eb2e000", // Squeakross: Home Squeak Home

src/Ryujinx.Cpu/AddressTable.cs

@@ -1,15 +1,9 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
-using Ryujinx.Cpu.Signal;
-using Ryujinx.Memory;
+using ARMeilleure.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Threading;
-using static Ryujinx.Cpu.MemoryEhMeilleure;
 
-namespace ARMeilleure.Common
+namespace Ryujinx.Cpu
 {
     /// <summary>
     /// Represents a table of guest address to a value.
@@ -17,84 +11,12 @@ namespace ARMeilleure.Common
     /// <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 nint Address;
-
-            public AddressTablePage(bool isSparse, nint 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<nint> ensureMapped, PageInitDelegate pageInit)
-            {
-                SparseMemoryBlock block = new(size, pageInit, null);
-
-                _trackingEvent = (address, size, write) =>
-                {
-                    ulong pointer = (ulong)block.Block.Pointer + address;
-                    ensureMapped((nint)pointer);
-                    return pointer;
-                };
-
-                bool added = NativeSignalHandler.AddTrackedRegion(
-                    (nuint)block.Block.Pointer,
-                    (nuint)(block.Block.Pointer + (nint)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 List<nint> _pages;
 
-        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 AddressTableType TableType => AddressTableType.Default;
 
         /// <inheritdoc/>
         public ulong Mask { get; }
@@ -103,17 +25,7 @@ namespace ARMeilleure.Common
         public AddressTableLevel[] Levels { get; }
 
         /// <inheritdoc/>
-        public TEntry Fill
-        {
-            get
-            {
-                return _fill;
-            }
-            set
-            {
-                UpdateFill(value);
-            }
-        }
+        public TEntry Fill { get; set; }
 
         /// <inheritdoc/>
         public nint Base
@@ -131,17 +43,16 @@ namespace ARMeilleure.Common
 
         /// <summary>
         /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
-        /// <see cref="Level"/>.
+        /// <see cref="AddressTableLevel"/>.
         /// </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)
+        public AddressTable(AddressTableLevel[] levels)
         {
             ArgumentNullException.ThrowIfNull(levels);
 
-            _pages = new List<AddressTablePage>(capacity: 16);
+            _pages = new List<nint>(capacity: 16);
 
             Levels = levels;
             Mask = 0;
@@ -150,25 +61,6 @@ namespace ARMeilleure.Common
             {
                 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 = [];
-                _sparseLock = new ReaderWriterLockSlim();
-
-                _sparseBlockSize = bottomLevelSize;
-            }
         }
 
         /// <summary>
@@ -176,29 +68,10 @@ namespace ARMeilleure.Common
         /// 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)
+        public static AddressTable<TEntry> CreateForArm(bool for64Bits)
         {
-            // Assume software memory means that we don't want to use any signal handlers.
-            bool sparse = type is not MemoryManagerType.SoftwareMmu and not 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;
+            return new AddressTable<TEntry>(AddressTablePresets.GetArmPreset(for64Bits, false));
         }
 
         /// <summary>
@@ -206,17 +79,7 @@ namespace ARMeilleure.Common
         /// </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));
-        }
+        public void SignalCodeRange(ulong address, ulong size) { }
 
         /// <inheritdoc/>
         public bool IsValid(ulong address)
@@ -240,8 +103,6 @@ namespace ARMeilleure.Common
 
                 long index = Levels[^1].GetValue(address);
 
-                EnsureMapped((nint)(page + index));
-
                 return ref page[index];
             }
         }
@@ -258,19 +119,19 @@ namespace ARMeilleure.Common
             for (int i = 0; i < Levels.Length - 1; i++)
             {
                 ref AddressTableLevel level = ref Levels[i];
-                ref TEntry* nextPage = ref page[level.GetValue(address)];
+                ref TEntry* nextPage = ref page![level.GetValue(address)];
 
-                if (nextPage == null || nextPage == _fillBottomLevelPtr)
+                if (nextPage == null)
                 {
                     ref AddressTableLevel nextLevel = ref Levels[i + 1];
 
                     if (i == Levels.Length - 2)
                     {
-                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, Fill, leaf: true);
+                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, Fill);
                     }
                     else
                     {
-                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, GetFillValue(i), leaf: false);
+                        nextPage = (TEntry*)Allocate(1 << nextLevel.Length, nint.Zero);
                     }
                 }
 
@@ -280,57 +141,6 @@ namespace ARMeilleure.Common
             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(nint 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 + (nint)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 nint GetFillValue(int level)
-        {
-            if (_fillBottomLevel != null && level == Levels.Length - 2)
-            {
-                return (nint)_fillBottomLevelPtr;
-            }
-            else
-            {
-                return nint.Zero;
-            }
-        }
-
         /// <summary>
         /// Lazily initialize and get the root page of the <see cref="AddressTable{TEntry}"/>.
         /// </summary>
@@ -340,91 +150,35 @@ namespace ARMeilleure.Common
             if (_table == null)
             {
                 if (Levels.Length == 1)
-                    _table = (TEntry**)Allocate(1 << Levels[0].Length, Fill, leaf: true);
+                    _table = (TEntry**)Allocate(1 << Levels[0].Length, Fill);
                 else
-                    _table = (TEntry**)Allocate(1 << Levels[0].Length, GetFillValue(0), leaf: false);
+                    _table = (TEntry**)Allocate(1 << Levels[0].Length, nint.Zero);
             }
 
             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()
-        {
-            TableSparseBlock block = new(_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 nint Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
+        private nint Allocate<T>(int length, T fill) where T : unmanaged
         {
             int size = sizeof(T) * length;
 
-            AddressTablePage page;
+            nint address = (nint)NativeAllocator.Instance.Allocate((uint)size);
 
-            if (Sparse && leaf)
-            {
-                _sparseLock.EnterWriteLock();
+            Span<T> span = new((void*)address, length);
+            span.Fill(fill);
 
-                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 + (nint)_sparseReservedOffset);
-
-                _sparseReservedOffset += (ulong)size;
-
-                _sparseLock.ExitWriteLock();
-            }
-            else
-            {
-                nint address = (nint)NativeAllocator.Instance.Allocate((uint)size);
-                page = new AddressTablePage(false, address);
-
-                Span<T> span = new((void*)page.Address, length);
-                span.Fill(fill);
-            }
-
-            _pages.Add(page);
+            _pages.Add(address);
 
             //TranslatorEventSource.Log.AddressTableAllocated(size, leaf);
 
-            return page.Address;
+            return address;
         }
 
         /// <summary>
@@ -443,32 +197,17 @@ namespace ARMeilleure.Common
         /// <param name="disposing"><see langword="true"/> to dispose managed resources also; otherwise just unmanaged resouces</param>
         protected virtual void Dispose(bool disposing)
         {
-            if (!_disposed)
+            if (_disposed)
             {
-                foreach (AddressTablePage 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;
+                return;
             }
+
+            foreach (nint page in _pages)
+            {
+                Marshal.FreeHGlobal(page);
+            }
+
+            _disposed = true;
         }
 
         /// <summary>

src/Ryujinx.Cpu/Jit/JitCpuContext.cs

@@ -9,13 +9,15 @@ 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);
+            
+            bool sparse = memory.Type is not MemoryManagerType.SoftwareMmu and not MemoryManagerType.SoftwarePageTable;
+            IAddressTable<ulong> functionTable = sparse ? SparseAddressTable<ulong>.CreateForArm(for64Bit) : AddressTable<ulong>.CreateForArm(for64Bit);
+            
+            _translator = new Translator(new JitMemoryAllocator(forJit: true), memory, functionTable);
 
             if (memory.Type.IsHostMappedOrTracked)
             {
@@ -57,7 +59,7 @@ namespace Ryujinx.Cpu.Jit
         /// <inheritdoc/>
         public void PrepareCodeRange(ulong address, ulong size)
         {
-            _functionTable.SignalCodeRange(address, size);
+            _translator.FunctionTable.SignalCodeRange(address, size);
             _translator.PrepareCodeRange(address, size);
         }
 

src/Ryujinx.Cpu/LightningJit/AarchCompiler.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.Cpu.LightningJit
             CpuPreset cpuPreset,
             IMemoryManager memoryManager,
             ulong address,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint dispatchStubPtr,
             ExecutionMode executionMode,
             Architecture targetArch)

src/Ryujinx.Cpu/LightningJit/Arm32/A32Compiler.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32
             CpuPreset cpuPreset,
             IMemoryManager memoryManager,
             ulong address,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint dispatchStubPtr,
             bool isThumb,
             Architecture targetArch)

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

@@ -22,7 +22,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             public readonly RegisterAllocator RegisterAllocator;
             public readonly MemoryManagerType MemoryManagerType;
             public readonly TailMerger TailMerger;
-            public readonly AddressTable<ulong> FuncTable;
+            public readonly IAddressTable<ulong> FuncTable;
             public readonly nint DispatchStubPointer;
 
             private readonly RegisterSaveRestore _registerSaveRestore;
@@ -33,7 +33,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
                 RegisterAllocator registerAllocator,
                 MemoryManagerType mmType,
                 TailMerger tailMerger,
-                AddressTable<ulong> funcTable,
+                IAddressTable<ulong> funcTable,
                 RegisterSaveRestore registerSaveRestore,
                 nint dispatchStubPointer,
                 nint pageTablePointer)
@@ -225,7 +225,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             }
         }
 
-        public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, AddressTable<ulong> funcTable, nint dispatchStubPtr, bool isThumb)
+        public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, IAddressTable<ulong> funcTable, nint dispatchStubPtr, bool isThumb)
         {
             MultiBlock multiBlock = Decoder<InstEmit>.DecodeMulti(cpuPreset, memoryManager, address, isThumb);
 

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

@@ -3,6 +3,7 @@ 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;
 
@@ -132,7 +133,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             RegisterAllocator regAlloc,
             TailMerger tailMerger,
             Action writeEpilogue,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint funcPtr,
             int spillBaseOffset,
             uint nextAddress,
@@ -143,7 +144,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             int tempGuestAddress = -1;
 
             bool inlineLookup = guestAddress.Kind != OperandKind.Constant &&
-                                funcTable is { Sparse: true };
+                                funcTable.TableType == AddressTableType.Sparse;
 
             if (guestAddress.Kind == OperandKind.Constant)
             {
@@ -189,7 +190,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -203,18 +204,15 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                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));
+                AddressTableLevel level = funcTable.Levels.Last();
+                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/A64Compiler.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64
             CpuPreset cpuPreset,
             IMemoryManager memoryManager,
             ulong address,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint dispatchStubPtr,
             Architecture targetArch)
         {

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

@@ -18,7 +18,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             public readonly CodeWriter Writer;
             public readonly RegisterAllocator RegisterAllocator;
             public readonly TailMerger TailMerger;
-            public readonly AddressTable<ulong> FuncTable;
+            public readonly IAddressTable<ulong> FuncTable;
             public readonly nint DispatchStubPointer;
 
             private readonly MultiBlock _multiBlock;
@@ -31,7 +31,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
                 TailMerger tailMerger,
                 RegisterSaveRestore registerSaveRestore,
                 MultiBlock multiBlock,
-                AddressTable<ulong> funcTable,
+                IAddressTable<ulong> funcTable,
                 nint dispatchStubPointer,
                 nint pageTablePointer)
             {
@@ -303,7 +303,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             }
         }
 
-        public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, AddressTable<ulong> funcTable, nint dispatchStubPtr)
+        public static CompiledFunction Compile(CpuPreset cpuPreset, IMemoryManager memoryManager, ulong address, IAddressTable<ulong> funcTable, nint dispatchStubPtr)
         {
             MultiBlock multiBlock = Decoder.DecodeMulti(cpuPreset, memoryManager, address);
 

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

@@ -3,6 +3,7 @@ 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;
@@ -214,7 +215,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             RegisterAllocator regAlloc,
             TailMerger tailMerger,
             Action writeEpilogue,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint dispatchStubPtr,
             InstName name,
             ulong pc,
@@ -298,7 +299,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             RegisterAllocator regAlloc,
             TailMerger tailMerger,
             Action writeEpilogue,
-            AddressTable<ulong> funcTable,
+            IAddressTable<ulong> funcTable,
             nint funcPtr,
             int spillBaseOffset,
             ulong pc,
@@ -309,7 +310,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             int tempGuestAddress = -1;
 
             bool inlineLookup = guestAddress.Kind != OperandKind.Constant &&
-                                funcTable is { Sparse: true };
+                                funcTable.TableType == AddressTableType.Sparse;
 
             if (guestAddress.Kind == OperandKind.Constant)
             {
@@ -355,7 +356,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -369,18 +370,15 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                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));
+                AddressTableLevel level = funcTable.Levels.Last();
+                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/CacheMemoryAllocator.cs

@@ -23,12 +23,31 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 return Offset.CompareTo(other.Offset);
             }
         }
+        
+        private readonly int _regionSize;
+        private int _regionCount;
 
         private readonly List<MemoryBlock> _blocks = [];
 
-        public CacheMemoryAllocator(int capacity)
+        public CacheMemoryAllocator(int regionSize, int initialRegionCount = 1)
         {
-            _blocks.Add(new MemoryBlock(0, capacity));
+            _regionCount = 0;
+            _regionSize = regionSize;
+            
+            for (; initialRegionCount > 0; initialRegionCount--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
+        }
+        
+        public void AddNewBlocks(int count)
+        {
+            for (; count > 0; count--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
         }
 
         public int Allocate(int size)
@@ -100,13 +119,14 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             {
                 index = ~index;
             }
+            
+            int endOffs = block.Offset + block.Size;
 
-            if (index < _blocks.Count)
+            // Don't merge blocks from different allocations
+            if (index < _blocks.Count && endOffs % _regionSize != 0)
             {
                 MemoryBlock next = _blocks[index];
 
-                int endOffs = block.Offset + block.Size;
-
                 if (next.Offset == endOffs)
                 {
                     block = new MemoryBlock(block.Offset, block.Size + next.Size);
@@ -114,7 +134,8 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 }
             }
 
-            if (index > 0)
+            // Don't merge blocks from different allocations
+            if (index > 0 && block.Offset % _regionSize != 0)
             {
                 MemoryBlock prev = _blocks[index - 1];
 

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

@@ -11,76 +11,45 @@ using System.Threading;
 
 namespace Ryujinx.Cpu.LightningJit.Cache
 {
-    static partial class JitCache
+    partial class JitCache : IDisposable
     {
         private static readonly int _pageSize = (int)MemoryBlock.GetPageSize();
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        // TODO: JIT Cache size should be application dependent, not global.
-        private const int CacheSize = 1024 * (1024 * 1024); // Megabytes * Size of Megabytes (since its in bytes).
+        private const uint CacheSize = 256 * 1024 * 1024; // Megabytes * Size of Megabytes (since its in bytes).
 
-        private static JitCacheInvalidation _jitCacheInvalidator;
+        private readonly JitCacheInvalidation _jitCacheInvalidator;
 
-        private static CacheMemoryAllocator _cacheAllocator;
+        private readonly  CacheMemoryAllocator _cacheAllocator;
 
-        private static readonly List<CacheEntry> _cacheEntries = [];
+        private readonly List<CacheEntry> _cacheEntries = [];
 
-        private static readonly Lock _lock = new();
-        private static bool _initialized;
-        private static readonly List<ReservedRegion> _jitRegions = [];
-        private static int _activeRegionIndex = 0;
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
+        private readonly Lock _lock = new();
         
-        [SupportedOSPlatform("macos")]
-        [LibraryImport("libSystem.dylib", EntryPoint = "sys_icache_invalidate")]
-        internal static partial void SysICacheInvalidate(nint start, nuint len);
+        private readonly List<ReservedRegion> _jitRegions = [];
 
-        [SupportedOSPlatform("linux")]
-        [LibraryImport("libgcc_s.so.1", EntryPoint = "__clear_cache")]
-        internal static partial void ClearCache(nint begin, nint end);
-
-        public static void Initialize(IJitMemoryAllocator allocator)
+        public JitCache(IJitMemoryAllocator allocator)
         {
-            if (_initialized)
-            {
-                return;
-            }
-
             lock (_lock)
             {
-                if (_initialized)
-                {
-                    return;
-                }
-
-                ReservedRegion firstRegion = new(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-                _activeRegionIndex = 0;
-
+                _jitRegions.Add(new(allocator, CacheSize));
+                
+                _cacheAllocator = new CacheMemoryAllocator((int)CacheSize);
+                
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
                     _jitCacheInvalidator = new JitCacheInvalidation(allocator);
                 }
-
-                _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-                _initialized = true;
             }
         }
 
-        public unsafe static nint Map(ReadOnlySpan<byte> code)
+        public nint Map(ReadOnlySpan<byte> code)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = GetFunctionPtr(funcOffset);
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -94,9 +63,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
                     Marshal.Copy(code.ToArray(), 0, funcPtr, code.Length);
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
                     _jitCacheInvalidator?.Invalidate(funcPtr, (ulong)code.Length);
                 }
@@ -107,21 +76,20 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             }
         }
 
-        public static void Unmap(nint pointer)
+        public void Unmap(nint pointer)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
-                foreach (ReservedRegion region in _jitRegions)
+                for (int i = 0; i < _jitRegions.Count; i++)
                 {
+                    ReservedRegion region = _jitRegions[i];
                     if (pointer.ToInt64() < region.Pointer.ToInt64() ||
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                        pointer.ToInt64() >= (region.Pointer + (nint)CacheSize).ToInt64())
                     {
                         continue;
                     }
 
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
+                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64() + i * CacheSize);
 
                     if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                     {
@@ -134,59 +102,67 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static int Allocate(int codeSize)
+        private int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
+            
+            int allocOffset = _cacheAllocator.Allocate(codeSize); 
 
-            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
+            if (allocOffset >= 0)
             {
-                int allocOffset = _cacheAllocator.Allocate(codeSize);
-
-                if (allocOffset >= 0)
-                {
-                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                    _activeRegionIndex = i;
-                    return allocOffset;
-                }
+                GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+                return allocOffset;
             }
-
-            int exhaustedRegion = _activeRegionIndex;
+            
+            _cacheAllocator.AddNewBlocks(1);
             ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
+            
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache of size {(_jitRegions.Count * CacheSize).Bytes()} exhausted, creating new Cache Region ({((_jitRegions.Count + 1) * CacheSize).Bytes()} Total Allocation).");
+
             _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
 
-            int newRegionNumber = _activeRegionIndex;
-
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
-
-            _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
-            if (allocOffsetNew < 0)
+            allocOffset = _cacheAllocator.Allocate(codeSize);
+            if (allocOffset < 0)
             {
                 throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
             }
 
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
+            GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+            return allocOffset;
+        }
+        
+        private nint GetFunctionPtr(int offset)
+        {
+            return GetRegion(offset).Pointer + (offset % (int)CacheSize);
+        }
+
+        private ReservedRegion GetRegion(int offset)
+        {
+            int index = offset / (int)CacheSize;
+
+            return _jitRegions[index];
         }
 
         private static int AlignCodeSize(int codeSize)
@@ -194,7 +170,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
         }
 
-        private static void Add(int offset, int size)
+        private void Add(int offset, int size)
         {
             CacheEntry entry = new(offset, size);
 
@@ -208,7 +184,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             _cacheEntries.Insert(index, entry);
         }
 
-        public static bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
+        public bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
         {
             lock (_lock)
             {
@@ -231,5 +207,13 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             entryIndex = 0;
             return false;
         }
+        
+        public void Dispose()
+        {
+            foreach (ReservedRegion jitRegion in _jitRegions)
+            {
+                jitRegion.Dispose();
+            }
+        }
     }
 }

src/Ryujinx.Cpu/LightningJit/LightningJitCpuContext.cs

@@ -9,15 +9,15 @@ 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);
+            bool sparse = memory.Type is not MemoryManagerType.SoftwareMmu and not MemoryManagerType.SoftwarePageTable;
+            IAddressTable<ulong> functionTable = sparse ? SparseAddressTable<ulong>.CreateForArm(for64Bit) : AddressTable<ulong>.CreateForArm(for64Bit);
+            
+            _translator = new Translator(memory, functionTable);
 
             memory.UnmapEvent += UnmapHandler;
         }
@@ -54,7 +54,7 @@ namespace Ryujinx.Cpu.LightningJit
         /// <inheritdoc/>
         public void PrepareCodeRange(ulong address, ulong size)
         {
-            _functionTable.SignalCodeRange(address, size);
+            _translator.FunctionTable.SignalCodeRange(address, size);
         }
 
         public void Dispose()

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -19,15 +19,16 @@ namespace Ryujinx.Cpu.LightningJit
         private static bool IsNoWxPlatform => false;
 
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
+        private readonly JitCache _jitCache;
         private readonly NoWxCache _noWxCache;
         private bool _disposed;
 
         internal TranslatorCache<TranslatedFunction> Functions { get; }
-        internal AddressTable<ulong> FunctionTable { get; }
+        internal IAddressTable<ulong> FunctionTable { get; }
         internal TranslatorStubs Stubs { get; }
         internal IMemoryManager Memory { get; }
 
-        public Translator(IMemoryManager memory, AddressTable<ulong> functionTable)
+        public Translator(IMemoryManager memory, IAddressTable<ulong> functionTable)
         {
             Memory = memory;
 
@@ -39,12 +40,13 @@ namespace Ryujinx.Cpu.LightningJit
             }
             else
             {
-                JitCache.Initialize(new JitMemoryAllocator(forJit: true));
+                _jitCache = new(new JitMemoryAllocator(forJit: true));
             }
 
             Functions = new TranslatorCache<TranslatedFunction>();
             FunctionTable = functionTable;
-            Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
+            
+            Stubs = new TranslatorStubs(_jitCache, FunctionTable, _noWxCache);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
 
@@ -100,7 +102,7 @@ namespace Ryujinx.Cpu.LightningJit
 
                 if (oldFunc != func)
                 {
-                    JitCache.Unmap(func.FuncPointer);
+                    _jitCache.Unmap(func.FuncPointer);
                     func = oldFunc;
                 }
 
@@ -121,7 +123,7 @@ namespace Ryujinx.Cpu.LightningJit
         private TranslatedFunction Translate(ulong address, ExecutionMode mode)
         {
             CompiledFunction func = Compile(address, mode);
-            nint funcPointer = JitCache.Map(func.Code);
+            nint funcPointer = _jitCache.Map(func.Code);
 
             return new TranslatedFunction(funcPointer, (ulong)func.GuestCodeLength);
         }
@@ -164,14 +166,14 @@ namespace Ryujinx.Cpu.LightningJit
 
             foreach (TranslatedFunction func in functions)
             {
-                JitCache.Unmap(func.FuncPointer);
+                _jitCache.Unmap(func.FuncPointer);
             }
 
             Functions.Clear();
 
             while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
             {
-                JitCache.Unmap(kv.Value.FuncPointer);
+                _jitCache.Unmap(kv.Value.FuncPointer);
             }
         }
 
@@ -188,6 +190,7 @@ namespace Ryujinx.Cpu.LightningJit
                     else
                     {
                         ClearJitCache();
+                        _jitCache.Dispose();
                     }
 
                     Stubs.Dispose();

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -19,6 +19,8 @@ namespace Ryujinx.Cpu.LightningJit
     {
         private delegate ulong GetFunctionAddressDelegate(nint framePointer, ulong address);
 
+        private readonly JitCache _jitCache;
+        
         private readonly Lazy<nint> _slowDispatchStub;
 
         private bool _disposed;
@@ -76,13 +78,16 @@ namespace Ryujinx.Cpu.LightningJit
         /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
         /// <see cref="Translator"/> instance.
         /// </summary>
+        /// <param name="jitCache">Jit cache to map functions in</param>
         /// <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(JitCache jitCache, IAddressTable<ulong> functionTable, NoWxCache noWxCache)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
 
+            _jitCache = jitCache;
+
             _functionTable = functionTable;
             _noWxCache = noWxCache;
             _getFunctionAddressRef = NativeInterface.GetFunctionAddress;
@@ -113,12 +118,12 @@ namespace Ryujinx.Cpu.LightningJit
                 {
                     if (_dispatchStub.IsValueCreated)
                     {
-                        JitCache.Unmap(_dispatchStub.Value);
+                        _jitCache.Unmap(_dispatchStub.Value);
                     }
 
                     if (_dispatchLoop.IsValueCreated)
                     {
-                        JitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
+                        _jitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
                     }
                 }
 
@@ -363,7 +368,7 @@ namespace Ryujinx.Cpu.LightningJit
             }
             else
             {
-                return JitCache.Map(code);
+                return _jitCache.Map(code);
             }
         }
 

src/Ryujinx.Cpu/SparseAddressTable.cs

@@ -0,0 +1,247 @@
+using ARMeilleure.Common;
+using Ryujinx.Common;
+using Ryujinx.Cpu.Signal;
+using Ryujinx.Memory;
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using static Ryujinx.Cpu.MemoryEhMeilleure;
+
+namespace Ryujinx.Cpu
+{
+    /// <summary>
+    /// Represents a table of guest address to a value.
+    /// </summary>
+    /// <typeparam name="TEntry">Type of the value</typeparam>
+    public unsafe class SparseAddressTable<TEntry> : IAddressTable<TEntry> where TEntry : unmanaged
+    {
+        /// <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<nint> ensureMapped, PageInitDelegate pageInit, MemoryBlock fill)
+            {
+                SparseMemoryBlock block = new(size, pageInit, fill);
+
+                _trackingEvent = (address, _, _) =>
+                {
+                    ulong pointer = (ulong)block.Block.Pointer + address;
+                    ensureMapped((nint)pointer);
+                    return pointer;
+                };
+
+                bool added = NativeSignalHandler.AddTrackedRegion(
+                (nuint)block.Block.Pointer,
+                (nuint)(block.Block.Pointer + (nint)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 TEntry _fill;
+
+        private readonly TableSparseBlock _block;
+        private readonly MemoryBlock _fillBlock;
+
+        /// <inheritdoc/>
+        public AddressTableType TableType => AddressTableType.Sparse;
+        
+        /// <inheritdoc/>
+        public ulong Mask { get; }
+
+        /// <inheritdoc/>
+        public AddressTableLevel[] Levels { get; }
+
+        /// <inheritdoc/>
+        public TEntry Fill
+        {
+            get
+            {
+                return _fill;
+            }
+            set
+            {
+                UpdateFill(value);
+            }
+        }
+
+        /// <inheritdoc/>
+        public nint Base
+        {
+            get
+            {
+                ObjectDisposedException.ThrowIf(_disposed, this);
+
+                return (nint)_table;
+            }
+        }
+
+        /// <summary>
+        /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
+        /// <see cref="AddressTableLevel"/>.
+        /// </summary>
+        /// <param name="levels">Levels for the address table</param>
+        /// <exception cref="ArgumentNullException"><paramref name="levels"/> is null</exception>
+        /// <exception cref="ArgumentException">Length of <paramref name="levels"/> is less than 2</exception>
+        public SparseAddressTable(AddressTableLevel[] levels)
+        {
+            ArgumentNullException.ThrowIfNull(levels);
+
+            Levels = levels;
+            Mask = 0;
+
+            foreach (AddressTableLevel level in Levels)
+            {
+                Mask |= level.Mask;
+            }
+            
+            _fillBlock = new MemoryBlock(MemoryBlock.GetPageSize() << 10, MemoryAllocationFlags.Mirrorable);
+            
+            // We need to use the full size, as some games dynamically expand the code range (e.g. SSBU)
+            // Limiting the size to only the requested code range will cause crashes
+            // This should not be an issue tho, as the SparseBlock dynamically allocates memory as needed, and
+            // Falls back to the fill block in case guest code tries to call an unmapped function.
+            ulong bottomLevelSize = (1ul << Levels.Last().Length) * (ulong)sizeof(TEntry);
+
+            _block = new TableSparseBlock(bottomLevelSize, EnsureMapped, InitLeafPage, _fillBlock);
+
+            _table = (TEntry*)_block.Block.Block.Pointer;
+        }
+
+        /// <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>
+        /// <returns>An <see cref="AddressTable{TEntry}"/> for ARM function lookup</returns>
+        public static SparseAddressTable<TEntry> CreateForArm(bool for64Bits)
+        {
+            return new SparseAddressTable<TEntry>(AddressTablePresets.GetArmPreset(for64Bits, true));
+        }
+
+        /// <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 (_fillBlock != null)
+            {
+                Span<byte> span = _fillBlock.GetSpan(0, (int)_fillBlock.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)
+        {
+
+        }
+
+        /// <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));
+            }
+
+            long index = Levels.Last().GetValue(address);
+
+            EnsureMapped((nint)(_table + index));
+
+            return ref _table[index];
+        }
+
+        /// <summary>
+        /// Ensure the given pointer is mapped in any overlapping sparse reservations.
+        /// </summary>
+        /// <param name="ptr">Pointer to be mapped</param>
+        private void EnsureMapped(nint ptr)
+        {
+            SparseMemoryBlock sparse = _block.Block;
+
+            if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (nint)sparse.Block.Size)
+            {
+                sparse.EnsureMapped((ulong)(ptr - sparse.Block.Pointer));
+            }
+        }
+
+        /// <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>
+        /// 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)
+            {
+                return;
+            }
+
+            _block.Dispose();
+            _fillBlock.Dispose();
+
+            _disposed = true;
+        }
+
+        /// <summary>
+        /// Frees resources used by the <see cref="AddressTable{TEntry}"/> instance.
+        /// </summary>
+        ~SparseAddressTable()
+        {
+            Dispose(false);
+        }
+    }
+}

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

@@ -195,11 +195,14 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         {
             // The reference table is sized so that it will never overflow, so long as the references are taken after the command is allocated.
 
-            int index = _refProducerPtr;
+            // make sure increment is thread safe
+            int index = Interlocked.Increment(ref _refProducerPtr) - 1;
+            
+            index %= _refQueue.Length;
 
             _refQueue[index] = obj;
 
-            _refProducerPtr = (_refProducerPtr + 1) % _refQueue.Length;
+            _refProducerPtr %= _refQueue.Length;
 
             return index;
         }
@@ -531,10 +534,15 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _running = false;
             _galWorkAvailable.Set();
 
-            if (_gpuThread != null && _gpuThread.IsAlive)
+            if (_gpuThread is { IsAlive: true })
             {
                 _gpuThread.Join();
             }
+            
+            if (_backendThread is { IsAlive: true })
+            {
+                _backendThread.Join();
+            }
 
             // Dispose the renderer.
             _baseRenderer.Dispose();

src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs

@@ -11,6 +11,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
         public bool IsHardwareAccelerated => false;
 
         private readonly MemoryAllocator _allocator = new();
+        private byte[] _lastSegmentMap = [];
+        private int _lastSegmentMapMiRows;
+        private int _lastSegmentMapMiCols;
 
         public ISurface CreateSurface(int width, int height)
         {
@@ -106,7 +109,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
 
             cm.AllocTileWorkerData(_allocator, tileCols, tileRows, maxThreads);
             cm.AllocContextBuffers(_allocator, output.Width, output.Height);
+
             cm.InitContextBuffers();
+            LoadSegmentMap(ref cm, ref pictureInfo);
             cm.SetupSegmentationDequant();
             cm.SetupScaleFactors();
 
@@ -153,6 +158,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
                 }
             }
 
+            SaveSegmentMap(ref cm);
             cm.GetMvs(mvsOut);
 
             cm.FreeTileWorkerData(_allocator);
@@ -161,6 +167,52 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
             return true;
         }
 
+        private void LoadSegmentMap(ref Vp9Common cm, ref Vp9PictureInfo pictureInfo)
+        {
+            int mapLength = cm.MiRows * cm.MiCols;
+            if (mapLength == 0 || cm.LastFrameSegMap.IsNull)
+            {
+                return;
+            }
+
+            bool reset =
+                pictureInfo.IsKeyFrame ||
+                pictureInfo.IntraOnly ||
+                _lastSegmentMapMiRows != cm.MiRows ||
+                _lastSegmentMapMiCols != cm.MiCols;
+
+            if (_lastSegmentMap.Length != mapLength)
+            {
+                _lastSegmentMap = new byte[mapLength];
+            }
+            else if (reset)
+            {
+                Array.Clear(_lastSegmentMap);
+            }
+
+            _lastSegmentMapMiRows = cm.MiRows;
+            _lastSegmentMapMiCols = cm.MiCols;
+            _lastSegmentMap.CopyTo(cm.LastFrameSegMap.AsSpan());
+        }
+
+        private void SaveSegmentMap(ref Vp9Common cm)
+        {
+            int mapLength = cm.MiRows * cm.MiCols;
+            if (!cm.Seg.Enabled || mapLength == 0 || cm.CurrentFrameSegMap.IsNull)
+            {
+                return;
+            }
+
+            if (_lastSegmentMap.Length != mapLength)
+            {
+                _lastSegmentMap = new byte[mapLength];
+            }
+
+            cm.CurrentFrameSegMap.AsSpan()[..mapLength].CopyTo(_lastSegmentMap);
+            _lastSegmentMapMiRows = cm.MiRows;
+            _lastSegmentMapMiCols = cm.MiCols;
+        }
+
         public void Dispose()
         {
             _allocator.Dispose();

src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs

@@ -1088,6 +1088,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types
 
         public void GetMvs(Span<Vp9MvRef> mvs)
         {
+            if (FrameIsIntraOnly())
+            {
+                mvs.Clear();
+                return;
+            }
+
             if (mvs.Length > CurFrameMvs.Length)
             {
                 throw new ArgumentException(

src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs

@@ -53,6 +53,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
                 IsKeyFrame = Flags.HasFlag(FrameFlags.IsKeyFrame),
                 IntraOnly = Flags.HasFlag(FrameFlags.IntraOnly),
                 UsePrevInFindMvRefs =
+                    !Flags.HasFlag(FrameFlags.IsKeyFrame) &&
                     !Flags.HasFlag(FrameFlags.ErrorResilientMode) &&
                     !Flags.HasFlag(FrameFlags.FrameSizeChanged) &&
                     !Flags.HasFlag(FrameFlags.IntraOnly) &&

src/Ryujinx.HLE/HOS/Services/Notification/INotificationSystemEventAccessor.cs

@@ -11,7 +11,11 @@ namespace Ryujinx.HLE.HOS.Services.Notification
 
         private readonly KEvent _getNotificationSendingNotifierEvent;
         private int _getNotificationSendingNotifierEventHandle;
-        public INotificationSystemEventAccessor(ServiceCtx context) { }
+
+        public INotificationSystemEventAccessor(ServiceCtx context)
+        {
+            _getNotificationSendingNotifierEvent = new KEvent(context.Device.System.KernelContext);
+        }
 
         [CommandCmif(0)] // 9.0.0+
         // GetNotificationSendingNotifier() -> nn::notification::server::INotificationSystemEventAccessor

src/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs

@@ -103,8 +103,12 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                 loadedCount++;
             }
 
+            // The first return value is a boolean "fonts_are_loaded" flag (u8), not a count.
+            // Some titles (e.g. newer SDK builds) validate it strictly against 1, so writing
+            // the font count here (e.g. 6) makes them reject the result and spin re-opening pl:u.
+            context.ResponseData.Write(1);
             context.ResponseData.Write(loadedCount);
-            context.ResponseData.Write((int)SharedFontType.Count);
+            // context.ResponseData.Write((int)SharedFontType.Count);
 
             return ResultCode.Success;
         }

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.Horizon/MmNv/Ipc/Request.cs

@@ -16,10 +16,9 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         public Result InitializeOld(Module module, uint fgmPriority, uint autoClearEvent)
         {
             bool isAutoClearEvent = autoClearEvent != 0;
+            uint requestId = Register(module, fgmPriority, isAutoClearEvent);
 
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, fgmPriority, isAutoClearEvent });
-
-            Register(module, fgmPriority, isAutoClearEvent);
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Initialized module={module} requestId={requestId} autoClearEvent={isAutoClearEvent}");
 
             return Result.Success;
         }
@@ -27,41 +26,48 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         [CmifCommand(1)]
         public Result FinalizeOld(Module module)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module });
-
             lock (_sessionList)
             {
-                _sessionList.Remove(GetSessionByModule(module));
+                Session session = GetSessionByModule(module);
+
+                if (session != null)
+                {
+                    _sessionList.Remove(session);
+                }
             }
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Finalized module={module}");
+
             return Result.Success;
         }
 
         [CmifCommand(2)]
-        public Result SetAndWaitOld(Module module, uint clockRateMin, int clockRateMax)
+        public Result SetAndWaitOld(Module module, uint clockRateMin, uint timeout)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, clockRateMin, clockRateMax });
+            uint actualClockRate;
 
             lock (_sessionList)
             {
-                GetSessionByModule(module)?.SetAndWait(clockRateMin, clockRateMax);
+                Session session = GetSessionByModule(module) ?? RegisterSession(module, false);
+                ApplyClockRequest(session, clockRateMin, timeout);
+                actualClockRate = GetEffectiveClockRate(module);
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"SetAndWait module={module} requested={clockRateMin} actual={actualClockRate} timeout={timeout}");
+
             return Result.Success;
         }
 
         [CmifCommand(3)]
         public Result GetOld(out uint clockRateActual, Module module)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module });
-
             lock (_sessionList)
             {
-                Session session = GetSessionByModule(module);
-
-                clockRateActual = session == null ? 0 : session.ClockRateMin;
+                clockRateActual = GetEffectiveClockRate(module);
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"Get module={module} actual={clockRateActual}");
+
             return Result.Success;
         }
 
@@ -70,51 +76,76 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         {
             bool isAutoClearEvent = autoClearEvent != 0;
 
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, fgmPriority, isAutoClearEvent });
-
             requestId = Register(module, fgmPriority, isAutoClearEvent);
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Initialized module={module} requestId={requestId} autoClearEvent={isAutoClearEvent}");
+
             return Result.Success;
         }
 
         [CmifCommand(5)]
         public Result Finalize(uint requestId)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId });
-
             lock (_sessionList)
             {
-                _sessionList.Remove(GetSessionById(requestId));
+                Session session = GetSessionById(requestId);
+
+                if (session != null)
+                {
+                    _sessionList.Remove(session);
+                }
             }
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Finalized requestId={requestId}");
+
             return Result.Success;
         }
 
         [CmifCommand(6)]
-        public Result SetAndWait(uint requestId, uint clockRateMin, int clockRateMax)
+        public Result SetAndWait(uint requestId, uint clockRateMin, uint timeout)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId, clockRateMin, clockRateMax });
+            uint actualClockRate = 0;
+            Module? module = null;
 
             lock (_sessionList)
             {
-                GetSessionById(requestId)?.SetAndWait(clockRateMin, clockRateMax);
+                Session session = GetSessionById(requestId);
+
+                if (session != null)
+                {
+                    module = session.Module;
+                    ApplyClockRequest(session, clockRateMin, timeout);
+                    actualClockRate = GetEffectiveClockRate(session.Module);
+                }
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"SetAndWait requestId={requestId} module={module?.ToString() ?? "<missing>"} requested={clockRateMin} actual={actualClockRate} timeout={timeout}");
+
             return Result.Success;
         }
 
         [CmifCommand(7)]
         public Result Get(out uint clockRateActual, uint requestId)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId });
+            Module? module = null;
 
             lock (_sessionList)
             {
                 Session session = GetSessionById(requestId);
 
-                clockRateActual = session == null ? 0 : session.ClockRateMin;
+                if (session == null)
+                {
+                    clockRateActual = 0;
+                }
+                else
+                {
+                    module = session.Module;
+                    clockRateActual = GetEffectiveClockRate(session.Module);
+                }
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"Get requestId={requestId} module={module?.ToString() ?? "<missing>"} actual={clockRateActual}");
+
             return Result.Success;
         }
 
@@ -149,12 +180,51 @@ namespace Ryujinx.Horizon.MmNv.Ipc
             lock (_sessionList)
             {
                 // Nintendo ignores the fgm priority as the other services were deprecated.
-                Session session = new(_uniqueId++, module, isAutoClearEvent);
-
-                _sessionList.Add(session);
+                Session session = RegisterSession(module, isAutoClearEvent);
 
                 return session.Id;
             }
         }
+
+        private Session RegisterSession(Module module, bool isAutoClearEvent)
+        {
+            Session session = new(_uniqueId++, module, isAutoClearEvent);
+
+            _sessionList.Add(session);
+
+            return session;
+        }
+
+        private void ApplyClockRequest(Session session, uint requestedClockRate, uint timeout)
+        {
+            if (IsClockRateSentinel(requestedClockRate))
+            {
+                session.ClearRequest(timeout);
+            }
+            else
+            {
+                session.SetAndWait(requestedClockRate, timeout);
+            }
+        }
+
+        private uint GetEffectiveClockRate(Module module)
+        {
+            uint clockRate = 0;
+
+            foreach (Session session in _sessionList)
+            {
+                if (session.Module == module && session.HasActiveRequest && session.RequestedClockRate > clockRate)
+                {
+                    clockRate = session.RequestedClockRate;
+                }
+            }
+
+            return clockRate;
+        }
+
+        private static bool IsClockRateSentinel(uint clockRate)
+        {
+            return clockRate == 0 || unchecked((int)clockRate) < 0;
+        }
     }
 }

src/Ryujinx.Horizon/Sdk/MmNv/IRequest.cs

@@ -7,11 +7,11 @@ namespace Ryujinx.Horizon.Sdk.MmNv
     {
         Result InitializeOld(Module module, uint fgmPriority, uint autoClearEvent);
         Result FinalizeOld(Module module);
-        Result SetAndWaitOld(Module module, uint clockRateMin, int clockRateMax);
+        Result SetAndWaitOld(Module module, uint clockRateMin, uint timeout);
         Result GetOld(out uint clockRateActual, Module module);
         Result Initialize(out uint requestId, Module module, uint fgmPriority, uint autoClearEvent);
         Result Finalize(uint requestId);
-        Result SetAndWait(uint requestId, uint clockRateMin, int clockRateMax);
+        Result SetAndWait(uint requestId, uint clockRateMin, uint timeout);
         Result Get(out uint clockRateActual, uint requestId);
     }
 }

src/Ryujinx.Horizon/Sdk/MmNv/Session.cs

@@ -5,22 +5,32 @@ namespace Ryujinx.Horizon.Sdk.MmNv
         public Module Module { get; }
         public uint Id { get; }
         public bool IsAutoClearEvent { get; }
-        public uint ClockRateMin { get; private set; }
-        public int ClockRateMax { get; private set; }
+        public uint RequestedClockRate { get; private set; }
+        public uint LastTimeout { get; private set; }
+        public bool HasActiveRequest { get; private set; }
 
         public Session(uint id, Module module, bool isAutoClearEvent)
         {
             Module = module;
             Id = id;
             IsAutoClearEvent = isAutoClearEvent;
-            ClockRateMin = 0;
-            ClockRateMax = -1;
+            RequestedClockRate = 0;
+            LastTimeout = uint.MaxValue;
+            HasActiveRequest = false;
         }
 
-        public void SetAndWait(uint clockRateMin, int clockRateMax)
+        public void SetAndWait(uint clockRate, uint timeout)
         {
-            ClockRateMin = clockRateMin;
-            ClockRateMax = clockRateMax;
+            RequestedClockRate = clockRate;
+            LastTimeout = timeout;
+            HasActiveRequest = true;
+        }
+
+        public void ClearRequest(uint timeout)
+        {
+            RequestedClockRate = 0;
+            LastTimeout = timeout;
+            HasActiveRequest = false;
         }
     }
 }

src/Ryujinx.Input.SDL3/NpadHdRumble.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Input.SDL3
             }
 
             int serialNumber = 0;
-            string? serial = SDL_GetGamepadSerial(gamepadHandle);
+            string serial = SDL_GetGamepadSerial(gamepadHandle);
             if (serial is not null)
             {
                 int.TryParse(serial, out serialNumber);

src/Ryujinx.Input/HLE/NpadController.cs

@@ -417,8 +417,8 @@ namespace Ryujinx.Input.HLE
             bool motionWasDisabled = oldConfig?.Motion == null;
             bool leftMotionMissing = _leftMotionInput == null;
             bool isJoyconPairNeedingRightMotion = newConfig.ControllerType == ConfigControllerType.JoyconPair && _rightMotionInput == null;
-            bool motionEnabledChanged = oldConfig.Motion.EnableMotion != newConfig.Motion.EnableMotion;
-            bool motionBackendChanged = oldConfig.Motion.MotionBackend != newConfig.Motion.MotionBackend;
+            bool motionEnabledChanged = !motionWasDisabled && oldConfig?.Motion?.EnableMotion != newConfig.Motion.EnableMotion;
+            bool motionBackendChanged = !motionWasDisabled && oldConfig?.Motion?.MotionBackend != newConfig.Motion.MotionBackend;
 
             return motionWasDisabled ||
                    leftMotionMissing ||
@@ -701,16 +701,17 @@ namespace Ryujinx.Input.HLE
 
             VibrationValue leftVibrationValue = dualVibrationValue.Item1;
             VibrationValue rightVibrationValue = dualVibrationValue.Item2;
+            
+            float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble));
+            float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble));
 
             leftVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
             leftVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
             rightVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
             rightVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
 
-            if (!controllerConfig.Rumble.UseHDRumble || gamepad.HDRumble(leftVibrationValue, rightVibrationValue) == false)
+            if (!controllerConfig.Rumble.UseHDRumble || !gamepad.HDRumble(leftVibrationValue, rightVibrationValue))
             {
-                float low = Math.Min(1f, (float)(rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15));
-                float high = Math.Min(1f, (float)(leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85));
                 gamepad.Rumble(low, high, 0xFFFFFFFF);
             }
 
@@ -767,9 +768,10 @@ namespace Ryujinx.Input.HLE
             {
                 foreach (AssignedInputDevice assignedController in assignedControllers)
                 {
-                    foreach (string gamepadId in gamepadDriver.GamepadsIds)
+                    for (int index = 0; index < gamepadDriver.GamepadsIds.Length; index++)
                     {
-                        if (gamepadId == assignedController.Id)
+                        string gamepadId = gamepadDriver.GamepadsIds[index];
+                        if (string.Equals(gamepadId, assignedController.Id, StringComparison.Ordinal))
                         {
                             yield return assignedController;
                             break;
@@ -782,14 +784,14 @@ namespace Ryujinx.Input.HLE
 
             if (config is StandardControllerInputConfig)
             {
-                foreach (string gamepadId in gamepadDriver.GamepadsIds)
+                for (int index = 0; index < gamepadDriver.GamepadsIds.Length; index++)
                 {
-                    if (gamepadId == config.Id)
+                    string gamepadId = gamepadDriver.GamepadsIds[index];
+                    if (string.Equals(gamepadId, config.Id, StringComparison.Ordinal))
                     {
                         yield return new AssignedInputDevice
                         {
-                            Type = AssignedInputDeviceType.Controller,
-                            Id = gamepadId,
+                            Type = AssignedInputDeviceType.Controller, Id = gamepadId,
                         };
                         yield break;
                     }
@@ -1092,7 +1094,7 @@ namespace Ryujinx.Input.HLE
                         : _assignedControllerConfigs.FirstOrDefault(),
                     _controllerDriver
                 ),
-                _ => ((IGamepad?)null, (InputConfig?)null, (IGamepadDriver?)null)
+                _ => ((IGamepad)null, (InputConfig)null, (IGamepadDriver)null)
             };
 
             _controllerGamepad = _gamepad;

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -109,6 +109,11 @@ namespace Ryujinx.Input.HLE
 
         private void HandleOnGamepadConnected(string id)
         {
+            List<InputConfig> requestedInputConfig;
+            List<PlayerInputAssignment> playerInputAssignments;
+            bool enableKeyboard;
+            bool enableMouse;
+
             lock (_lock)
             {
                 for (int i = 0; i < _controllers.Length; i++)
@@ -119,10 +124,15 @@ namespace Ryujinx.Input.HLE
                         _controllers[i] = null;
                     }
                 }
+
+                requestedInputConfig = _requestedInputConfig;
+                playerInputAssignments = _playerInputAssignments;
+                enableKeyboard = _enableKeyboard;
+                enableMouse = _enableMouse;
             }
 
             // Force input reload
-            ReloadConfiguration(_requestedInputConfig, _playerInputAssignments, _enableKeyboard, _enableMouse);
+            ReloadConfiguration(requestedInputConfig, playerInputAssignments, enableKeyboard, enableMouse);
         }
 
         private bool PlayerHasAssignedControllerId(PlayerIndex playerIndex, string id)

src/Ryujinx.Memory/SparseMemoryBlock.cs

@@ -21,6 +21,7 @@ namespace Ryujinx.Memory
         private ulong _mappedBlockUsage;
 
         private readonly ulong[] _mappedPageBitmap;
+        private readonly MemoryBlock _fill;
 
         public MemoryBlock Block => _reservedBlock;
 
@@ -34,23 +35,24 @@ namespace Ryujinx.Memory
             int pages = (int)BitUtils.DivRoundUp(size, _pageSize);
             int bitmapEntries = BitUtils.DivRoundUp(pages, 64);
             _mappedPageBitmap = new ulong[bitmapEntries];
+            _fill = fill;
 
-            if (fill != null)
+            if (_fill is not null)
             {
+                if (_fill.Size % _pageSize !=0)
+                {
+                    throw new ArgumentException("Fill memory block should be page sized.", nameof(_fill));
+                }
+                
                 // 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);
+                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;
+                    _reservedBlock.MapView(_fill, 0, offset, Math.Min(_fill.Size, size - offset));
+                    offset += _fill.Size;
                 }
             }
 
@@ -75,6 +77,12 @@ namespace Ryujinx.Memory
             }
 
             _pageInit(block.GetSpan(_mappedBlockUsage, (int)_pageSize));
+
+            if (_fill is not null)
+            {
+                _reservedBlock.UnmapView(_fill, pageOffset, _pageSize);
+            }
+            
             _reservedBlock.MapView(block, _mappedBlockUsage, pageOffset, _pageSize);
 
             _mappedBlockUsage += _pageSize;

src/Ryujinx.SDL3.Common/SDL3Driver.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Threading;
 using SDL;
 using static SDL.SDL3;
@@ -43,6 +44,9 @@ namespace Ryujinx.SDL3.Common
 
         private SDL3Driver() { }
 
+        private static readonly HttpClient _httpClient = new();
+        private const string GamepadDbUrl = "https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt";
+        
         public void Initialize()
         {
             lock (_lock)
@@ -96,8 +100,10 @@ namespace Ryujinx.SDL3.Common
 
                 SDL_SetEventEnabled((uint)SDL_EventType.SDL_EVENT_GAMEPAD_SENSOR_UPDATE, false);
 
-                string gamepadDbPath = Path.Combine(AppDataManager.BaseDirPath, "SDL_GameControllerDB.txt");
+                string gamepadDbPath = Path.Combine(AppDataManager.BaseDirPath, "gamecontrollerdb.txt");
 
+                UpdateGamepadDb(gamepadDbPath);
+                
                 if (File.Exists(gamepadDbPath))
                 {
                     SDL_AddGamepadMappingsFromFile(gamepadDbPath);
@@ -110,6 +116,37 @@ namespace Ryujinx.SDL3.Common
             }
         }
 
+        private static void UpdateGamepadDb(string gamepadDbPath)
+        {
+            try
+            {
+                byte[] remoteBytes = _httpClient.GetByteArrayAsync(GamepadDbUrl).GetAwaiter().GetResult();
+
+                bool shouldWrite = true;
+
+                if (File.Exists(gamepadDbPath))
+                {
+                    byte[] localBytes = File.ReadAllBytes(gamepadDbPath);
+
+                    if (localBytes.AsSpan().SequenceEqual(remoteBytes))
+                    {
+                        shouldWrite = false;
+                    }
+                }
+
+                if (shouldWrite)
+                {
+                    File.WriteAllBytes(gamepadDbPath ?? "", remoteBytes);
+
+                    Logger.Info?.Print(LogClass.Application, "Updated gamepad database.");
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning?.Print(LogClass.Application, $"Failed to check/download gamepad database, using existing local copy if present: {ex.Message}");
+            }
+        }
+        
         public bool RegisterWindow(SDL_WindowID windowId, Action<SDL_Event> windowEventHandler)
         {
             return _registeredWindowHandlers.TryAdd(windowId, windowEventHandler);

src/Ryujinx.Tests/Cpu/CpuContext.cs

@@ -13,7 +13,10 @@ namespace Ryujinx.Tests.Cpu
 
         public CpuContext(IMemoryManager memory, bool for64Bit)
         {
-            _translator = new Translator(new JitMemoryAllocator(), memory, AddressTable<ulong>.CreateForArm(for64Bit, memory.Type));
+            bool sparse = memory.Type is not MemoryManagerType.SoftwareMmu and not MemoryManagerType.SoftwarePageTable;
+            IAddressTable<ulong> functionTable = sparse ? SparseAddressTable<ulong>.CreateForArm(for64Bit) : AddressTable<ulong>.CreateForArm(for64Bit);
+            
+            _translator = new Translator(new JitMemoryAllocator(), memory, functionTable);
             memory.UnmapEvent += UnmapHandler;
         }
 

src/Ryujinx.Tests/Cpu/CpuTest.cs

@@ -10,6 +10,8 @@ using MemoryPermission = Ryujinx.Tests.Unicorn.MemoryPermission;
 namespace Ryujinx.Tests.Cpu
 {
     [TestFixture]
+    [Parallelizable(ParallelScope.All)]
+    [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
     public class CpuTest
     {
         protected static readonly ulong Size = MemoryBlock.GetPageSize();

src/Ryujinx.Tests/Cpu/CpuTest32.cs

@@ -10,6 +10,8 @@ using MemoryPermission = Ryujinx.Tests.Unicorn.MemoryPermission;
 namespace Ryujinx.Tests.Cpu
 {
     [TestFixture]
+    [Parallelizable(ParallelScope.All)]
+    [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
     public class CpuTest32
     {
         protected static readonly uint Size = (uint)MemoryBlock.GetPageSize();

src/Ryujinx.Tests/Cpu/EnvironmentTests.cs

@@ -1,7 +1,7 @@
 using ARMeilleure.Common;
-using ARMeilleure.Memory;
 using ARMeilleure.Translation;
 using NUnit.Framework;
+using Ryujinx.Cpu;
 using Ryujinx.Cpu.Jit;
 using Ryujinx.Tests.Memory;
 using System;
@@ -20,7 +20,7 @@ namespace Ryujinx.Tests.Cpu
             _translator ??= new Translator(
                 new JitMemoryAllocator(),
                 new MockMemoryManager(),
-                AddressTable<ulong>.CreateForArm(true, MemoryManagerType.SoftwarePageTable));
+                AddressTable<ulong>.CreateForArm(true));
         }
 
         [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
@@ -51,7 +51,7 @@ namespace Ryujinx.Tests.Cpu
             bool methodCalled = false;
             bool isFz = false;
 
-            TranslatorTestMethods.FpFlagsPInvokeTest method = TranslatorTestMethods.GenerateFpFlagsPInvokeTest();
+            TranslatorTestMethods.FpFlagsPInvokeTest method = TranslatorTestMethods.GenerateFpFlagsPInvokeTest(_translator.JitCache);
 
             // This method sets flush-to-zero and then calls the managed method.
             // Before and after setting the flags, it ensures subnormal addition works as expected.

src/Ryujinx.Tests/Memory/PartialUnmaps.cs

@@ -60,7 +60,7 @@ namespace Ryujinx.Tests.Memory
             _translator ??= new Translator(
                 new JitMemoryAllocator(),
                 new MockMemoryManager(),
-                AddressTable<ulong>.CreateForArm(true, MemoryManagerType.SoftwarePageTable));
+                AddressTable<ulong>.CreateForArm(true));
             
             NativeSignalHandler.InitializeSignalHandler();
         }
@@ -245,7 +245,7 @@ namespace Ryujinx.Tests.Memory
                 // Create a large mapping.
                 mainMemory.MapView(backing, 0, 0, vaSize);
 
-                TestMethods.DebugNativeWriteLoop writeFunc = TestMethods.GenerateDebugNativeWriteLoop();
+                TestMethods.DebugNativeWriteLoop writeFunc = TestMethods.GenerateDebugNativeWriteLoop(_translator.JitCache);
                 nint writePtr = mainMemory.GetPointer(vaSize - 0x1000, 4);
 
                 Thread testThread = new(() =>
@@ -339,7 +339,7 @@ namespace Ryujinx.Tests.Memory
 
             fixed (void* localMap = &state.LocalCounts)
             {
-                TestMethods.DebugThreadLocalMapGetOrReserve getOrReserve = TestMethods.GenerateDebugThreadLocalMapGetOrReserve((nint)localMap);
+                TestMethods.DebugThreadLocalMapGetOrReserve getOrReserve = TestMethods.GenerateDebugThreadLocalMapGetOrReserve(_translator.JitCache, (nint)localMap);
 
                 for (int i = 0; i < ThreadLocalMap<int>.MapSize; i++)
                 {

src/Ryujinx/Assets/Splashes.json

@@ -1,7 +1,37 @@
 {
   "Locales": {
     "ar_SA": [],
-    "de_DE": [],
+    "de_DE": [
+      "Ryubing ist mein zweiter Vorname.",
+      "Hier schlechten Witz einfügen.",
+      "ES IST RYUBING-ZEIT!",
+      "Fantastisch!",
+      "Jetzt mit 100% mehr Humor!",
+      "Jetzt geht es erst richtig los...",
+      "War wohl nur der Wind...",
+      "Kann Spuren von Nüssen enthalten!",
+      "Aus 100% biologischem Anbau!",
+      "Schönen Tag noch! : )",
+      "Der Weltraum... unendliche Weiten!",
+      "Falls du es noch nicht bemerkt hast: Ich liebe es schlechte Witze zu machen : )",
+      "In C# programmiert!",
+      "Forgejo hat Gitlab entthront!",
+      "Irgendwelche Ideen, was hier stehen könnte?",
+      "Guten Morgen!",
+      "Guten Tag!",
+      "Guten Abend!",
+      "Ich hoffe, du hast einen tollen Tag!",
+      "ICH... BIN RYUBING!",
+      "Nein, Lossless Scaling wird NICHT unterstützt.",
+      "Trans-Rechte sind Menschenrechte!",
+      ":3",
+      "Bitte einen Controller anschließen!",
+      "Never gonna give you up!",
+      "Ganon beobachtet dich!",
+      "Unzählige Stunden voller Spaß!",
+      "Yahaha! Du hast mich endeckt!",
+      "Finde uns auf BlueSky"
+    ],
     "el_GR": [],
     "en_US": [
       "Ryubing is my middle name.",
@@ -76,10 +106,90 @@
       "Whaaa? You came to see me again? That makes Beedle SO HAPPY!",
       "Don't get cooked, stay off the hook!",
       "Now with 100% more good vibes in the splash code!",
-      "It is Wednesday my dudes!"
+      "It is Wednesday my dudes!",
+      "Nifty",
+      "Find us on BlueSky",
+      "We are the knights who say... Ni."
     ],
     "es_ES": [],
-    "fr_FR": [],
+    "fr_FR": [
+      "Ryubing est mon deuxième prénom.",
+      "Toujours à 110% !",
+      "Je ne pense pas donc je ne suis pas !",
+      "Tout gloire à Egg.",
+      "Insérer une blague nulle ici.",
+      "C'EST L'HEURE DE RYUBING !",
+      "Je déteste les lundis...",
+      "Fantastique !",
+      "Maintenant avec 100% d'humour en plus !",
+      "'Non approuvé par S&P' a été approuvé par S&P.",
+      "N'ÊTES-VOUS PAS DIVERTI ?",
+      "C'est un émulateur !",
+      "Maintenant le vrai jeu commence...",
+      "Cuit frais depuis 2018 !",
+      "Ça devait être le vent...",
+      "J'étais un aventurier comme toi avant de recevoir une flèche dans le genou.",
+      "Ryubing !",
+      "Peut contenir des fruits à coque !",
+      "Peut inclure des références occasionnelles à la pop culture !",
+      "100% issue d'agriculture durable !",
+      "Passez une bonne journée : )",
+      "Texte du bas",
+      "Je suis désolé Dave. Je crains que je ne puisse pas faire ça.",
+      "Ce n'est pas une lune...",
+      "Monsieur, en train de terminer ce combat.",
+      "Je vois comment c'est...",
+      "L'espace ! La frontière finale !",
+      "Si vous ne l'aviez pas déjà deviné, j'adore faire de mauvaises blagues : )",
+      "ceci.",
+      "cela",
+      "Probablement ne contient pas de haricots cuits.",
+      "Vous êtes prêts ?",
+      "Herobrine supprimé.",
+      "Droit à la réparation !",
+      "Programmé en C#!",
+      "Forgejo a détrôné Gitlab !",
+      "Des idées quoi mettre ici ?",
+      "Bonjour !",
+      "Bon après-midi !",
+      "Bonne soirée !",
+      "J'espère que vous passez une excellente journée !",
+      "Veuillez insérer le disque deux !",
+      "Je... SUIS RYUBING !",
+      "Ryubing toujours à fond",
+      "bing bing wahoo.",
+      "œuf",
+      "Non, le scaling sans perte n'est PAS supporté.",
+      "Comment le faites-vous ?",
+      "Un euro.",
+      "Deux euros",
+      "Quelqu'un m'a dit un jour !",
+      "C'est encore cette période de l'année !",
+      "Infusé uniquement avec les meilleures blagues.",
+      "La compilation de shaders asynchrone détruirait mon âme : (",
+      "Les droits trans sont des droits humains !",
+      ":3",
+      ":3 prohibé",
+      "Bug de réplication du splash ':3' corrigé.",
+      "Veuillez connecter une manette !",
+      "Never gonna give you up !",
+      "Le jeu était donc truqué depuis le début...",
+      "Ganon vous observe !",
+      "Maintenant avec 100% de JSON en plus dans le code des splash !",
+      "D'innombrables heures de plaisir !",
+      "Désolé, Link. Je ne peux pas donner de crédit. Revenez quand vous serez un peu... mmmmmm... plus riche !",
+      "Vous avez rencontré un terrible destin, n'est-ce pas ?",
+      "Yahaha ! Tu m'as trouvé !",
+      "J'aurais été dans de beaux draps si tu n'étais pas intervenu à ce moment-là, goro.",
+      "Restez au frais !",
+      "Jaune, noir. Jaune, noir. Jaune, noir. Jaune, noir. Oh, noir et jaune ! Secouons un peu ça.",
+      "Quoi ? Tu es venu me revoir ? Ça rend Beedle TROP HEUREUX !",
+      "Ne vous faites pas cuire, restez hors du crochet !",
+      "Maintenant avec 100% de bonnes vibes en plus dans le code des splash !",
+      "Eh oui jamy !",
+      "Allez Marcel !",
+      "Retrouvez nous sur BlueSky"
+    ],
     "he_IL": [],
     "it_IT": [],
     "ja_JP": [],

src/Ryujinx/Common/SplashTextHelper.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using Ryujinx.Common.Logging;
 using Gommon;
 using Ryujinx.Ava.Systems.Configuration;
-using System;
 using System.Text.Json;
 
 namespace Ryujinx.Common
@@ -11,47 +10,48 @@ namespace Ryujinx.Common
     {
         public static void PrintSplash()
         {
+            string splash = GetSplash();
+            
             Logger.Notice.Print(LogClass.Application,  "   ___                 __    _              ");
             Logger.Notice.Print(LogClass.Application, @"  / _ \  __ __ __ __  / /   (_)  ___   ___ _");
             Logger.Notice.Print(LogClass.Application, @" / , _/ / // // // / / _ \ / /  / _ \ / _ `/");
             Logger.Notice.Print(LogClass.Application, @"/_/|_|  \_, / \_,_/ /_.__//_/  /_//_/ \_, / ");
             Logger.Notice.Print(LogClass.Application,  "       /___/                         /___/  ");
-            Logger.Notice.Print(LogClass.Application, "");
-            Logger.Notice.Print(LogClass.Application, GetSplash());
-            Logger.Notice.Print(LogClass.Application, "");
+            
+            if (splash is null)
+            {
+                Logger.Error?.Print(LogClass.Application, "Failed to fetch Splash Text! Splash JSON is invalid!");
+                return;
+            }
+            
+            if (!splash.IsNullOrEmpty())
+            {
+                Logger.Notice.Print(LogClass.Application, "");
+                Logger.Notice.Print(LogClass.Application, splash);
+                Logger.Notice.Print(LogClass.Application, "");
+            }
         }
 
-        private static string s_finalSplash = "";
+        private static string _finalSplash;
 
         public static string GetSplash()
         {
-            if (string.IsNullOrEmpty(s_finalSplash))
+            if (_finalSplash is null)
             {
-                s_finalSplash = GetLangJson();
-                if (string.IsNullOrEmpty(s_finalSplash))
+                try
                 {
-                    s_finalSplash = "Splash Text";
+                    string data;
+                    data = EmbeddedResources.ReadAllText("Ryujinx/Assets/Splashes.json");
+                    SplashLocales splashJson = JsonSerializer.Deserialize<SplashLocales>(data);
+                    _finalSplash = splashJson.Locales[ConfigurationState.Instance.UI.LanguageCode.Value].GetRandomElement() ?? "";
+                }
+                catch
+                {
+                    return null;
                 }
             }
-
-            return $"{s_finalSplash}";
-        }
-        
-        private static SplashLocales s_splashJson;
-
-        private static string GetLangJson()
-        {
-            try
-            {
-                string data;
-                data = EmbeddedResources.ReadAllText("Ryujinx/Assets/Splashes.json");
-                s_splashJson = JsonSerializer.Deserialize<SplashLocales>(data);
-                return s_splashJson.Locales[ConfigurationState.Instance.UI.LanguageCode.Value].GetRandomElement();
-            }
-            catch
-            {
-                return "";
-            }
+            
+            return _finalSplash;
         }
 
         private struct SplashLocales

src/Ryujinx/Common/XCITrimmerLog.cs

@@ -26,9 +26,9 @@ namespace Ryujinx.Ava.Common
 
         internal class TrimmerWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
         {
-            private readonly XCITrimmerViewModel _viewModel;
+            private readonly XciTrimmerViewModel _viewModel;
 
-            public TrimmerWindow(XCITrimmerViewModel viewModel)
+            public TrimmerWindow(XciTrimmerViewModel viewModel)
             {
                 _viewModel = viewModel;
             }

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -502,15 +502,20 @@ namespace Ryujinx.Ava.Systems.Configuration
         public bool DebuggerSuspendOnStart { get; set; }
 
         /// <summary>
-        ///     Show toggles for dirty hacks in the UI.
+        /// Show toggles for dirty hacks in the UI.
         /// </summary>
         public bool ShowDirtyHacks { get; set; }
 
         /// <summary>
-        ///     The packed values of the enabled dirty hacks.
+        /// The packed values of the enabled dirty hacks.
         /// </summary>
         public ulong[] DirtyHacks { get; set; }
 
+        /// <summary>
+        /// Pause emulation while scanning Amiibo
+        /// </summary>
+        public bool PauseEmulationWhileScanningAmiibo { get; set; }
+
         /// <summary>
         /// Loads a configuration file from disk
         /// </summary>

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -115,7 +115,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             System.SkipUserProfilesManager.Value = cff.SkipUserProfiles;
             System.UseHypervisor.Value = cff.UseHypervisor;
             System.GCLowLatency.Value = cff.GCLowLatency;
-
+ 
             UI.GuiColumns.FavColumn.Value = shouldLoadFromFile ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
             UI.GuiColumns.IconColumn.Value = shouldLoadFromFile ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
             UI.GuiColumns.AppColumn.Value = shouldLoadFromFile ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
@@ -151,6 +151,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             UI.WindowStartup.WindowPositionX.Value = shouldLoadFromFile ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
             UI.WindowStartup.WindowPositionY.Value = shouldLoadFromFile ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
             UI.WindowStartup.WindowMaximized.Value = shouldLoadFromFile ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+            UI.PauseEmulationWhileScanningAmiibo.Value = cff.PauseEmulationWhileScanningAmiibo;
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -196,6 +196,11 @@ namespace Ryujinx.Ava.Systems.Configuration
             /// </summary>
             public ReactiveObject<bool> ShowDynamicInputSwapWarning { get; private set; }
 
+            /// <summary>
+            /// Pause emulation while scanning Amiibo
+            /// </summary>
+            public ReactiveObject<bool> PauseEmulationWhileScanningAmiibo { get; private set; }
+
             public UISection()
             {
                 GuiColumns = new Columns();
@@ -217,6 +222,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                 ShowConsole.Event += static (_, e) => ConsoleHelper.SetConsoleWindowState(e.NewValue);
                 ShowDynamicInputSwapWarning = new ReactiveObject<bool>();
                 ShowDynamicInputSwapWarning.Value = true;
+                PauseEmulationWhileScanningAmiibo = new ReactiveObject<bool>();
+                PauseEmulationWhileScanningAmiibo.Value = true;
             }
         }
 

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -158,6 +158,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 DebuggerSuspendOnStart = Debug.DebuggerSuspendOnStart,
                 ShowDirtyHacks = Hacks.ShowDirtyHacks,
                 DirtyHacks = Hacks.EnabledHacks.Select(it => it.Pack()).ToArray(),
+                PauseEmulationWhileScanningAmiibo = UI.PauseEmulationWhileScanningAmiibo,
             };
 
             return configurationFile;
@@ -262,6 +263,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             UI.WindowStartup.WindowPositionX.Value = 0;
             UI.WindowStartup.WindowPositionY.Value = 0;
             UI.WindowStartup.WindowMaximized.Value = false;
+            UI.PauseEmulationWhileScanningAmiibo.Value = true;
             Hid.EnableKeyboard.Value = false;
             Hid.EnableMouse.Value = false;
             Hid.DisableInputWhenOutOfFocus.Value = false;

src/Ryujinx/Systems/DiscordIntegrationModule.cs

@@ -9,7 +9,9 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
+using System.Collections.Generic;
 using System.Text;
+using System.Text.Json;
 
 namespace Ryujinx.Ava.Systems
 {
@@ -135,20 +137,48 @@ namespace Ryujinx.Ava.Systems
 
             if (!formattedValue.Handled)
                 return;
+            
 
-            _discordPresencePlaying.Details = TruncateToByteLength(
-                formattedValue.Reset
-                    ? $"Playing {_currentApp.Title}"
-                    : formattedValue.FormattedString
-            );
+            
+            try // New format that attempts to deserialize json, and if it fails (using old method)...
+            {
+                Dictionary<string, string> outDictionary = JsonSerializer.Deserialize<Dictionary<string, string>>(formattedValue.FormattedString);
+                
+                _discordPresencePlaying.Details = TruncateToByteLength(
+                    outDictionary["Details"].IsNullOrEmpty()
+                        ? $"Playing {_currentApp.Title}"
+                        : outDictionary["Details"]
+                );
+            
+                _discordPresencePlaying.State = TruncateToByteLength(
+                    outDictionary["State"].IsNullOrEmpty()
+                        ? $"Total play time: {ValueFormatUtils.FormatTimeSpan(_currentApp.TimePlayed)}"
+                        : outDictionary["State"]
+                );
 
-            if (_discordClient.CurrentPresence.Details.Equals(_discordPresencePlaying.Details))
+            }
+            catch // Utilize original code
+            {
+                _discordPresencePlaying.Details = TruncateToByteLength(
+                    formattedValue.Reset
+                        ? $"Playing {_currentApp.Title}"
+                        : formattedValue.FormattedString
+                );
+            }
+
+            if (_discordClient.CurrentPresence.Details.Equals(_discordPresencePlaying.Details) && _discordClient.CurrentPresence.State.Equals(_discordPresencePlaying.State))
                 return; //don't trigger an update if the set presence Details are identical to current
 
             _discordClient.SetPresence(_discordPresencePlaying);
             Logger.Info?.Print(LogClass.UI, "Updated Discord RPC based on a supported play report.");
         }
 
+        public static string PrepareMultilineRpcString(string line1 = "", string line2 = "")
+        {
+            Dictionary<string, string> rpcdict = new() { { "Details", line1 }, {"State", line2} };
+            return JsonSerializer.Serialize(rpcdict);
+        }
+
         private static string TruncateToByteLength(string input)
         {
             if (Encoding.UTF8.GetByteCount(input) <= ApplicationByteLimit)

src/Ryujinx/Systems/PlayReport/PlayReports.Formatters.cs

@@ -1105,7 +1105,7 @@ namespace Ryujinx.Ava.Systems.PlayReport
             
             return $"At the main menu";
             
-            static string LocFinal(string? location) => location switch
+            static string LocFinal(string location) => location switch
             {
                 "0" => "Somewhere in Miitopia",
                 "1" => "Wandering around Greenhorne",
@@ -1151,8 +1151,10 @@ namespace Ryujinx.Ava.Systems.PlayReport
             {
                 return "At the main menu";
             }
-
-            static string MarioOrLuigiGamemode(string? gamemode) => gamemode switch
+            
+            return "";
+            
+            static string MarioOrLuigiGamemode(string gamemode) => gamemode switch
             {
                 "0" => "mario",
                 "1" => "luigi",
@@ -1161,14 +1163,14 @@ namespace Ryujinx.Ava.Systems.PlayReport
                 _ => gamemode
             };
             
-            static string OtherGameMode(string? gamemode) => gamemode switch
-            {
-                "2" => "Boost Rush",
-                "3" => "Challenges",
-                "4" => "Coin Battle",
-                "5" => "Coin Battle Editor",
-                _ => ""
-            };
+            // static string OtherGameMode(string gamemode) => gamemode switch
+            // {
+            //     "2" => "Boost Rush",
+            //     "3" => "Challenges",
+            //     "4" => "Coin Battle",
+            //     "5" => "Coin Battle Editor",
+            //     _ => ""
+            // };
 
             static string SpecialMapNames(int? course) => course switch
             {
@@ -1196,9 +1198,6 @@ namespace Ryujinx.Ava.Systems.PlayReport
             // Glacier seals = 16, water leaf = 15
             // desert ice = 14, acorn squid = 13
             // all other course numbers are to be considered a hazard
-            
-            return "";
-            
         }
     }
 }

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -187,7 +187,7 @@ namespace Ryujinx.Ava.UI.Applet
                         StringLengthMax = 25
                     };
                     (UserResult result, string userInput) =
-                        await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.CabinetDialog], args);
+                        await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_RenameAmiiboTitle], args);
                     if (result == UserResult.Ok)
                     {
                         inputText = userInput;
@@ -212,11 +212,11 @@ namespace Ryujinx.Ava.UI.Applet
             {
                 dialogCloseEvent.Set();
                 await ContentDialogHelper.CreateInfoDialog(
-                    LocaleManager.Instance[LocaleKeys.CabinetScanDialog],
+                    LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_ScanAmiiboMessage],
                     string.Empty,
                     LocaleManager.Instance[LocaleKeys.InputDialogOk],
                     string.Empty,
-                    LocaleManager.Instance[LocaleKeys.CabinetTitle]
+                    LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_ScanAmiiboTitle]
                 );
             });
             dialogCloseEvent.WaitOne();

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

@@ -74,10 +74,14 @@ namespace Ryujinx.Ava.UI.Controls
 
             content._host = contentDialog;
             contentDialog.Title = title;
-            contentDialog.PrimaryButtonText = args.SubmitText;
+
+            contentDialog.PrimaryButtonText = string.IsNullOrWhiteSpace(args.SubmitText) 
+                ? LocaleManager.Instance[LocaleKeys.InputDialogOk] 
+                : args.SubmitText;
+
             contentDialog.IsPrimaryButtonEnabled = content._checkLength(content.Message.Length);
             contentDialog.SecondaryButtonText = string.Empty;
-            contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel];
+            contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.Common_Buttons_Cancel];
             contentDialog.Content = content;
 
             void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)

src/Ryujinx/UI/Helpers/PhysicalKeyLabelHelper.cs

@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 try
                 {
                     string labelsJson = File.ReadAllText(labelsPath);
-                    Dictionary<string, string>? labels = JsonSerializer.Deserialize<Dictionary<string, string>>(labelsJson, _serializerOptions);
+                    Dictionary<string, string> labels = JsonSerializer.Deserialize<Dictionary<string, string>>(labelsJson, _serializerOptions);
 
                     if (labels != null)
                     {

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -3,8 +3,10 @@ using Avalonia.Collections;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Path = System.IO.Path;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
@@ -20,31 +22,39 @@ using System.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
     public partial class AmiiboWindowViewModel : BaseModel, IDisposable
     {
-        // ReSharper disable once InconsistentNaming
-        private static bool _cachedUseRandomUuid;
-
-        private const string DefaultJson = "{ \"amiibo\": [] }";
-        private const float AmiiboImageSize = 350f;
-
-        private readonly string _amiiboJsonPath;
-        private readonly byte[] _amiiboLogoBytes;
-        private readonly HttpClient _httpClient;
-        private readonly AmiiboWindow _owner;
-
-        private List<AmiiboApi> _amiiboList;
-        private AvaloniaList<AmiiboApi> _amiibos;
-        private ObservableCollection<string> _amiiboSeries;
+        public enum AmiiboSortField
+        {
+            Name,
+            
+        }
 
         private int _amiiboSelectedIndex;
         private int _seriesSelectedIndex;
         private bool _showAllAmiibo;
 
+        // ReSharper disable once InconsistentNaming
+        private static bool _cachedUseRandomUuid;
+        public bool IsSortedByName => _sortField == AmiiboSortField.Name;
+        private const string DefaultJson = "{ \"amiibo\": [] }";
+        private const float AmiiboImageSize = 350f;
+        public string TitleId { get; set; }
+        public string LastScannedAmiiboId { get; set; }
+        public string SortingFieldName => LocaleManager.Instance[LocaleKeys.Common_Sort_NameLabel];
+        private readonly string _amiiboJsonPath;
+        private readonly byte[] _amiiboLogoBytes;
+        private readonly HttpClient _httpClient;
+        private readonly AmiiboWindow _owner;
+        private List<AmiiboApi> _amiiboList;
+        private AvaloniaList<AmiiboApi> _amiibos;
+        private ObservableCollection<string> _amiiboSeries;
+        private CancellationTokenSource _imageCts = new();
         private static readonly AmiiboJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
         public AmiiboWindowViewModel(AmiiboWindow owner, string lastScannedAmiiboId, string titleId)
@@ -73,9 +83,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public AmiiboWindowViewModel() { }
 
-        public string TitleId { get; set; }
-        public string LastScannedAmiiboId { get; set; }
-
         public UserResult Response { get; private set; }
 
         public bool UseRandomUuid
@@ -151,6 +158,42 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public bool PauseEmulationWhileScanningAmiibo
+        {
+            get => ConfigurationState.Instance.UI.PauseEmulationWhileScanningAmiibo.Value;
+            set
+            {
+                ConfigurationState.Instance.UI.PauseEmulationWhileScanningAmiibo.Value = value;
+                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+                OnPropertyChanged();
+            }
+        }
+
+        private string _searchText = string.Empty;
+        private bool _sortingAscending = true;
+
+        public string SearchText
+        {
+            get => _searchText;
+            set
+            {
+                _searchText = value;
+                FilterAmiibo();
+                OnPropertyChanged();
+            }
+        }
+
+        public bool SortingAscending
+        {
+            get => _sortingAscending;
+            set
+            {
+                _sortingAscending = value;
+                FilterAmiibo();
+                OnPropertyChanged();
+            }
+        }
+
         [ObservableProperty]
         public partial Bitmap AmiiboImage { get; set; }
 
@@ -166,14 +209,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 _owner.ScannedAmiibo = AmiiboList[AmiiboSelectedIndex];
                 _owner.IsScanned = true;
-                _owner.Close();
+
             }
         }
 
         public void Cancel()
         {
             _owner.IsScanned = false;
-            _owner.Close();
+
         }
 
         public void Dispose()
@@ -315,42 +358,46 @@ namespace Ryujinx.Ava.UI.ViewModels
         private void ParseAmiiboData()
         {
             _amiiboSeries.Clear();
-            _amiibos.Clear();
 
-            for (int i = 0; i < _amiiboList.Count; i++)
+            foreach (AmiiboApi amiibo in _amiiboList)
             {
-                if (!_amiiboSeries.Contains(_amiiboList[i].AmiiboSeries))
+                if (!_amiiboSeries.Contains(amiibo.AmiiboSeries))
                 {
-                    if (!ShowAllAmiibo)
+                    if (_showAllAmiibo)
                     {
-                        foreach (AmiiboApiGamesSwitch game in _amiiboList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    AmiiboSeries.Add(_amiiboList[i].AmiiboSeries);
-
-                                    break;
-                                }
-                            }
-                        }
+                        _amiiboSeries.Add(amiibo.AmiiboSeries);
                     }
                     else
                     {
-                        AmiiboSeries.Add(_amiiboList[i].AmiiboSeries);
+                        bool hasCompatible = amiibo.GamesSwitch.Any(game =>
+                            game != null && game.GameId.Contains(TitleId));
+
+                        if (hasCompatible)
+                        {
+                            _amiiboSeries.Add(amiibo.AmiiboSeries);
+                        }
                     }
                 }
             }
 
-            if (LastScannedAmiiboId != string.Empty)
+            if (_showAllAmiibo)
+            {
+                SeriesSelectedIndex = -1;
+            }
+            else if (LastScannedAmiiboId != string.Empty)
             {
                 SelectLastScannedAmiibo();
             }
-            else
+            else if (_amiiboSeries.Count > 0)
             {
                 SeriesSelectedIndex = 0;
             }
+            else
+            {
+                SeriesSelectedIndex = -1;
+            }
+
+            FilterAmiibo();
         }
 
         private void SelectLastScannedAmiibo()
@@ -360,104 +407,109 @@ namespace Ryujinx.Ava.UI.ViewModels
             SeriesSelectedIndex = AmiiboSeries.IndexOf(scanned.AmiiboSeries);
             AmiiboSelectedIndex = AmiiboList.IndexOf(scanned);
         }
-
+        
         private void FilterAmiibo()
         {
             _amiibos.Clear();
 
-            List<AmiiboApi> amiiboSortedList;
+            IEnumerable<AmiiboApi> query = _amiiboList.AsEnumerable();
 
-            // If no series selected, just display all available amiibos
-            if (_seriesSelectedIndex < 0)
+            if (_seriesSelectedIndex >= 0 && _seriesSelectedIndex < _amiiboSeries.Count)
             {
-                amiiboSortedList = _amiiboList
-                    .OrderBy(amiibo => amiibo.AmiiboSeries)
-                    .ThenBy(x => x.Name)
-                    .ToList();
-            }
-            else
-            {
-                amiiboSortedList = _amiiboList
-                    .Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex])
-                    .OrderBy(amiibo => amiibo.Name).ToList();
+                string selectedSeries = _amiiboSeries[_seriesSelectedIndex];
+                query = query.Where(amiibo => amiibo.AmiiboSeries == selectedSeries);
             }
 
-            
-
-            for (int i = 0; i < amiiboSortedList.Count; i++)
+            if (!string.IsNullOrWhiteSpace(_searchText))
             {
-                if (!_amiibos.Contains(amiiboSortedList[i]))
+                query = query.Where(amiibo =>
+                    amiibo.Name.Contains(_searchText, StringComparison.OrdinalIgnoreCase));
+            }
+
+            if (!_showAllAmiibo)
+            {
+                query = query.Where(amiibo =>
+                    amiibo.GamesSwitch.Any(game => game != null && game.GameId.Contains(TitleId)));
+            }
+
+            query = _sortingAscending
+                ? query.OrderBy(amiibo => amiibo.Name)
+                : query.OrderByDescending(amiibo => amiibo.Name);
+
+            _amiibos.AddRange(query);
+
+            int restoredIndex = -1;
+            for (int i = 0; i < _amiibos.Count; i++)
+            {
+                if (_amiibos[i].GetId() == LastScannedAmiiboId)
                 {
-                    if (!_showAllAmiibo)
-                    {
-                        foreach (AmiiboApiGamesSwitch game in amiiboSortedList[i].GamesSwitch)
-                        {
-                            if (game != null)
-                            {
-                                if (game.GameId.Contains(TitleId))
-                                {
-                                    _amiibos.Add(amiiboSortedList[i]);
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        _amiibos.Add(amiiboSortedList[i]);
-                    }
+                    restoredIndex = i;
+                    break;
                 }
             }
 
-            AmiiboSelectedIndex = 0;
+            AmiiboSelectedIndex = restoredIndex != -1
+                ? restoredIndex
+                : (_amiibos.Count > 0 ? 0 : -1);
+
+            SetAmiiboDetails();
+        }
+
+        private AmiiboSortField _sortField = AmiiboSortField.Name;
+
+        public AmiiboSortField SortingField
+        {
+            get => _sortField;
+            set
+            {
+                _sortField = value;
+                FilterAmiibo();
+                OnPropertyChanged(nameof(SortingFieldName));
+                OnPropertyChanged(nameof(IsSortedByName));
+            }
         }
 
         private void SetAmiiboDetails()
         {
             ResetAmiiboPreview();
-
             Usage = string.Empty;
 
             if (_amiiboSelectedIndex < 0 || _amiibos.Count < 1)
-            {
                 return;
-            }
 
             AmiiboApi selected = _amiibos[_amiiboSelectedIndex];
-
-            string imageUrl = _amiiboList.FirstOrDefault(amiibo => amiibo.Equals(selected)).Image;
+            string imageUrl = selected.Image;
 
             StringBuilder usageStringBuilder = new();
+            bool writable = false;
 
-            for (int i = 0; i < _amiiboList.Count; i++)
+            foreach (AmiiboApiGamesSwitch game in selected.GamesSwitch)
             {
-                if (_amiiboList[i].Equals(selected))
+                if (game != null && game.GameId.Contains(TitleId))
                 {
-                    bool writable = false;
-
-                    foreach (AmiiboApiGamesSwitch item in _amiiboList[i].GamesSwitch)
+                    foreach (AmiiboApiUsage usageItem in game.AmiiboUsage)
                     {
-                        if (item.GameId.Contains(TitleId))
-                        {
-                            foreach (AmiiboApiUsage usageItem in item.AmiiboUsage)
-                            {
-                                usageStringBuilder.Append($"{Environment.NewLine}- {usageItem.Usage.Replace("/", Environment.NewLine + "-")}");
-
-                                writable = usageItem.Write;
-                            }
-                        }
+                        usageStringBuilder.Append($"{Environment.NewLine}- {usageItem.Usage.Replace("/", Environment.NewLine + "-")}");
+                        if (usageItem.Write)
+                            writable = true;
                     }
-
-                    if (usageStringBuilder.Length == 0)
-                    {
-                        usageStringBuilder.Append($"{LocaleManager.Instance[LocaleKeys.Unknown]}.");
-                    }
-
-                    Usage = $"{LocaleManager.Instance[LocaleKeys.Usage]} {(writable ? $" ({LocaleManager.Instance[LocaleKeys.Writable]})" : string.Empty)} : {usageStringBuilder}";
                 }
             }
 
+            string usageLabel = writable
+                ? LocaleManager.Instance[LocaleKeys.Amiibo_WritableLabel]
+                : LocaleManager.Instance[LocaleKeys.Amiibo_UsageLabel];
+
+            if (usageStringBuilder.Length == 0)
+            {
+                usageStringBuilder.Append(Environment.NewLine + Environment.NewLine + LocaleManager.Instance[LocaleKeys.Amiibo_UnknownLabel]);
+            }
+            else
+            {
+                usageStringBuilder.Replace(Environment.NewLine + "-", Environment.NewLine + Environment.NewLine + "-");
+            }
+
+            Usage = usageLabel + usageStringBuilder.ToString();
             _ = UpdateAmiiboPreview(imageUrl);
         }
 
@@ -510,8 +562,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 Logger.Error?.Print(LogClass.Application, $"Failed to request amiibo data: {exception}");
             }
 
-            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
-                LocaleManager.Instance[LocaleKeys.DialogAmiiboApiFailFetchMessage],
+            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_APITitle],
+                LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_APIFailFetchMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 string.Empty,
                 LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
@@ -526,26 +578,33 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private async Task UpdateAmiiboPreview(string imageUrl)
         {
-            HttpResponseMessage response = await _httpClient.GetAsync(imageUrl);
+            _imageCts.Cancel();
+            _imageCts = new CancellationTokenSource();
 
-            if (response.IsSuccessStatusCode)
+            try
             {
-                byte[] amiiboPreviewBytes = await response.Content.ReadAsByteArrayAsync();
-                using MemoryStream memoryStream = new(amiiboPreviewBytes);
+                using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_imageCts.Token);
 
-                Bitmap bitmap = new(memoryStream);
+                HttpResponseMessage response = await _httpClient.GetAsync(imageUrl, linkedCts.Token);
 
-                double ratio = Math.Min(AmiiboImageSize / bitmap.Size.Width,
-                        AmiiboImageSize / bitmap.Size.Height);
+                if (response.IsSuccessStatusCode)
+                {
+                    byte[] bytes = await response.Content.ReadAsByteArrayAsync(linkedCts.Token);
+                    using MemoryStream ms = new(bytes);
 
-                int resizeHeight = (int)(bitmap.Size.Height * ratio);
-                int resizeWidth = (int)(bitmap.Size.Width * ratio);
+                    Bitmap bitmap = new(ms);
 
-                AmiiboImage = bitmap.CreateScaledBitmap(new PixelSize(resizeWidth, resizeHeight));
+                    double ratio = Math.Min(AmiiboImageSize / bitmap.Size.Width, AmiiboImageSize / bitmap.Size.Height);
+                    int newWidth = (int)(bitmap.Size.Width * ratio);
+                    int newHeight = (int)(bitmap.Size.Height * ratio);
+
+                    AmiiboImage = bitmap.CreateScaledBitmap(new PixelSize(newWidth, newHeight));
+                }
             }
-            else
+            catch (OperationCanceledException) { }
+            catch (Exception ex)
             {
-                Logger.Error?.Print(LogClass.Application, $"Failed to get amiibo preview. Response status code: {response.StatusCode}");
+                Logger.Error?.Print(LogClass.Application, $"Failed to load amiibo preview: {ex}");
             }
         }
 
@@ -560,8 +619,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private static async Task ShowInfoDialog()
         {
-            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle],
-                LocaleManager.Instance[LocaleKeys.DialogAmiiboApiConnectErrorMessage],
+            await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_APITitle],
+                LocaleManager.Instance[LocaleKeys.Dialog_Amiibo_APIConnectErrorMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 string.Empty,
                 LocaleManager.Instance[LocaleKeys.RyujinxInfo]);