X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fr3000a.c;h=7e6f16b48182caf55a75ca95261b6e9f59983e96;hb=c979e8c288de90834ceecfd7a37543a44cdd9402;hp=e21d4883294a2dc66888895b843b7067a2db0c1b;hpb=943a507a4156b8f5b00e4431152e41eeb4dc6f3d;p=pcsx_rearmed.git

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index e21d4883..7e6f16b4 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -25,6 +25,7 @@
 #include "cdrom.h"
 #include "mdec.h"
 #include "gte.h"
+#include "psxinterpreter.h"
 
 R3000Acpu *psxCpu = NULL;
 #ifdef DRC_DISABLE
@@ -39,6 +40,7 @@ int psxInit() {
 		psxCpu = &psxInt;
 	} else psxCpu = &psxRec;
 #else
+	Config.Cpu = CPU_INTERPRETER;
 	psxCpu = &psxInt;
 #endif
 
@@ -81,19 +83,7 @@ void psxShutdown() {
 }
 
 void psxException(u32 code, u32 bd) {
-	#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);
-	}
+	psxRegs.code = fetch(psxRegs.pc);
 	
 	if (!Config.HLE && ((((psxRegs.code) >> 24) & 0xfe) == 0x4a)) {
 		// "hokuto no ken" / "Crash Bandicot 2" ...