X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=0942874841875bab6c6383ac2ae8d22751003d55;hb=68b3faeed93986cef07197ee2471a9e561803dbc;hp=572c48262cd07b1af96617e3c137c56313c98751;hpb=76739a0818a86aa9f74715d2d07173cfc9854ac0;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 572c4826..09428748 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -61,6 +61,8 @@ static irq_func * const irq_funcs[] = {
 	[PSXINT_SPUDMA]	= spuInterrupt,
 	[PSXINT_MDECINDMA] = mdec0Interrupt,
 	[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
+	[PSXINT_CDRDMA] = cdrDmaInterrupt,
+	[PSXINT_CDRLID] = cdrLidSeekInterrupt,
 };
 
 /* local dupe of psxBranchTest, using event_cycles */
@@ -133,7 +135,7 @@ void new_dyna_save(void)
 void new_dyna_restore(void)
 {
 	int i;
-	for (i = 0; i < PSXINT_NEWDRC_CHECK; i++)
+	for (i = 0; i < PSXINT_COUNT; i++)
 		event_cycles[i] = psxRegs.intCycle[i].sCycle + psxRegs.intCycle[i].cycle;
 }
 
@@ -175,7 +177,9 @@ static void ari64_reset()
 	pending_exception = 1;
 }
 
-static void ari64_execute()
+// execute until predefined leave points
+// (HLE softcall exit and BIOS fastboot end)
+static void ari64_execute_until()
 {
 	schedule_timeslice();
 
@@ -188,6 +192,14 @@ static void ari64_execute()
 		psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 }
 
+static void ari64_execute()
+{
+	while (!stop) {
+		ari64_execute_until();
+		evprintf("drc left @%08x\n", psxRegs.pc);
+	}
+}
+
 static void ari64_clear(u32 addr, u32 size)
 {
 	u32 start, end;
@@ -229,7 +241,7 @@ R3000Acpu psxRec = {
 	ari64_reset,
 #if defined(__arm__)
 	ari64_execute,
-	ari64_execute,
+	ari64_execute_until,
 #else
 	intExecuteT,
 	intExecuteBlockT,