steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-07 19:00:16 +02:00
Code Issues Packages Projects Releases 66 Wiki Activity

ARM64EC: Emulate unaligned atomic access in non-JIT EC code

Browse Source
This commit is contained in:
Jacek Caban committed 2025-10-10 00:13:56 +02:00
1 parent 764432c77c
commit 5fd3852fd3
3 files changed
+16 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Windows/ARM64EC/Module.cpp
+9 -12
View File
@@ -349,15 +349,11 @@ struct alignas(16) KiUserExceptionDispatcherStackLayout {
uint64_t Redzone[2];
};
static bool HandleUnalignedAccess(ARM64_NT_CONTEXT& Context) {
static bool HandleUnalignedAccess(ARM64_NT_CONTEXT& Context, bool IsJIT) {
auto Thread = GetCPUArea().ThreadState();
if (!CTX->IsAddressInCodeBuffer(Thread, Context.Pc)) {
return false;
}
FEXCORE_PROFILE_INSTANT_INCREMENT(Thread, AccumulatedSIGBUSCount, 1);
const auto Result =
FEXCore::ArchHelpers::Arm64::HandleUnalignedAccess(Thread, HandlerConfig->GetUnalignedHandlerType(), Context.Pc, &Context.X0);
FEXCore::ArchHelpers::Arm64::HandleUnalignedAccess(Thread, HandlerConfig->GetUnalignedHandlerType(), Context.Pc, &Context.X0, IsJIT);
Context.Pc += Result.value_or(0);
return Result.has_value();
}
@@ -761,16 +757,17 @@ bool ResetToConsistentStateImpl(EXCEPTION_RECORD* Exception, CONTEXT* GuestConte
}
}
if (!CTX->IsAddressInCodeBuffer(Thread, NativeContext->Pc) && !IsDispatcherAddress(NativeContext->Pc)) {
LogMan::Msg::DFmt("Passing through exception");
return false;
}
if (Exception->ExceptionCode == EXCEPTION_DATATYPE_MISALIGNMENT && Exception::HandleUnalignedAccess(*NativeContext)) {
bool IsJIT = CTX->IsAddressInCodeBuffer(Thread, NativeContext->Pc);
if (Exception->ExceptionCode == EXCEPTION_DATATYPE_MISALIGNMENT && Exception::HandleUnalignedAccess(*NativeContext, IsJIT)) {
LogMan::Msg::DFmt("Handled unaligned atomic: new pc: {:X}", NativeContext->Pc);
return true;
}
if (!IsJIT && !IsDispatcherAddress(NativeContext->Pc)) {
LogMan::Msg::DFmt("Passing through exception");
return false;
}
// The JIT (in CompileBlock) emits code to check the suspend doorbell at the start of every block, and run the following instruction if it is set:
static constexpr uint32_t SuspendTrapMagic {0xD4395FC0}; // brk #0xCAFE
if (Exception->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION && *reinterpret_cast<uint32_t*>(NativeContext->Pc) == SuspendTrapMagic) {