piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-30 01:29:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix for fastmem when pc is used as immediate

Browse Source 
and (hopefully) make SIGSEGV handler work for aarch64 linux
This commit is contained in:
RSDuck
2020-07-08 23:47:24 +02:00
parent 3786660099
commit 8f5d8d1e12
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ARMJIT_x64/ARMJIT_Compiler.h
View File

@ -179,7 +179,7 @@ public:
Gen::OpArg MapReg(int reg)
{
if (reg == 15 && RegCache.Mapping[reg] == Gen::INVALID_REG)
if (reg == 15 && !(RegCache.LoadedRegs & (1 << 15)))
return Gen::Imm32(R15);
assert(RegCache.Mapping[reg] != Gen::INVALID_REG);

6
src/ARMJIT_x64/ARMJIT_LoadStore.cpp
View File

@ -183,6 +183,12 @@ void Compiler::Comp_MemAccess(int rd, int rn, const Op2& op2, int size, int flag
if (Config::JIT_FastMemory && ((!Thumb && CurInstr.Cond() != 0xE) || ARMJIT_Memory::IsFastmemCompatible(expectedTarget)))
{
if (rdMapped.IsImm())
{
MOV(32, R(RSCRATCH4), rdMapped);
rdMapped = R(RSCRATCH4);
}
u8* memopStart = GetWritableCodePtr();
LoadStorePatch patch;