mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add CPUID check and fix exclusive reservation granule size

Browse source
This commit is contained in:
gdkchan 2019-02-17 22:52:18 -03:00
commit 5d1dc035c3
2 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

61
ChocolArm64/Memory/CompareExchange128.cs
View file

@ -19,12 +19,13 @@ namespace ChocolArm64.Memory
private delegate Int128 InterlockedCompareExchange(IntPtr address, Int128 expected, Int128 desired); private delegate Int128 InterlockedCompareExchange(IntPtr address, Int128 expected, Int128 desired);
private delegate int GetCpuId();
private static InterlockedCompareExchange _interlockedCompareExchange; private static InterlockedCompareExchange _interlockedCompareExchange;
static CompareExchange128() static CompareExchange128()
{ {
//TODO: Also check if cmpxchg16b is supported on cpu flags. if (RuntimeInformation.OSArchitecture != Architecture.X64 || !IsCmpxchg16bSupported())
if (RuntimeInformation.OSArchitecture != Architecture.X64)
{ {
throw new PlatformNotSupportedException(); throw new PlatformNotSupportedException();
} }
@ -36,18 +37,18 @@ namespace ChocolArm64.Memory
interlockedCompareExchange128Code = new byte[] interlockedCompareExchange128Code = new byte[]
{ {
0x53, // push rbx 0x53, // push rbx
0x49, 0x8B, 0x00, // mov rax, [r8] 0x49, 0x8b, 0x00, // mov rax, [r8]
0x49, 0x8B, 0x19, // mov rbx, [r9] 0x49, 0x8b, 0x19, // mov rbx, [r9]
0x49, 0x89, 0xCA, // mov r10, rcx 0x49, 0x89, 0xca, // mov r10, rcx
0x49, 0x89, 0xD3, // mov r11, rdx 0x49, 0x89, 0xd3, // mov r11, rdx
0x49, 0x8B, 0x49, 0x08, // mov rcx, [r9+8] 0x49, 0x8b, 0x49, 0x08, // mov rcx, [r9+8]
0x49, 0x8B, 0x50, 0x08, // mov rdx, [r8+8] 0x49, 0x8b, 0x50, 0x08, // mov rdx, [r8+8]
0xF0, 0x49, 0x0F, 0xC7, 0x0B, // lock cmpxchg16b [r11] 0xf0, 0x49, 0x0f, 0xc7, 0x0b, // lock cmpxchg16b [r11]
0x49, 0x89, 0x02, // mov [r10], rax 0x49, 0x89, 0x02, // mov [r10], rax
0x4C, 0x89, 0xD0, // mov rax, r10 0x4c, 0x89, 0xd0, // mov rax, r10
0x49, 0x89, 0x52, 0x08, // mov [r10+8], rdx 0x49, 0x89, 0x52, 0x08, // mov [r10+8], rdx
0x5B, // pop rbx 0x5b, // pop rbx
0xC3 // ret 0xc3 // ret
}; };
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
@ -71,13 +72,43 @@ namespace ChocolArm64.Memory
throw new PlatformNotSupportedException(); throw new PlatformNotSupportedException();
} }
ulong codeLength = (ulong)interlockedCompareExchange128Code.Length; IntPtr funcPtr = MapCodeAsExecutable(interlockedCompareExchange128Code);
_interlockedCompareExchange = Marshal.GetDelegateForFunctionPointer<InterlockedCompareExchange>(funcPtr);
}
private static bool IsCmpxchg16bSupported()
{
byte[] getCpuIdCode = new byte[]
{
0x53, // push rbx
0xB8, 0x01, 0x00, 0x00, 0x00, // mov eax, 0x1
0x0F, 0xA2, // cpuid
0x89, 0xC8, // mov eax, ecx
0x5B, // pop rbx
0xC3 // ret
};
IntPtr funcPtr = MapCodeAsExecutable(getCpuIdCode);
GetCpuId getCpuId = Marshal.GetDelegateForFunctionPointer<GetCpuId>(funcPtr);
int cpuId = getCpuId();
MemoryAlloc.Free(funcPtr);
return (cpuId & (1 << 13)) != 0;
}
private static IntPtr MapCodeAsExecutable(byte[] code)
{
ulong codeLength = (ulong)code.Length;
IntPtr funcPtr = MemoryAlloc.Allocate(codeLength); IntPtr funcPtr = MemoryAlloc.Allocate(codeLength);
unsafe unsafe
{ {
fixed (byte* codePtr = interlockedCompareExchange128Code) fixed (byte* codePtr = code)
{ {
byte* dest = (byte*)funcPtr; byte* dest = (byte*)funcPtr;
@ -89,7 +120,7 @@ namespace ChocolArm64.Memory
MemoryAlloc.Reprotect(funcPtr, codeLength, MemoryProtection.Execute); MemoryAlloc.Reprotect(funcPtr, codeLength, MemoryProtection.Execute);
_interlockedCompareExchange = Marshal.GetDelegateForFunctionPointer<InterlockedCompareExchange>(funcPtr); return funcPtr;
} }
public static bool InterlockedCompareExchange128( public static bool InterlockedCompareExchange128(

2
ChocolArm64/State/CpuThreadState.cs
View file

@ -120,7 +120,7 @@ namespace ChocolArm64.State
private ulong GetMaskedExclusiveAddress(ulong address) private ulong GetMaskedExclusiveAddress(ulong address)
{ {
return address & ~((1UL << ErgSizeLog2) - 1); return address & ~((4UL << ErgSizeLog2) - 1);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]