X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fr3000a.c;h=3288f5c33bbeef81028f34a25bf729c3e5a47820;hb=7a8117168d6b9ad083757e013049c0e45734f3fb;hp=82eb88578534c9a3411eb5806b655aacb7cae03b;hpb=7931825ed8ef51dab3e37475d8126103ebc9fb6f;p=pcsx_rearmed.git

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 82eb8857..3288f5c3 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -27,12 +27,14 @@
 #include "gte.h"
 
 R3000Acpu *psxCpu = NULL;
+#ifndef NEW_DYNAREC
 psxRegisters psxRegs;
+#endif
 
 int psxInit() {
-	SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
+	SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);
 
-#ifdef PSXREC
+#if defined(NEW_DYNAREC) || defined(LIGHTREC)
 	if (Config.Cpu == CPU_INTERPRETER) {
 		psxCpu = &psxInt;
 	} else psxCpu = &psxRec;
@@ -50,8 +52,8 @@ int psxInit() {
 void psxReset() {
 	psxMemReset();
 
-	memset(&psxRegs, 0, sizeof(psxRegs));
-
+	memset(&psxRegs, 0x00, sizeof(psxRegs));
+	writeok = TRUE;
 	psxRegs.pc = 0xbfc00000; // Start in bootstrap
 
 	psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
@@ -79,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
+	/* Without the CPU_INTERPRETER condition, this will make Lightrec crash.
+	 * Hopefully a better solution than this mess is found. - 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)