X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libpcsxcore%2Flightrec%2Fplugin.c;h=dd1f40c94f2e15472ceae4f38c14e9823dc66f9c;hb=20196899e40390c7f43be2bc02d99c55062c310f;hp=bd3ee222581747a35446e44cfc8fe4302cbc3d61;hpb=cdfa353653a8dec134873b2e4b38a7ebf98fc0ef;p=pcsx_rearmed.git

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index bd3ee222..dd1f40c9 100644
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -443,15 +443,15 @@ static void lightrec_restore_regs(struct lightrec_state *state)
 extern void intExecuteBlock();
 extern void gen_interupt();
 
-static void lightrec_plugin_execute_block(void)
+static void lightrec_plugin_execute_internal(bool block_only)
 {
-	u32 old_pc = psxRegs.pc;
 	u32 flags;
 
 	gen_interupt();
 
 	// step during early boot so that 0x80030000 fastboot hack works
-	if (booting)
+	booting = block_only;
+	if (block_only)
 		next_interupt = psxRegs.cycle;
 
 	if (use_pcsx_interpreter) {
@@ -482,9 +482,6 @@ static void lightrec_plugin_execute_block(void)
 
 		if (flags & LIGHTREC_EXIT_SYSCALL)
 			psxException(0x20, 0);
-
-		if (booting && (psxRegs.pc & 0xff800000) == 0x80000000)
-			booting = false;
 	}
 
 	if ((psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x300) &&
@@ -500,7 +497,12 @@ static void lightrec_plugin_execute(void)
 	extern int stop;
 
 	while (!stop)
-		lightrec_plugin_execute_block();
+		lightrec_plugin_execute_internal(false);
+}
+
+static void lightrec_plugin_execute_block(void)
+{
+	lightrec_plugin_execute_internal(true);
 }
 
 static void lightrec_plugin_clear(u32 addr, u32 size)
@@ -512,21 +514,24 @@ static void lightrec_plugin_clear(u32 addr, u32 size)
 		lightrec_invalidate(lightrec_state, addr, size * 4);
 }
 
-static void lightrec_plugin_notify(int note, void *data)
+static void lightrec_plugin_sync_regs_to_pcsx(void);
+static void lightrec_plugin_sync_regs_from_pcsx(void);
+
+static void lightrec_plugin_notify(enum R3000Anote note, void *data)
 {
-	/*
-	To change once proper icache emulation is emulated
 	switch (note)
 	{
-		case R3000ACPU_NOTIFY_CACHE_UNISOLATED:
-			lightrec_plugin_clear(0, 0x200000/4);
-			break;
-		case R3000ACPU_NOTIFY_CACHE_ISOLATED:
-		// Sent from psxDma3().
-		case R3000ACPU_NOTIFY_DMA3_EXE_LOAD:
-		default:
-			break;
-	}*/
+	case R3000ACPU_NOTIFY_CACHE_ISOLATED:
+	case R3000ACPU_NOTIFY_CACHE_UNISOLATED:
+		/* not used, lightrec calls lightrec_enable_ram() instead */
+		break;
+	case R3000ACPU_NOTIFY_BEFORE_SAVE:
+		lightrec_plugin_sync_regs_to_pcsx();
+		break;
+	case R3000ACPU_NOTIFY_AFTER_LOAD:
+		lightrec_plugin_sync_regs_from_pcsx();
+		break;
+	}
 }
 
 static void lightrec_plugin_apply_config()
@@ -552,11 +557,9 @@ static void lightrec_plugin_reset(void)
 
 	regs->cp0[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
 	regs->cp0[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
-
-	booting = true;
 }
 
-void lightrec_plugin_prepare_load_state(void)
+static void lightrec_plugin_sync_regs_from_pcsx(void)
 {
 	struct lightrec_registers *regs;
 
@@ -568,7 +571,7 @@ void lightrec_plugin_prepare_load_state(void)
 	lightrec_invalidate_all(lightrec_state);
 }
 
-void lightrec_plugin_prepare_save_state(void)
+static void lightrec_plugin_sync_regs_to_pcsx(void)
 {
 	struct lightrec_registers *regs;