Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Adjust downcount before syscalls, not after.

Browse source 
This makes jit slightly slower for syscalls, but it's minor and makes
sure jit and interpreter timing are determistically the same.
This commit is contained in:
Unknown W. Brackets 2013-01-21 22:57:53 -08:00
parent 566b7a0910
commit a9d0390426
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/MIPS/x86/CompBranch.cpp
View file

@ -490,6 +490,11 @@ void Jit::Comp_Syscall(u32 op)
{
FlushAll();
// If we're in a delay slot, this is off by one.
const int offset = js.inDelaySlot ? -1 : 0;
WriteDowncount(offset);
js.downcountAmount = -offset;
ABI_CallFunctionC((void *)&CallSyscall, op);
WriteSyscallExit();

17
Core/MIPS/x86/Jit.cpp
View file

@ -110,6 +110,12 @@ void Jit::FlushAll()
fpr.Flush(FLUSH_ALL);
}
void Jit::WriteDowncount(int offset)
{
const int downcount = js.downcountAmount + offset;
SUB(32, M(&currentMIPS->downcount), downcount > 127 ? Imm32(downcount) : Imm8(downcount));
}
void Jit::ClearCache()
{
blocks.Clear();
@ -240,7 +246,7 @@ void Jit::Comp_Generic(u32 op)
void Jit::WriteExit(u32 destination, int exit_num)
{
SUB(32, M(&currentMIPS->downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
WriteDowncount();
//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
@ -262,15 +268,15 @@ void Jit::WriteExit(u32 destination, int exit_num)
void Jit::WriteExitDestInEAX()
{
// TODO: Some wasted potential, dispatcher will alwa
// TODO: Some wasted potential, dispatcher will always read this back into EAX.
MOV(32, M(&mips_->pc), R(EAX));
SUB(32, M(&currentMIPS->downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
WriteDowncount();
JMP(asm_.dispatcher, true);
}
void Jit::WriteSyscallExit()
{
SUB(32, M(&currentMIPS->downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
WriteDowncount();
JMP(asm_.dispatcherCheckCoreState, true);
}
@ -282,8 +288,7 @@ bool Jit::CheckJitBreakpoint(u32 addr, int downcountOffset)
MOV(32, M(&mips_->pc), Imm32(js.compilerPC));
CALL((void *)&JitBreakpoint);
const int downcountEstimate = js.downcountAmount + downcountOffset;
SUB(32, M(&currentMIPS->downcount), downcountEstimate > 127 ? Imm32(downcountEstimate) : Imm8(downcountEstimate));
WriteDowncount(downcountOffset);
JMP(asm_.dispatcherCheckCoreState, true);
return true;

1
Core/MIPS/x86/Jit.h
View file

@ -103,6 +103,7 @@ public:
void ClearCacheAt(u32 em_address);
private:
void FlushAll();
void WriteDowncount(int offset = 0);
void WriteExit(u32 destination, int exit_num);
void WriteExitDestInEAX();