From 48e74ef5e10804f8809fae397be4234e8bf613a7 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 26 Oct 2011 00:01:47 +0300 Subject: [PATCH 1/1] psxinterpreter: a bit more accurate Cause reg handling --- libpcsxcore/psxinterpreter.c | 8 ++++---- libpcsxcore/r3000a.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index 66730d97..ff494913 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -780,10 +780,9 @@ void psxMFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; } void psxCFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; } void psxTestSWInts() { - // the next code is untested, if u know please - // tell me if it works ok or not (linuzappz) if (psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x0300 && - psxRegs.CP0.n.Status & 0x1) { + psxRegs.CP0.n.Status & 0x1) { + psxRegs.CP0.n.Cause &= ~0x7c; psxException(psxRegs.CP0.n.Cause, branch); } } @@ -797,7 +796,8 @@ void MTC0(int reg, u32 val) { break; case 13: // Cause - psxRegs.CP0.n.Cause = val & ~(0xfc00); + psxRegs.CP0.n.Cause &= ~0x0300; + psxRegs.CP0.n.Cause |= val & 0x0300; psxTestSWInts(); break; diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index cccfa602..f5996acf 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -89,7 +89,7 @@ void psxException(u32 code, u32 bd) { } // Set the Cause - psxRegs.CP0.n.Cause = code; + psxRegs.CP0.n.Cause = (psxRegs.CP0.n.Cause & 0x300) | code; // Set the EPC & PC if (bd) { -- 2.39.2