summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2016-08-06 17:39:57 +0200
committerdegasus <wickmarkus@web.de>2016-08-08 20:19:57 +0200
commit447b23e09a9e8bbee7d99bf764de773246e98b54 (patch)
treee54df8c3b0608748fc61c081442bef232f2e0a39 /Source/Core
parent77cfd0d4fdf0c22405d6b380673aef833fd36b99 (diff)
JitArm64: Load memory base based on MSR.DR.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp20
1 files changed, 18 insertions, 2 deletions
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
index b42cfba2ba..9e0187770e 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
@@ -27,7 +27,6 @@ void JitArm64::GenerateAsm()
ABI_PushRegisters(regs_to_save);
MOVI2R(PPC_REG, (u64)&PowerPC::ppcState);
- MOVI2R(MEM_REG, (u64)Memory::logical_base);
// Load the current PC into DISPATCHER_PC
LDR(INDEX_UNSIGNED, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
@@ -52,6 +51,15 @@ void JitArm64::GenerateAsm()
if (assembly_dispatcher)
{
+ // set the mem_base based on MSR flags
+ LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr));
+ FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27);
+ MOVI2R(MEM_REG, (u64)Memory::physical_base);
+ FixupBranch membaseend = B();
+ SetJumpTarget(physmem);
+ MOVI2R(MEM_REG, (u64)Memory::logical_base);
+ SetJumpTarget(membaseend);
+
// iCache[(address >> 2) & iCache_Mask];
ARM64Reg pc_masked = W25;
ARM64Reg cache_base = X27;
@@ -89,11 +97,19 @@ void JitArm64::GenerateAsm()
}
// Call C version of Dispatch().
- // FIXME: Implement this in inline assembly.
STR(INDEX_UNSIGNED, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
MOVP2R(X30, reinterpret_cast<void*>(&JitBase::Dispatch));
BLR(X30);
+ // set the mem_base based on MSR flags
+ LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr));
+ FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27);
+ MOVI2R(MEM_REG, (u64)Memory::physical_base);
+ FixupBranch membaseend = B();
+ SetJumpTarget(physmem);
+ MOVI2R(MEM_REG, (u64)Memory::logical_base);
+ SetJumpTarget(membaseend);
+
// Jump to next block.
BR(X0);