X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxinterpreter.c;h=2ffab69a257b274a5e19cc6907b9c7112b03cc37;hb=e9183d95fbc7a6ea5851d33955751d43a86a191f;hp=f473ddf6be8f87d24321091ab38923e41c00439b;hpb=de6dbc5289bc76996ad4e3133e0eeb90e13b2ed4;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index f473ddf6..2ffab69a 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -112,7 +112,8 @@ static void intException(psxRegisters *regs, u32 pc, u32 cause)
 	if (cause != 0x20) {
 		//FILE *f = fopen("/tmp/psx_ram.bin", "wb");
 		//fwrite(psxM, 1, 0x200000, f); fclose(f);
-		log_unhandled("exception %08x @%08x\n", cause, pc);
+		log_unhandled("exception %08x @%08x ra=%08x\n",
+			cause, pc, regs->GPR.n.ra);
 	}
 	dloadFlush(regs);
 	regs->pc = pc;
@@ -127,6 +128,19 @@ static void intExceptionInsn(psxRegisters *regs, u32 cause)
 	intException(regs, regs->pc - 4, cause);
 }
 
+static noinline void intExceptionReservedInsn(psxRegisters *regs)
+{
+#ifdef DO_EXCEPTION_RESERVEDI
+	static u32 ppc_ = ~0u;
+	if (regs->pc != ppc_) {
+		SysPrintf("reserved instruction %08x @%08x ra=%08x\n",
+			regs->code, regs->pc - 4, regs->GPR.n.ra);
+		ppc_ = regs->pc;
+	}
+	intExceptionInsn(regs, R3000E_RI << 2);
+#endif
+}
+
 // 29  Enable for 80000000-ffffffff
 // 30  Enable for 00000000-7fffffff
 // 31  Enable exception
@@ -922,10 +936,8 @@ OP(psxSWRe) { if (checkST(regs_, _oB_     , 0)) doSWR(regs_, _Rt_, _oB_); }
 *********************************************************/
 OP(psxMFC0) {
 	u32 r = _Rd_;
-#ifdef DO_EXCEPTION_RESERVEDI
 	if (unlikely(0x00000417u & (1u << r)))
-		intExceptionInsn(regs_, R3000E_RI << 2);
-#endif
+		intExceptionReservedInsn(regs_);
 	doLoad(regs_, _Rt_, regs_->CP0.r[r]);
 }
 
@@ -973,9 +985,7 @@ static inline void psxNULLne(psxRegisters *regs) {
 
 OP(psxNULL) {
 	psxNULLne(regs_);
-#ifdef DO_EXCEPTION_RESERVEDI
-	intExceptionInsn(regs_, R3000E_RI << 2);
-#endif
+	intExceptionReservedInsn(regs_);
 }
 
 void gteNULL(struct psxCP2Regs *regs) {
@@ -1117,7 +1127,9 @@ OP(psxHLE) {
 		psxSWCx(regs_, code);
 		return;
 	}
+	dloadFlush(regs_);
 	psxHLEt[hleCode]();
+	branchSeen = 1;
 }
 
 static void (INT_ATTR *psxBSC[64])(psxRegisters *regs_, u32 code) = {