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

Merge pull request #5783 from FrontMage/fix/inactive-jit-guard-range

Browse Source 
FEXCore: Ignore inactive JIT guard ranges
This commit is contained in:
Ryan Houdek authored and GitHub committed 2026-07-23 17:50:51 -07:00
2 parents d028c7942b 35518a5fa0
commit 464ec9d0bc
2 files changed
+12 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.cpp
+2 -1
View File
@@ -576,7 +576,8 @@ bool SignalDelegator::HandleFrontendSIGSEGV(FEXCore::Core::InternalThreadState*
}
#ifdef ARCHITECTURE_arm64
if (Signal == SIGSEGV && SigInfo.si_code == SEGV_ACCERR && SigInfo.si_addr >= reinterpret_cast<void*>(Thread->JITGuardPage) &&
if (Signal == SIGSEGV && SigInfo.si_code == SEGV_ACCERR && Thread->JITGuardPage &&
SigInfo.si_addr >= reinterpret_cast<void*>(Thread->JITGuardPage) &&
SigInfo.si_addr < reinterpret_cast<void*>(Thread->JITGuardPage + FEXCore::Utils::FEX_PAGE_SIZE)) {
FEXCore::UncheckedLongJump::ManuallyLoadJumpBuf(Thread->RestartJump, Thread->JITGuardOverflowArgument,
ArchHelpers::Context::GetArmGPRs(UContext), ArchHelpers::Context::GetArmFPRs(UContext),
Source/Windows/Common/JITGuardPage.h
+10 -2
View File
@@ -4,9 +4,17 @@
#include <FEXCore/Utils/LongJump.h>
namespace FEX::Windows::JITGuardPage {
static constexpr bool IsAddressInJITGuardPage(uintptr_t GuardPage, uintptr_t Address) {
return GuardPage != 0 && Address >= GuardPage && Address < GuardPage + FEXCore::Utils::FEX_PAGE_SIZE;
}
static_assert(!IsAddressInJITGuardPage(0, 0));
static_assert(IsAddressInJITGuardPage(0x1000, 0x1000));
static_assert(IsAddressInJITGuardPage(0x1000, 0x1fff));
static_assert(!IsAddressInJITGuardPage(0x1000, 0x2000));
static inline bool HandleJITGuardPage(FEXCore::Core::InternalThreadState* Thread, void* Address, uint64_t* GPRs, __uint128_t* FPRs, uint64_t* PC) {
if (Address >= reinterpret_cast<void*>(Thread->JITGuardPage) &&
Address < reinterpret_cast<void*>(Thread->JITGuardPage + FEXCore::Utils::FEX_PAGE_SIZE)) {
if (IsAddressInJITGuardPage(Thread->JITGuardPage, reinterpret_cast<uintptr_t>(Address))) {
FEXCore::UncheckedLongJump::ManuallyLoadJumpBuf(Thread->RestartJump, Thread->JITGuardOverflowArgument, GPRs, FPRs, PC);
return true;
}