X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fr3000a.c;h=f5996acf7723134617de5d8dec025eb98ee0f48e;hp=98aff3a385af2efd974c128cb31514571780899b;hb=8f00f96ca84ba1d8ba30d4850c0b1d143efa5989;hpb=c24732c066beea96215e4c232af6debf1deb5f69

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 98aff3a3..f5996acf 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -79,8 +79,17 @@ void psxShutdown() {
 }
 
 void psxException(u32 code, u32 bd) {
+	if (!Config.HLE && ((((psxRegs.code = 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 execute it here
+		extern void (*psxCP2[64])(void *cp2regs);
+		psxCP2[psxRegs.code & 0x3f](&psxRegs.CP2D);
+	}
+
 	// Set the Cause
-	psxRegs.CP0.n.Cause = code;
+	psxRegs.CP0.n.Cause = (psxRegs.CP0.n.Cause & 0x300) | code;
 
 	// Set the EPC & PC
 	if (bd) {
@@ -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();
 }