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

JitArm64: Check the FIFO on EIEIO instructions 

Copied from the Jit64 version
This commit is contained in:
hthh 2016-08-12 21:09:15 +10:00
parent bbc0f0c744
commit d841d9c7b3
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,6 +405,7 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitB
js.assumeNoPairedQuantize = false; js.assumeNoPairedQuantize = false;
js.blockStart = em_address; js.blockStart = em_address;
js.fifoBytesThisBlock = 0; js.fifoBytesThisBlock = 0;
js.mustCheckFifo = false;
js.downcountAmount = 0; js.downcountAmount = 0;
js.skipInstructions = 0; js.skipInstructions = 0;
js.curBlock = b; js.curBlock = b;
@ -491,9 +492,11 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitB
bool gatherPipeIntCheck = bool gatherPipeIntCheck =
jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end(); jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end();
if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32) if (jo.optimizeGatherPipe && (js.fifoBytesThisBlock >= 32 || js.mustCheckFifo))
{ {
js.fifoBytesThisBlock -= 32; if (js.fifoBytesThisBlock >= 32)
js.fifoBytesThisBlock -= 32;
js.mustCheckFifo = false;
gpr.Lock(W30); gpr.Lock(W30);
BitSet32 regs_in_use = gpr.GetCallerSavedUsed(); BitSet32 regs_in_use = gpr.GetCallerSavedUsed();

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

@ -116,6 +116,7 @@ public:
void dcbx(UGeckoInstruction inst); void dcbx(UGeckoInstruction inst);
void dcbt(UGeckoInstruction inst); void dcbt(UGeckoInstruction inst);
void dcbz(UGeckoInstruction inst); void dcbz(UGeckoInstruction inst);
void eieio(UGeckoInstruction inst);
// LoadStore floating point // LoadStore floating point
void lfXX(UGeckoInstruction inst); void lfXX(UGeckoInstruction inst);

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

@ -853,3 +853,15 @@ void JitArm64::dcbz(UGeckoInstruction inst)
gpr.Unlock(W0); gpr.Unlock(W0);
} }
void JitArm64::eieio(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITLoadStoreOff);
// optimizeGatherPipe generally postpones FIFO checks to the end of the JIT block,
// which is generally safe. However postponing FIFO writes across eieio instructions
// is incorrect (would crash NBA2K11 strap screen if we improve our FIFO detection).
if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0)
js.mustCheckFifo = true;
}

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
View File

@ -314,7 +314,7 @@ static GekkoOPTemplate table31[] = {
// Unused instructions on GC // Unused instructions on GC
{310, &JitArm64::FallBackToInterpreter}, // eciwx {310, &JitArm64::FallBackToInterpreter}, // eciwx
{438, &JitArm64::FallBackToInterpreter}, // ecowx {438, &JitArm64::FallBackToInterpreter}, // ecowx
{854, &JitArm64::DoNothing}, // eieio {854, &JitArm64::eieio}, // eieio
{306, &JitArm64::FallBackToInterpreter}, // tlbie {306, &JitArm64::FallBackToInterpreter}, // tlbie
{566, &JitArm64::DoNothing}, // tlbsync {566, &JitArm64::DoNothing}, // tlbsync
}; };