diff options
| -rw-r--r-- | libpcsxcore/r3000a.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 98aff3a..1e8d0b0 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -79,6 +79,15 @@ void psxShutdown() { } void psxException(u32 code, u32 bd) { + if (!Config.HLE && (((PSXMu32(psxRegs.pc) >> 24) & 0xfe) == 0x4a)) { + // "hokuto no ken" / "Crash Bandicot 2" ... + // BIOS does not allow to return to GTE instructions + // (just skips it, supposedly because it's scheduled already) + // so we step over it with the interpreter + extern void execI(); + execI(); + } + // Set the Cause psxRegs.CP0.n.Cause = code; @@ -102,11 +111,6 @@ void psxException(u32 code, u32 bd) { psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) | ((psxRegs.CP0.n.Status & 0xf) << 2); - if (!Config.HLE && (((PSXMu32(psxRegs.CP0.n.EPC) >> 24) & 0xfe) == 0x4a)) { - // "hokuto no ken" / "Crash Bandicot 2" ... fix - PSXMu32ref(psxRegs.CP0.n.EPC)&= SWAPu32(~0x02000000); - } - if (Config.HLE) psxBiosException(); } |