Cool_Tools/Ryujinx-uplift
1
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2024-12-18 12:55:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

JIT Sparse Function Table random crash fix (#319)

Browse Source 
A couple of games have random crashing with the JIT Sparse Ftable changes, and it seems to have been caused by an insufficient int size returned by `AddressTableLevel#GetValue(ulong address)`.
It was 32 bits (Int32), but the GiantBlock (which is the current address table impl) uses potentially 36 bits for the first level.
This commit is contained in:
LotP1 2024-11-29 23:32:55 +01:00 committed by GitHub
parent 8e55e6d6d7
commit facc12a94a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ARMeilleure/Common/AddressTableLevel.cs
View File

@ -36,9 +36,9 @@ namespace ARMeilleure.Common
/// </summary> /// </summary>
/// <param name="address">Guest address</param> /// <param name="address">Guest address</param>
/// <returns>Value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/></returns> /// <returns>Value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/></returns>
public int GetValue(ulong address) public long GetValue(ulong address)
{ {
return (int)((address & Mask) >> Index); return (long)((address & Mask) >> Index);
} }
} }
} }

2
src/ARMeilleure/Translation/PTC/Ptc.cs
View File

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

2
src/Ryujinx.Cpu/AddressTable.cs
View File

@ -238,7 +238,7 @@ namespace ARMeilleure.Common
{ {
TEntry* page = GetPage(address); TEntry* page = GetPage(address);
int index = Levels[^1].GetValue(address); long index = Levels[^1].GetValue(address);
EnsureMapped((IntPtr)(page + index)); EnsureMapped((IntPtr)(page + index));