Merge f73c9ac4de into 855161b23b

Merge branch 'master' into master
Prevent log from showing negative JIT cache sizes (32bit-int overflow) (#664 )
2025-02-15 03:45:43 +00:00 · 2025-02-15 13:45:40 +10:00 · 2025-02-14 21:37:19 -06:00
3 changed files with 5 additions and 5 deletions
@@ -186,7 +186,7 @@ namespace ARMeilleure.Translation.Cache
            
            int newRegionNumber = _activeRegionIndex;

-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            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);

@@ -166,7 +166,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
            
            int newRegionNumber = _activeRegionIndex;

-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            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);

@@ -4696,7 +4696,7 @@
        "zh_CN": "繁体中文（推荐）",
        "zh_TW": "正體中文 (建議)"
      }
-    },    
+    },
    {
      "ID": "SettingsTabSystemSystemLanguageSwedish",
      "Translations": {
@@ -4721,7 +4721,7 @@
        "zh_CN": "瑞典语",
        "zh_TW": ""
      }
-    },    
+    },
    {
      "ID": "SettingsTabSystemSystemLanguageNorwegian",
      "Translations": {
@@ -24223,4 +24223,4 @@
      }
    }
  ]
-}
+}
Author	SHA1	Message	Date
Vladimir Sokolov	5a96786e59	Merge `f73c9ac4de` into `855161b23b`	2025-02-15 03:45:43 +00:00
Vladimir Sokolov	f73c9ac4de	Merge branch 'master' into master	2025-02-15 13:45:40 +10:00
FluffyOMC	855161b23b	Prevent log from showing negative JIT cache sizes (32bit-int overflow) (#664 ) ![image](https://github.com/user-attachments/assets/5820ce7b-cbfe-4908-8f5e-7ee82040ee1a)	2025-02-14 21:37:19 -06:00