steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-13 23:00:50 +02:00
Code Issues Packages Projects Releases 67 Wiki Activity

WOW64: Only handle unaligned atomics in JIT code

Browse Source
This commit is contained in:
Billy Laws committed 2024-08-19 19:07:30 +00:00
1 parent 1762ff0393
commit 409d691877
1 file changed
+11 -8
Download Patch File Download Diff File Expand all files Collapse all files
Source/Windows/WOW64/Module.cpp
+11 -8
View File
@@ -125,7 +125,9 @@ uint64_t GetWowTEB(void* TEB) {
bool IsAddressInJit(uint64_t Address) {
const auto& Config = SignalDelegator->GetConfig();
if (Address >= Config.DispatcherBegin && Address < Config.DispatcherEnd) return true;
if (Address >= Config.DispatcherBegin && Address < Config.DispatcherEnd) {
return true;
}
auto Thread = GetTLS().ThreadState();
return Thread->CTX->IsAddressInCodeBuffer(Thread, Address);
@@ -650,22 +652,18 @@ NTSTATUS BTCpuSuspendLocalThread(HANDLE Thread, ULONG* Count) {
NTSTATUS BTCpuResetToConsistentState(EXCEPTION_POINTERS* Ptrs) {
auto* Context = Ptrs->ContextRecord;
auto* Exception = Ptrs->ExceptionRecord;
if (Exception->ExceptionCode == EXCEPTION_DATATYPE_MISALIGNMENT && Context::HandleUnalignedAccess(Context)) {
LogMan::Msg::DFmt("Handled unaligned atomic: new pc: {:X}", Context->Pc);
NtContinue(Context, FALSE);
}
auto Thread = GetTLS().ThreadState();
if (Exception->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
const auto FaultAddress = static_cast<uint64_t>(Exception->ExceptionInformation[1]);
if (Context::HandleSuspendInterrupt(Context, FaultAddress)) {
LogMan::Msg::DFmt("Resumed from suspend");
NtContinue(Context, FALSE);
}
bool HandledRWX = false;
if (GetTLS().ThreadState()) {
if (Thread) {
std::scoped_lock Lock(ThreadCreationMutex);
HandledRWX = InvalidationTracker->HandleRWXAccessViolation(FaultAddress);
}
@@ -676,10 +674,15 @@ NTSTATUS BTCpuResetToConsistentState(EXCEPTION_POINTERS* Ptrs) {
}
}
if (!IsAddressInJit(Context->Pc)) {
if (!Thread || !IsAddressInJit(Context->Pc)) {
return STATUS_SUCCESS;
}
if (Exception->ExceptionCode == EXCEPTION_DATATYPE_MISALIGNMENT && Context::HandleUnalignedAccess(Context)) {
LogMan::Msg::DFmt("Handled unaligned atomic: new pc: {:X}", Context->Pc);
NtContinue(Context, FALSE);
}
LogMan::Msg::DFmt("Reconstructing context");
WOW64_CONTEXT WowContext = Context::ReconstructWowContext(Context);