X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=e89b635fb3acadbddb5d276ce609acec7dd5ec27;hb=da65071fd7ceac663bb951b13da2563d7b16431d;hp=aac9f78c0bf9d54e8b6414e630aedbceffd16309;hpb=679d5ee3c46235923a99391922de1df0239e9ff3;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index aac9f78c..e89b635f 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -9,12 +9,10 @@
 
 #include "emu_if.h"
 #include "pcsxmem.h"
+#include "events.h"
 #include "../psxhle.h"
 #include "../psxinterpreter.h"
 #include "../r3000a.h"
-#include "../cdrom.h"
-#include "../psxdma.h"
-#include "../mdec.h"
 #include "../gte_arm.h"
 #include "../gte_neon.h"
 #define FLAGLESS
@@ -25,91 +23,11 @@
 //#define evprintf printf
 #define evprintf(...)
 
-char invalid_code[0x100000];
-u32 event_cycles[PSXINT_COUNT];
-
-static void schedule_timeslice(void)
-{
-	u32 i, c = psxRegs.cycle;
-	u32 irqs = psxRegs.interrupt;
-	s32 min, dif;
-
-	min = PSXCLK;
-	for (i = 0; irqs != 0; i++, irqs >>= 1) {
-		if (!(irqs & 1))
-			continue;
-		dif = event_cycles[i] - c;
-		//evprintf("  ev %d\n", dif);
-		if (0 < dif && dif < min)
-			min = dif;
-	}
-	next_interupt = c + min;
-}
-
-static void unusedInterrupt()
-{
-}
-
-typedef void (irq_func)();
-
-static irq_func * const irq_funcs[] = {
-	[PSXINT_SIO]	= sioInterrupt,
-	[PSXINT_CDR]	= cdrInterrupt,
-	[PSXINT_CDREAD]	= cdrPlayReadInterrupt,
-	[PSXINT_GPUDMA]	= gpuInterrupt,
-	[PSXINT_MDECOUTDMA] = mdec1Interrupt,
-	[PSXINT_SPUDMA]	= spuInterrupt,
-	[PSXINT_MDECINDMA] = mdec0Interrupt,
-	[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
-	[PSXINT_CDRDMA] = cdrDmaInterrupt,
-	[PSXINT_CDRLID] = cdrLidSeekInterrupt,
-	[PSXINT_CDRPLAY_OLD] = unusedInterrupt,
-	[PSXINT_SPU_UPDATE] = spuUpdate,
-	[PSXINT_RCNT] = psxRcntUpdate,
-};
-
-/* local dupe of psxBranchTest, using event_cycles */
-static void irq_test(void)
-{
-	u32 cycle = psxRegs.cycle;
-	u32 irq, irq_bits;
-
-	for (irq = 0, irq_bits = psxRegs.interrupt; irq_bits != 0; irq++, irq_bits >>= 1) {
-		if (!(irq_bits & 1))
-			continue;
-		if ((s32)(cycle - event_cycles[irq]) >= 0) {
-			// note: irq_funcs() also modify psxRegs.interrupt
-			psxRegs.interrupt &= ~(1u << irq);
-			irq_funcs[irq]();
-		}
-	}
-
-	if ((psxHu32(0x1070) & psxHu32(0x1074)) && (psxRegs.CP0.n.Status & 0x401) == 0x401) {
-		psxException(0x400, 0);
-		pending_exception = 1;
-	}
-}
-
-void gen_interupt()
-{
-	evprintf("  +ge %08x, %u->%u (%d)\n", psxRegs.pc, psxRegs.cycle,
-		next_interupt, next_interupt - psxRegs.cycle);
-
-	irq_test();
-	//psxBranchTest();
-	//pending_exception = 1;
-
-	schedule_timeslice();
-
-	evprintf("  -ge %08x, %u->%u (%d)\n", psxRegs.pc, psxRegs.cycle,
-		next_interupt, next_interupt - psxRegs.cycle);
-}
-
 void pcsx_mtc0(u32 reg, u32 val)
 {
 	evprintf("MTC0 %d #%x @%08x %u\n", reg, val, psxRegs.pc, psxRegs.cycle);
 	MTC0(&psxRegs, reg, val);
-	gen_interupt();
+	gen_interupt(&psxRegs.CP0);
 	if (psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x0300) // possible sw irq
 		pending_exception = 1;
 }
@@ -120,18 +38,6 @@ void pcsx_mtc0_ds(u32 reg, u32 val)
 	MTC0(&psxRegs, reg, val);
 }
 
-void new_dyna_before_save(void)
-{
-	psxRegs.interrupt &= ~(1 << PSXINT_RCNT); // old savestate compat
-
-	// psxRegs.intCycle is always maintained, no need to convert
-}
-
-void new_dyna_after_save(void)
-{
-	psxRegs.interrupt |= 1 << PSXINT_RCNT;
-}
-
 static void new_dyna_restore(void)
 {
 	int i;
@@ -330,7 +236,6 @@ static int ari64_init()
 
 static void ari64_reset()
 {
-	printf("ari64_reset\n");
 	new_dyna_pcsx_mem_reset();
 	new_dynarec_invalidate_all_pages();
 	new_dyna_restore();
@@ -360,6 +265,17 @@ static void ari64_execute()
 	}
 }
 
+static void ari64_execute_block(enum blockExecCaller caller)
+{
+	if (caller == EXEC_CALLER_BOOT)
+		stop++;
+
+	ari64_execute_until();
+
+	if (caller == EXEC_CALLER_BOOT)
+		stop--;
+}
+
 static void ari64_clear(u32 addr, u32 size)
 {
 	size *= 4; /* PCSX uses DMA units (words) */
@@ -369,14 +285,17 @@ static void ari64_clear(u32 addr, u32 size)
 	new_dynarec_invalidate_range(addr, addr + size);
 }
 
-static void ari64_notify(int note, void *data) {
+static void ari64_notify(enum R3000Anote note, void *data) {
 	switch (note)
 	{
 	case R3000ACPU_NOTIFY_CACHE_UNISOLATED:
 	case R3000ACPU_NOTIFY_CACHE_ISOLATED:
 		new_dyna_pcsx_mem_isolate(note == R3000ACPU_NOTIFY_CACHE_ISOLATED);
 		break;
-	default:
+	case R3000ACPU_NOTIFY_BEFORE_SAVE:
+		break;
+	case R3000ACPU_NOTIFY_AFTER_LOAD:
+		ari64_reset();
 		break;
 	}
 }
@@ -407,7 +326,7 @@ R3000Acpu psxRec = {
 	ari64_init,
 	ari64_reset,
 	ari64_execute,
-	ari64_execute_until,
+	ari64_execute_block,
 	ari64_clear,
 	ari64_notify,
 	ari64_apply_config,
@@ -418,7 +337,7 @@ R3000Acpu psxRec = {
 
 unsigned int address;
 int pending_exception, stop;
-unsigned int next_interupt;
+u32 next_interupt;
 int new_dynarec_did_compile;
 int cycle_multiplier_old;
 int new_dynarec_hacks_pergame;