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

JitArm64: Use immediate WriteExceptionExit more often.

This commit is contained in:
degasus 2016-03-04 09:23:55 +01:00
parent 689205f0a4
commit eaa0e275db
5 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,33 @@ void JitArm64::WriteExit(ARM64Reg Reg)
BR(X30); BR(X30);
} }
void JitArm64::WriteExceptionExit(u32 destination, bool only_external)
{
Cleanup();
DoDownCount();
LDR(INDEX_UNSIGNED, W30, PPC_REG, PPCSTATE_OFF(Exceptions));
MOVI2R(DISPATCHER_PC, destination);
FixupBranch no_exceptions = CBZ(W30);
STR(INDEX_UNSIGNED, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
STR(INDEX_UNSIGNED, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc));
if (only_external)
MOVI2R(X30, (u64)&PowerPC::CheckExternalExceptions);
else
MOVI2R(X30, (u64)&PowerPC::CheckExceptions);
BLR(X30);
LDR(INDEX_UNSIGNED, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc));
SetJumpTarget(no_exceptions);
if (Profiler::g_ProfileBlocks)
EndTimeProfile(js.curBlock);
MOVI2R(X30, (u64)asm_routines.dispatcher);
BR(X30);
}
void JitArm64::WriteExceptionExit(ARM64Reg dest, bool only_external) void JitArm64::WriteExceptionExit(ARM64Reg dest, bool only_external)
{ {
Cleanup(); Cleanup();
@ -490,8 +517,7 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
gpr.Flush(FLUSH_MAINTAIN_STATE); gpr.Flush(FLUSH_MAINTAIN_STATE);
fpr.Flush(FLUSH_MAINTAIN_STATE); fpr.Flush(FLUSH_MAINTAIN_STATE);
MOVI2R(W30, js.compilerPC); WriteExceptionExit(js.compilerPC, true);
WriteExceptionExit(W30, true);
SwitchToNearCode(); SwitchToNearCode();
SetJumpTarget(exit); SetJumpTarget(exit);
gpr.Unlock(W30); gpr.Unlock(W30);
@ -519,11 +545,11 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
LDR(INDEX_UNSIGNED, WA, XA, 0); LDR(INDEX_UNSIGNED, WA, XA, 0);
TST(WA, 23, 2); TST(WA, 23, 2);
B(CC_EQ, done_here); B(CC_EQ, done_here);
gpr.Unlock(WA);
gpr.Flush(FLUSH_MAINTAIN_STATE); gpr.Flush(FLUSH_MAINTAIN_STATE);
fpr.Flush(FLUSH_MAINTAIN_STATE); fpr.Flush(FLUSH_MAINTAIN_STATE);
MOVI2R(WA, js.compilerPC); WriteExceptionExit(js.compilerPC, true);
WriteExceptionExit(WA, true);
SwitchToNearCode(); SwitchToNearCode();
SetJumpTarget(NoExtException); SetJumpTarget(NoExtException);
SetJumpTarget(exit); SetJumpTarget(exit);
@ -549,8 +575,9 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
ORR(WA, WA, 26, 0); // EXCEPTION_FPU_UNAVAILABLE ORR(WA, WA, 26, 0); // EXCEPTION_FPU_UNAVAILABLE
STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions));
MOVI2R(WA, js.compilerPC); gpr.Unlock(WA);
WriteExceptionExit(WA);
WriteExceptionExit(js.compilerPC);
SwitchToNearCode(); SwitchToNearCode();

1
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -230,6 +230,7 @@ private:
// Exits // Exits
void WriteExit(u32 destination); void WriteExit(u32 destination);
void WriteExit(Arm64Gen::ARM64Reg dest); void WriteExit(Arm64Gen::ARM64Reg dest);
void WriteExceptionExit(u32 destination, bool only_external = false);
void WriteExceptionExit(Arm64Gen::ARM64Reg dest, bool only_external = false); void WriteExceptionExit(Arm64Gen::ARM64Reg dest, bool only_external = false);
FixupBranch JumpIfCRFieldBit(int field, int bit, bool jump_if_set); FixupBranch JumpIfCRFieldBit(int field, int bit, bool jump_if_set);

11
Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
View File

@ -30,11 +30,9 @@ void JitArm64::sc(UGeckoInstruction inst)
ORR(WA, WA, 31, 0); // Same as WA | EXCEPTION_SYSCALL ORR(WA, WA, 31, 0); // Same as WA | EXCEPTION_SYSCALL
STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions));
MOVI2R(WA, js.compilerPC + 4); gpr.Unlock(WA);
STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(pc));
// WA is unlocked in this function WriteExceptionExit(js.compilerPC + 4);
WriteExceptionExit(WA);
} }
void JitArm64::rfi(UGeckoInstruction inst) void JitArm64::rfi(UGeckoInstruction inst)
@ -108,8 +106,9 @@ void JitArm64::bx(UGeckoInstruction inst)
MOVI2R(XA, (u64)&CoreTiming::Idle); MOVI2R(XA, (u64)&CoreTiming::Idle);
BLR(XA); BLR(XA);
MOVI2R(WA, js.compilerPC); gpr.Unlock(WA);
WriteExceptionExit(WA);
WriteExceptionExit(js.compilerPC);
} }
WriteExit(destination); WriteExit(destination);

6
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
View File

@ -463,13 +463,11 @@ void JitArm64::lXX(UGeckoInstruction inst)
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
ARM64Reg XA = EncodeRegTo64(WA); ARM64Reg XA = EncodeRegTo64(WA);
MOVI2R(XA, (u64)&CoreTiming::Idle); MOVI2R(XA, (u64)&CoreTiming::Idle);
BLR(XA); BLR(XA);
gpr.Unlock(WA);
MOVI2R(WA, js.compilerPC); WriteExceptionExit(js.compilerPC);
WriteExceptionExit(WA);
SwitchToNearCode(); SwitchToNearCode();

6
Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
View File

@ -196,11 +196,9 @@ void JitArm64::twx(UGeckoInstruction inst)
LDR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); LDR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions));
ORR(WA, WA, 24, 0); // Same as WA | EXCEPTION_PROGRAM ORR(WA, WA, 24, 0); // Same as WA | EXCEPTION_PROGRAM
STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); STR(INDEX_UNSIGNED, WA, PPC_REG, PPCSTATE_OFF(Exceptions));
gpr.Unlock(WA);
MOVI2R(WA, js.compilerPC); WriteExceptionExit(js.compilerPC);
// WA is unlocked in this function
WriteExceptionExit(WA);
SwitchToNearCode(); SwitchToNearCode();