GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Support ARM64 architecture under Windows

Browse Source
This commit is contained in:
Ari Vuollet
2024-05-09 20:05:49 +03:00
parent 97be8ee8cc
commit 99c27c9c30
11 changed files with 154 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -1777,13 +1777,18 @@ bool InitHostfxr()
{
case PlatformType::Windows:
case PlatformType::UWP:
platformStr = PLATFORM_64BITS ? "Windows x64" : "Windows x86";
if (PLATFORM_ARCH == ArchitectureType::x64)
platformStr = "Windows x64";
else if (PLATFORM_ARCH == ArchitectureType::ARM64)
platformStr = "Windows ARM64";
else
platformStr = "Windows x86";
break;
case PlatformType::Linux:
platformStr = PLATFORM_ARCH_ARM64 ? "Linux Arm64" : PLATFORM_ARCH_ARM ? "Linux Arm32" : PLATFORM_64BITS ? "Linux x64" : "Linux x86";
platformStr = PLATFORM_ARCH_ARM64 ? "Linux ARM64" : PLATFORM_ARCH_ARM ? "Linux Arm32" : PLATFORM_64BITS ? "Linux x64" : "Linux x86";
break;
case PlatformType::Mac:
platformStr = PLATFORM_ARCH_ARM || PLATFORM_ARCH_ARM64 ? "macOS Arm64" : PLATFORM_64BITS ? "macOS x64" : "macOS x86";
platformStr = PLATFORM_ARCH_ARM || PLATFORM_ARCH_ARM64 ? "macOS ARM64" : PLATFORM_64BITS ? "macOS x64" : "macOS x86";
break;
default:;
platformStr = "";

60
Source/Engine/Scripting/ScriptingType.h
View File

@@ -493,6 +493,66 @@ FORCE_INLINE int32 GetVTableIndex(void** vtable, int32 entriesCount, void* func)
if (op == 0x20)
return 0;
return *(byte*)funcJmp / sizeof(void*);
#elif defined(_MSC_VER) && PLATFORM_ARCH_ARM64
// For MSVC ARM64, the following thunk takes a relative jump from the function pointer to the next thunk:
// adrp xip0, offset_high
// add xip0, xip0, offset_low
// br xip0
// The last thunk contains the offset to the vtable:
// ldr xip0, [x0]
// ldr xip0, [xip0, XXX]
uint32_t* op = (uint32_t*)func;
uint32_t def = *op;
if ((*op & 0x9F000000) == 0x90000000)
{
// adrp
uint32_t imm20 = (((*op & 0x60000000) >> 29) + ((*op & 0xFFFFE0) >> 3)) << 12;
op++;
// add
def = *op;
uint32_t imm12 = (*op & 0x3FFC00) >> 10;
imm12 = (*op & 0x400000) != 0 ? (imm12 << 12) : imm12;
// br
op = (uint32_t*)(((uintptr)func & ((uintptr)-1 << 12)) + imm20 + imm12) + 1;
// ldr + offset
def = *op;
uint32_t offset = ((*op & 0x3FFC00) >> 10) * ((*op & 0x40000000) != 0 ? 8 : 4);
return offset / sizeof(void*);
}
else if ((*op & 0xBFC00000) == 0xB9400000)
{
// ldr + offset
uint32_t offset = ((*op & 0x3FFC00) >> 10) * ((*op & 0x40000000) != 0 ? 8 : 4);
op++;
// ldr + offset
def = *op;
if ((*op & 0xBFE00C00) == 0xB8400400)
{
// offset is stored in the register as is
uint32_t postindex = (*op & 0x1FF000) >> 12;
offset = postindex;
return offset / sizeof(void*);
}
else if ((*op & 0xBFE00C00) == 0xB8400C00)
{
// offset is added to the value in base register... updated to the same register
uint32_t preindex = (*op & 0x1FF000) >> 12;
offset += preindex;
return offset / sizeof(void*);
}
else if ((*op & 0xBFC00000) == 0xB9400000)
{
// 20-bit offset
offset = ((*op & 0x3FFC00) >> 10) * ((*op & 0x40000000) != 0 ? 8 : 4);
return offset / sizeof(void*);
}
CRASH;
}
#elif defined(__clang__)
// On Clang member function pointer represents the offset from the vtable begin.
return (int32)(intptr)func / sizeof(void*);