ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix fastmem building on ARM64 Macs (#841)

This commit is contained in:
WaluigiWare64 2020-12-11 00:41:53 +00:00 committed by GitHub
parent 8530c099bc
commit a9223d6c0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ARMJIT_Memory.cpp
View File

@ -162,8 +162,13 @@ static void SigsegvHandler(int sig, siginfo_t* info, void* rawContext)
#endif #endif
#else #else
desc.EmulatedFaultAddr = (u8*)context->uc_mcontext.fault_address - curArea; #ifdef __APPLE__
desc.FaultPC = (u8*)context->uc_mcontext.pc; desc.EmulatedFaultAddr = (u8*)context->uc_mcontext->__es.__far - curArea;
desc.FaultPC = (u8*)context->uc_mcontext->__ss.__pc;
#else
desc.EmulatedFaultAddr = (u8*)context->uc_mcontext.fault_address - curArea;
desc.FaultPC = (u8*)context->uc_mcontext.pc;
#endif
#endif #endif
if (ARMJIT_Memory::FaultHandler(desc)) if (ARMJIT_Memory::FaultHandler(desc))
@ -175,7 +180,11 @@ static void SigsegvHandler(int sig, siginfo_t* info, void* rawContext)
context->uc_mcontext.gregs[REG_RIP] = (u64)desc.FaultPC; context->uc_mcontext.gregs[REG_RIP] = (u64)desc.FaultPC;
#endif #endif
#else #else
context->uc_mcontext.pc = (u64)desc.FaultPC; #ifdef __APPLE__
context->uc_mcontext->__ss.__pc = (u64)desc.FaultPC;
#else
context->uc_mcontext.pc = (u64)desc.FaultPC;
#endif
#endif #endif
return; return;
} }