X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=3bfec4e7470f88208f3e00dc2586b22a07e064d8;hp=0942874841875bab6c6383ac2ae8d22751003d55;hb=7f457614c936a6f37d12c1885bd504a7a7823690;hpb=9f8b032dc5074e29f2e93ce06651f6da3bb70a86

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 09428748..3bfec4e7 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -63,6 +63,7 @@ static irq_func * const irq_funcs[] = {
 	[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
 	[PSXINT_CDRDMA] = cdrDmaInterrupt,
 	[PSXINT_CDRLID] = cdrLidSeekInterrupt,
+	[PSXINT_CDRPLAY] = cdrPlayInterrupt,
 };
 
 /* local dupe of psxBranchTest, using event_cycles */
@@ -174,6 +175,7 @@ static void ari64_reset()
 	printf("ari64_reset\n");
 	new_dyna_pcsx_mem_reset();
 	invalidate_all_pages();
+	new_dyna_restore();
 	pending_exception = 1;
 }
 
@@ -202,23 +204,20 @@ static void ari64_execute()
 
 static void ari64_clear(u32 addr, u32 size)
 {
-	u32 start, end;
+	u32 start, end, main_ram;
 
 	size *= 4; /* PCSX uses DMA units */
 
 	evprintf("ari64_clear %08x %04x\n", addr, size);
 
 	/* check for RAM mirrors */
-	if ((addr & ~0xe0600000) < 0x200000) {
-		addr &= ~0xe0600000;
-		addr |=  0x80000000;
-	}
+	main_ram = (addr & 0xffe00000) == 0x80000000;
 
 	start = addr >> 12;
 	end = (addr + size) >> 12;
 
 	for (; start <= end; start++)
-		if (!invalid_code[start])
+		if (!main_ram || !invalid_code[start])
 			invalidate_block(start);
 }