X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fr3000a.c;h=e21d4883294a2dc66888895b843b7067a2db0c1b;hp=85b77cb44264ef89abd6127b8b0eb2e9d397a7cc;hb=a3203cf4f2f21b0f2f74c5e494e3f5ba58225eae;hpb=41e82ad46e60f9c3291ff81ebe4a07512b1194c5

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 85b77cb4..e21d4883 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -81,7 +81,21 @@ void psxShutdown() {
 }
 
 void psxException(u32 code, u32 bd) {
-	if (!Config.HLE && ((((psxRegs.code = PSXMu32(psxRegs.pc)) >> 24) & 0xfe) == 0x4a)) {
+	#ifdef ICACHE_EMULATION
+	/* Dynarecs may use this codepath and crash as a result.
+	 * This should only be used for the interpreter. - Gameblabla
+	 * */
+	if (Config.icache_emulation && Config.Cpu == CPU_INTERPRETER)
+	{
+		psxRegs.code = SWAPu32(*Read_ICache(psxRegs.pc));
+	}
+	else
+	#endif
+	{
+		psxRegs.code = PSXMu32(psxRegs.pc);
+	}
+	
+	if (!Config.HLE && ((((psxRegs.code) >> 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)
@@ -98,7 +112,6 @@ void psxException(u32 code, u32 bd) {
 #ifdef PSXCPU_LOG
 		PSXCPU_LOG("bd set!!!\n");
 #endif
-		SysPrintf("bd set!!!\n");
 		psxRegs.CP0.n.Cause |= 0x80000000;
 		psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
 	} else