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

aica arm: use scratch reg for call/jump if offset if too big (armv7) 

Issue #1148
This commit is contained in:
Flyinghead 2023-07-14 21:32:49 +02:00
parent 3bf817aea1
commit 3c6eaa4d34
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/hw/arm7/arm7_rec_arm32.cpp
View File

@ -279,8 +279,19 @@ static void emitDataProcOp(const ArmOp& op)
static void jump(const void *code)
{
ptrdiff_t offset = reinterpret_cast<uintptr_t>(code) - ass.GetBuffer()->GetStartAddress<uintptr_t>();
Label code_label(offset);
ass.B(&code_label);
if (offset < -32 * 1024 * 1024 || offset >= 32 * 1024 * 1024)
{
INFO_LOG(AICA_ARM, "jump offset too large: %d", offset);
UseScratchRegisterScope scope(&ass);
Register reg = scope.Acquire();
ass.Mov(reg, (u32)code);
ass.Bx(reg);
}
else
{
Label code_label(offset);
ass.B(&code_label);
}
}
static void call(const void *code, bool saveFlags = true)
@ -288,8 +299,19 @@ static void call(const void *code, bool saveFlags = true)
if (saveFlags)
storeFlags();
ptrdiff_t offset = reinterpret_cast<uintptr_t>(code) - ass.GetBuffer()->GetStartAddress<uintptr_t>();
Label code_label(offset);
ass.Bl(&code_label);
if (offset < -32 * 1024 * 1024 || offset >= 32 * 1024 * 1024)
{
INFO_LOG(AICA_ARM, "call offset too large: %d", offset);
UseScratchRegisterScope scope(&ass);
Register reg = scope.Acquire();
ass.Mov(reg, (u32)code);
ass.Blx(reg);
}
else
{
Label code_label(offset);
ass.Bl(&code_label);
}
if (saveFlags)
loadFlags();
}