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

Don't clear js.afterOp in WriteExit*().

Browse source 
It needs to be handled in each exit, not just the first one.

Fixes #5587.
This commit is contained in:
Unknown W. Brackets 2014-03-02 14:23:27 -08:00
parent 0f36b45f2e
commit 601fc72ac6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,6 +362,9 @@ const u8 *Jit::DoJit(u32 em_address, JitBlock *b)
js.afterOp = JitState::AFTER_NONE;
}
if (js.afterOp & JitState::AFTER_MEMCHECK_CLEANUP) {
js.afterOp &= ~JitState::AFTER_MEMCHECK_CLEANUP;
}
js.compilerPC += 4;
js.numInstructions++;
@ -539,8 +542,6 @@ void Jit::WriteExit(u32 destination, int exit_num)
MOV(32, M(&mips_->pc), Imm32(js.compilerPC));
WriteSyscallExit();
SetJumpTarget(skipCheck);
js.afterOp = JitState::AFTER_NONE;
}
WriteDowncount();
@ -577,8 +578,6 @@ void Jit::WriteExitDestInReg(X64Reg reg)
MOV(32, M(&mips_->pc), Imm32(js.compilerPC));
WriteSyscallExit();
SetJumpTarget(skipCheck);
js.afterOp = JitState::AFTER_NONE;
}
WriteDowncount();
@ -620,9 +619,8 @@ void Jit::WriteExitDestInReg(X64Reg reg)
void Jit::WriteSyscallExit()
{
WriteDowncount();
if ((js.afterOp & JitState::AFTER_MEMCHECK_CLEANUP) != 0) {
if (js.afterOp & JitState::AFTER_MEMCHECK_CLEANUP) {
ABI_CallFunction(&JitMemCheckCleanup);
js.afterOp &= ~JitState::AFTER_MEMCHECK_CLEANUP;
}
JMP(asm_.dispatcherCheckCoreState, true);
}