Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 12:47:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Jit: Fix syscall outside delay slot.

Browse Source 
Doesn't happen in real games, but useful in debug code.
This commit is contained in:
Unknown W. Brackets 2017-06-04 09:15:13 -07:00
parent 80be3166af
commit 33b073c545
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/MIPS/ARM/ArmCompBranch.cpp
View File

@ -612,6 +612,11 @@ void ArmJit::Comp_Syscall(MIPSOpcode op)
RestoreRoundingMode();
js.downcountAmount = -offset;
if (!js.inDelaySlot) {
gpr.SetRegImm(SCRATCHREG1, GetCompilerPC() + 4);
MovToPC(SCRATCHREG1);
}
FlushAll();
SaveDowncount();

5
Core/MIPS/ARM64/Arm64CompBranch.cpp
View File

@ -594,6 +594,11 @@ void Arm64Jit::Comp_Syscall(MIPSOpcode op)
RestoreRoundingMode();
js.downcountAmount = -offset;
if (!js.inDelaySlot) {
gpr.SetRegImm(SCRATCH1, GetCompilerPC() + 4);
MovToPC(SCRATCH1);
}
FlushAll();
SaveStaticRegisters();

5
Core/MIPS/IR/IRCompBranch.cpp
View File

@ -380,6 +380,11 @@ void IRFrontend::Comp_Syscall(MIPSOpcode op) {
ir.Write(IROp::Downcount, 0, dcAmount & 0xFF, dcAmount >> 8);
js.downcountAmount = 0;
// If not in a delay slot, we need to update PC.
if (!js.inDelaySlot) {
ir.Write(IROp::SetPCConst, 0, ir.AddConstant(GetCompilerPC() + 4));
}
FlushAll();
RestoreRoundingMode();

4
Core/MIPS/x86/CompBranch.cpp
View File

@ -787,6 +787,10 @@ void Jit::Comp_Syscall(MIPSOpcode op)
RestoreRoundingMode();
js.downcountAmount = -offset;
if (!js.inDelaySlot) {
MOV(32, M(&mips_->pc), Imm32(GetCompilerPC() + 4));
}
#ifdef USE_PROFILER
// When profiling, we can't skip CallSyscall, since it times syscalls.
ABI_CallFunctionC(&CallSyscall, op.encoding);