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

Merge pull request #9485 from JosJuice/jitarm64-pc-stp 

JitArm64: Use STP for pc/npc
This commit is contained in:
Markus Wick 2021-02-03 12:22:37 +01:00 committed by GitHub
parent 7250d6e4e0 dd8e504c80
commit b6e9cca64f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/PowerPC/JitArm64/Jit.cpp
View File

@ -452,13 +452,16 @@ void JitArm64::WriteExceptionExit(u32 destination, bool only_external)
MOVI2R(DISPATCHER_PC, destination); MOVI2R(DISPATCHER_PC, destination);
FixupBranch no_exceptions = CBZ(W30); FixupBranch no_exceptions = CBZ(W30);
STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc)); static_assert(PPCSTATE_OFF(pc) <= 252);
STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc)); static_assert(PPCSTATE_OFF(pc) + 4 == PPCSTATE_OFF(npc));
STP(IndexType::Signed, DISPATCHER_PC, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
if (only_external) if (only_external)
MOVP2R(X8, &PowerPC::CheckExternalExceptions); MOVP2R(X8, &PowerPC::CheckExternalExceptions);
else else
MOVP2R(X8, &PowerPC::CheckExceptions); MOVP2R(X8, &PowerPC::CheckExceptions);
BLR(X8); BLR(X8);
LDR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc)); LDR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc));
SetJumpTarget(no_exceptions); SetJumpTarget(no_exceptions);
@ -479,13 +482,16 @@ void JitArm64::WriteExceptionExit(ARM64Reg dest, bool only_external)
LDR(IndexType::Unsigned, W30, PPC_REG, PPCSTATE_OFF(Exceptions)); LDR(IndexType::Unsigned, W30, PPC_REG, PPCSTATE_OFF(Exceptions));
FixupBranch no_exceptions = CBZ(W30); FixupBranch no_exceptions = CBZ(W30);
STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc)); static_assert(PPCSTATE_OFF(pc) <= 252);
STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc)); static_assert(PPCSTATE_OFF(pc) + 4 == PPCSTATE_OFF(npc));
STP(IndexType::Signed, DISPATCHER_PC, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
if (only_external) if (only_external)
MOVP2R(EncodeRegTo64(DISPATCHER_PC), &PowerPC::CheckExternalExceptions); MOVP2R(EncodeRegTo64(DISPATCHER_PC), &PowerPC::CheckExternalExceptions);
else else
MOVP2R(EncodeRegTo64(DISPATCHER_PC), &PowerPC::CheckExceptions); MOVP2R(EncodeRegTo64(DISPATCHER_PC), &PowerPC::CheckExceptions);
BLR(EncodeRegTo64(DISPATCHER_PC)); BLR(EncodeRegTo64(DISPATCHER_PC));
LDR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc)); LDR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc));
SetJumpTarget(no_exceptions); SetJumpTarget(no_exceptions);

7
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -102,12 +102,16 @@ static_assert(std::is_standard_layout<PairedSingle>(), "PairedSingle must be sta
// //
// On AArch64, most load/store instructions support fairly large immediate offsets, // On AArch64, most load/store instructions support fairly large immediate offsets,
// but not LDP/STP, which we want to use for accessing certain things. // but not LDP/STP, which we want to use for accessing certain things.
// These must be in the first 260 bytes: pc, npc
// These must be in the first 520 bytes: gather_pipe_ptr, gather_pipe_base_ptr // These must be in the first 520 bytes: gather_pipe_ptr, gather_pipe_base_ptr
// Better code is generated if these are in the first 260 bytes: gpr // Better code is generated if these are in the first 260 bytes: gpr
// Better code is generated if these are in the first 520 bytes: ps // Better code is generated if these are in the first 520 bytes: ps
// Unfortunately not all of those fit in 520 bytes, but we can fit most of ps and all of the rest. // Unfortunately not all of those fit in 520 bytes, but we can fit most of ps and all of the rest.
struct PowerPCState struct PowerPCState
{ {
u32 pc; // program counter
u32 npc;
// gather pipe pointer for JIT access // gather pipe pointer for JIT access
u8* gather_pipe_ptr; u8* gather_pipe_ptr;
u8* gather_pipe_base_ptr; u8* gather_pipe_base_ptr;
@ -121,9 +125,6 @@ struct PowerPCState
alignas(16) PairedSingle ps[32]; alignas(16) PairedSingle ps[32];
#endif #endif
u32 pc; // program counter
u32 npc;
ConditionRegister cr; ConditionRegister cr;
UReg_MSR msr; // machine state register UReg_MSR msr; // machine state register