drc: improved interrupt code for emu_if

4 files changed, 67 insertions, 7 deletions

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 3236945..d743b34 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -470,6 +470,8 @@ int SaveState(const char *file) {
 	f = gzopen(file, "wb");
 	if (f == NULL) return -1;
 
+	new_dyna_save();
+
 	gzwrite(f, (void *)PcsxHeader, 32);
 	gzwrite(f, (void *)&SaveVersion, sizeof(u32));
 	gzwrite(f, (void *)&Config.HLE, sizeof(boolean));
@@ -568,6 +570,7 @@ int LoadState(const char *file) {
 	mdecFreeze(f, 0);
 
 	gzclose(f);
+	new_dyna_restore();
 
 	return 0;
 }
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 428f58b..6c3d782 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -5,14 +5,15 @@
  * See the COPYING file in the top-level directory.
  */
 
-// pending_exception?
-// swi 0 in do_unalignedwritestub?
 #include <stdio.h>
 
 #include "emu_if.h"
 #include "pcsxmem.h"
 #include "../psxhle.h"
 #include "../r3000a.h"
+#include "../cdrom.h"
+#include "../psxdma.h"
+#include "../mdec.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
@@ -49,6 +50,46 @@ static void schedule_timeslice(void)
 #endif
 }
 
+typedef void (irq_func)();
+
+static irq_func * const irq_funcs[] = {
+	[PSXINT_SIO]	= sioInterrupt,
+	[PSXINT_CDR]	= cdrInterrupt,
+	[PSXINT_CDREAD]	= cdrReadInterrupt,
+	[PSXINT_GPUDMA]	= gpuInterrupt,
+	[PSXINT_MDECOUTDMA] = mdec1Interrupt,
+	[PSXINT_SPUDMA]	= spuInterrupt,
+};
+
+/* local dupe of psxBranchTest, using event_cycles */
+static void irq_test(void)
+{
+	u32 irqs = psxRegs.interrupt;
+	u32 cycle = psxRegs.cycle;
+	u32 irq, irq_bits;
+
+	if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
+		psxRcntUpdate();
+
+	// irq_funcs() may queue more irqs
+	psxRegs.interrupt = 0;
+
+	for (irq = 0, irq_bits = irqs; irq_bits != 0; irq++, irq_bits >>= 1) {
+		if (!(irq_bits & 1))
+			continue;
+		if ((s32)(cycle - event_cycles[irq]) >= 0) {
+			irqs &= ~(1 << irq);
+			irq_funcs[irq]();
+		}
+	}
+	psxRegs.interrupt |= irqs;
+
+	if ((psxHu32(0x1070) & psxHu32(0x1074)) && (Status & 0x401) == 0x401) {
+		psxException(0x400, 0);
+		pending_exception = 1;
+	}
+}
+
 void gen_interupt()
 {
 	evprintf("  +ge %08x, %u->%u\n", psxRegs.pc, psxRegs.cycle, next_interupt);
@@ -56,14 +97,14 @@ void gen_interupt()
 	psxRegs.cycle += 2;
 #endif
 
-	psxBranchTest();
+	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);
-
-	pending_exception = 1; /* FIXME */
 }
 
 void MTC0_()
@@ -77,9 +118,22 @@ void MTC0_()
 
 void check_interupt()
 {
+	/* FIXME (also asm) */
 	printf("ari64_check_interupt\n");
 }
 
+void new_dyna_save(void)
+{
+	// psxRegs.intCycle is always maintained, no need to convert
+}
+
+void new_dyna_restore(void)
+{
+	int i;
+	for (i = 0; i < PSXINT_NEWDRC_CHECK; i++)
+		event_cycles[i] = psxRegs.intCycle[i].sCycle + psxRegs.intCycle[i].cycle;
+}
+
 void *gte_handlers[64];
 
 /* from gte.txt.. not sure if this is any good. */
diff --git a/libpcsxcore/new_dynarec/linkage_arm.s b/libpcsxcore/new_dynarec/linkage_arm.s
index bc7ee9d..906c466 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.s
+++ b/libpcsxcore/new_dynarec/linkage_arm.s
@@ -150,8 +150,8 @@ interrupt = cycle + 4
 	.size	interrupt, 4
 intCycle = interrupt + 4
 	.type	intCycle, %object
-	.size	intCycle, 128
-psxRegs_end = intCycle + 128
+	.size	intCycle, 256
+psxRegs_end = intCycle + 256
 
 /* nd_pcsx_io */
 nd_pcsx_io = psxRegs_end
diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index a2fcca3..d436af7 100644
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -174,6 +174,9 @@ extern psxRegisters psxRegs;
 extern u32 event_cycles[PSXINT_COUNT];
 extern u32 next_interupt;
 
+void new_dyna_save(void);
+void new_dyna_restore(void);
+
 #define new_dyna_set_event(e, c) { \
 	s32 c_ = c; \
 	u32 abs_ = psxRegs.cycle + c_; \