eliminate event code duplication

diff --git a/Makefile b/Makefile
index 6ef105a..864565e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,8 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
        libpcsxcore/decode_xa.o libpcsxcore/mdec.o \
        libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \
        libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o \
-       libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \
+       libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o \
+       libpcsxcore/psxevents.o libpcsxcore/r3000a.o \
        libpcsxcore/sio.o libpcsxcore/spu.o libpcsxcore/gpu.o
 OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
 
@@ -152,7 +153,7 @@ OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 else
 CFLAGS += -DDRC_DISABLE
 endif
-OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/events.o
+OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/pcsxmem_inline.c
 ifdef DRC_DBG
 libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64

diff --git a/jni/Android.mk b/jni/Android.mk
index 971c45d..28af8e8 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -35,6 +35,7 @@ SOURCES_C := $(CORE_DIR)/cdriso.c \
              $(CORE_DIR)/psxcommon.c \
              $(CORE_DIR)/psxcounters.c \
              $(CORE_DIR)/psxdma.c \
+             $(CORE_DIR)/psxevents.c \
              $(CORE_DIR)/psxhw.c \
              $(CORE_DIR)/psxinterpreter.c \
              $(CORE_DIR)/psxmem.c \
@@ -141,7 +142,6 @@ ifeq ($(HAVE_ARI64),1)
   endif
 endif
   SOURCES_C   += $(DYNAREC_DIR)/emu_if.c
-  SOURCES_C   += $(DYNAREC_DIR)/events.c
 
 ifeq ($(HAVE_LIGHTREC),1)
   COREFLAGS   += -DLIGHTREC -DLIGHTREC_STATIC

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5404c46..047172c 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -26,6 +26,7 @@
 #include "misc.h"
 #include "ppf.h"
 #include "psxdma.h"
+#include "psxevents.h"
 #include "arm_features.h"
 
 /* logging */
@@ -242,14 +243,6 @@ static void sec2msf(unsigned int s, u8 *msf) {
        msf[2] = s;
 }
 
-// cdrInterrupt
-#define CDR_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_CDR); \
-       psxRegs.intCycle[PSXINT_CDR].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_CDR].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_CDR, eCycle); \
-}
-
 // cdrPlayReadInterrupt
 #define CDRPLAYREAD_INT(eCycle, isFirst) { \
        u32 e_ = eCycle; \
@@ -259,15 +252,7 @@ static void sec2msf(unsigned int s, u8 *msf) {
        else \
                psxRegs.intCycle[PSXINT_CDREAD].sCycle += psxRegs.intCycle[PSXINT_CDREAD].cycle; \
        psxRegs.intCycle[PSXINT_CDREAD].cycle = e_; \
-       new_dyna_set_event_abs(PSXINT_CDREAD, psxRegs.intCycle[PSXINT_CDREAD].sCycle + e_); \
-}
-
-// cdrLidSeekInterrupt
-#define CDRLID_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_CDRLID); \
-       psxRegs.intCycle[PSXINT_CDRLID].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_CDRLID].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_CDRLID, eCycle); \
+       set_event_raw_abs(PSXINT_CDREAD, psxRegs.intCycle[PSXINT_CDREAD].sCycle + e_); \
 }
 
 #define StopReading() { \
@@ -331,7 +316,7 @@ void cdrLidSeekInterrupt(void)
                {
                        memset(cdr.Prev, 0xff, sizeof(cdr.Prev));
                        cdr.DriveState = DRIVESTATE_LID_OPEN;
-                       CDRLID_INT(0x800);
+                       set_event(PSXINT_CDRLID, 0x800);
                }
                break;
 
@@ -347,7 +332,7 @@ void cdrLidSeekInterrupt(void)
                        // only sometimes does that
                        // (not done when lots of commands are sent?)
 
-                       CDRLID_INT(cdReadTime * 30);
+                       set_event(PSXINT_CDRLID, cdReadTime * 30);
                        break;
                }
                else if (cdr.StatP & STATUS_ROTATING) {
@@ -361,12 +346,12 @@ void cdrLidSeekInterrupt(void)
                        // and is only cleared by CdlNop
 
                        cdr.DriveState = DRIVESTATE_RESCAN_CD;
-                       CDRLID_INT(cdReadTime * 105);
+                       set_event(PSXINT_CDRLID, cdReadTime * 105);
                        break;
                }
 
                // recheck for close
-               CDRLID_INT(cdReadTime * 3);
+               set_event(PSXINT_CDRLID, cdReadTime * 3);
                break;
 
        case DRIVESTATE_RESCAN_CD:
@@ -375,7 +360,7 @@ void cdrLidSeekInterrupt(void)
 
                // this is very long on real hardware, over 6 seconds
                // make it a bit faster here...
-               CDRLID_INT(cdReadTime * 150);
+               set_event(PSXINT_CDRLID, cdReadTime * 150);
                break;
 
        case DRIVESTATE_PREPARE_CD:
@@ -385,7 +370,7 @@ void cdrLidSeekInterrupt(void)
                }
                else {
                        SetPlaySeekRead(cdr.StatP, STATUS_SEEK);
-                       CDRLID_INT(cdReadTime * 26);
+                       set_event(PSXINT_CDRLID, cdReadTime * 26);
                }
                break;
        }
@@ -1142,7 +1127,7 @@ void cdrInterrupt(void) {
                        // yes, it really sets STATUS_SHELLOPEN
                        cdr.StatP |= STATUS_SHELLOPEN;
                        cdr.DriveState = DRIVESTATE_RESCAN_CD;
-                       CDRLID_INT(20480);
+                       set_event(PSXINT_CDRLID, 20480);
                        start_rotating = 1;
                        break;
 
@@ -1220,7 +1205,7 @@ void cdrInterrupt(void) {
 
        if (second_resp_time) {
                cdr.CmdInProgress = Cmd | 0x100;
-               CDR_INT(second_resp_time);
+               set_event(PSXINT_CDR, second_resp_time);
        }
        else if (cdr.Cmd && cdr.Cmd != (Cmd & 0xff)) {
                cdr.CmdInProgress = cdr.Cmd;
@@ -1469,7 +1454,7 @@ void cdrWrite1(unsigned char rt) {
        if (!cdr.CmdInProgress) {
                cdr.CmdInProgress = rt;
                // should be something like 12k + controller delays
-               CDR_INT(5000);
+               set_event(PSXINT_CDR, 5000);
        }
        else {
                CDR_LOG_I("cmd while busy: %02x, prev %02x, busy %02x\n",
@@ -1550,7 +1535,7 @@ void cdrWrite3(unsigned char rt) {
                                        c = 2048 - (psxRegs.cycle - nextCycle);
                                        c = MAX_VALUE(c, 512);
                                }
-                               CDR_INT(c);
+                               set_event(PSXINT_CDR, c);
                        }
                }
                cdr.Stat &= ~rt;
@@ -1640,7 +1625,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
                        }
                        psxCpu->Clear(madr, cdsize / 4);
 
-                       CDRDMA_INT((cdsize/4) * 24);
+                       set_event(PSXINT_CDRDMA, (cdsize / 4) * 24);
 
                        HW_DMA3_CHCR &= SWAPu32(~0x10000000);
                        if (chcr & 0x100) {

diff --git a/libpcsxcore/gpu.c b/libpcsxcore/gpu.c
index 1eadf59..2416405 100644 (file)
--- a/libpcsxcore/gpu.c
+++ b/libpcsxcore/gpu.c
@@ -26,7 +26,7 @@ void gpu_state_change(int what)
                break;
        case PGS_PRIMITIVE_START:
                HW_GPU_STATUS &= ~SWAP32(PSXGPU_nBUSY);
-               GPUDMA_INT(200); // see gpuInterrupt
+               set_event(PSXINT_GPUDMA, 200); // see gpuInterrupt
                break;
        }
 }

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index d51fbc2..703726e 100644 (file)
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -20,7 +20,7 @@
 #include "../r3000a.h"
 #include "../psxinterpreter.h"
 #include "../psxhle.h"
-#include "../new_dynarec/events.h"
+#include "../psxevents.h"
 
 #include "../frontend/main.h"
 

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 612fe97..c0f2cfd 100644 (file)
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -525,7 +525,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
                        break;
        }
 
-       MDECINDMA_INT(size);
+       set_event(PSXINT_MDECINDMA, size);
 }
 
 void mdec0Interrupt()
@@ -625,7 +625,7 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
        }
        
                /* define the power of mdec */
-               MDECOUTDMA_INT(words * MDEC_BIAS);
+               set_event(PSXINT_MDECOUTDMA, words * MDEC_BIAS);
                /* some CPU stalling */
                psxRegs.cycle += words;
        }

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 8997c0b..f332f43 100644 (file)
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -769,6 +769,7 @@ int LoadState(const char *file) {
        new_dyna_freeze(f, 0);
        padFreeze(f, 0);
 
+       events_restore();
        if (Config.HLE)
                psxBiosCheckExe(biosBranchCheckOld, 0x60, 1);
 

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 9d8df34..6c1b48c 100644 (file)
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -9,10 +9,10 @@
 
 #include "emu_if.h"
 #include "pcsxmem.h"
-#include "events.h"
 #include "../psxhle.h"
 #include "../psxinterpreter.h"
 #include "../psxcounters.h"
+#include "../psxevents.h"
 #include "../r3000a.h"
 #include "../gte_arm.h"
 #include "../gte_neon.h"
@@ -41,19 +41,6 @@ void pcsx_mtc0_ds(u32 reg, u32 val)
        MTC0(&psxRegs, reg, val);
 }
 
-static void new_dyna_restore(void)
-{
-       int i;
-       for (i = 0; i < PSXINT_COUNT; i++)
-               event_cycles[i] = psxRegs.intCycle[i].sCycle + psxRegs.intCycle[i].cycle;
-
-       event_cycles[PSXINT_RCNT] = psxNextsCounter + psxNextCounter;
-       psxRegs.interrupt |=  1 << PSXINT_RCNT;
-       psxRegs.interrupt &= (1 << PSXINT_COUNT) - 1;
-
-       new_dyna_pcsx_mem_load_state();
-}
-
 void new_dyna_freeze(void *f, int mode)
 {
        const char header_save[8] = "ariblks";
@@ -72,7 +59,7 @@ void new_dyna_freeze(void *f, int mode)
                SaveFuncs.write(f, addrs, size);
        }
        else {
-               new_dyna_restore();
+               new_dyna_pcsx_mem_load_state();
 
                bytes = SaveFuncs.read(f, header, sizeof(header));
                if (bytes != sizeof(header) || strcmp(header, header_save)) {
@@ -241,7 +228,7 @@ static void ari64_reset()
 {
        new_dyna_pcsx_mem_reset();
        new_dynarec_invalidate_all_pages();
-       new_dyna_restore();
+       new_dyna_pcsx_mem_load_state();
        pending_exception = 1;
 }
 

diff --git a/libpcsxcore/new_dynarec/events.h b/libpcsxcore/new_dynarec/events.h
deleted file mode 100644 (file)
index 5f57f37..0000000
--- a/libpcsxcore/new_dynarec/events.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "../psxcommon.h"
-
-extern int stop;
-
-union psxCP0Regs_;
-u32  schedule_timeslice(void);
-void gen_interupt(union psxCP0Regs_ *cp0);

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 11011d3..af3c55f 100644 (file)
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -36,7 +36,7 @@
 #include "sio.h"
 #include "psxhle.h"
 #include "psxinterpreter.h"
-#include "new_dynarec/events.h"
+#include "psxevents.h"
 #include <zlib.h>
 
 #ifndef PSXBIOS_LOG

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 02191c7..d0d45ec 100644 (file)
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -22,6 +22,7 @@
  */
 
 #include "psxcounters.h"
+#include "psxevents.h"
 #include "gpu.h"
 //#include "debug.h"
 #define DebugVSync()
@@ -232,8 +233,7 @@ void psxRcntSet()
         }
     }
 
-    psxRegs.interrupt |= (1 << PSXINT_RCNT);
-    new_dyna_set_event(PSXINT_RCNT, psxNextCounter);
+    set_event(PSXINT_RCNT, psxNextCounter);
 }
 
 /******************************************************************************/

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 0ffec81..2457096 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -67,7 +67,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        // This should be much slower, like 12+ cycles/byte, it's like
                        // that because the CPU runs too fast and fifo is not emulated.
                        // See also set_dma_end().
-                       SPUDMA_INT(words * 4);
+                       set_event(PSXINT_SPUDMA, words * 4);
                        return;
 
                case 0x01000200: //spu to cpu transfer
@@ -78,7 +78,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        psxCpu->Clear(madr, words_copy);
 
                        HW_DMA4_MADR = SWAPu32(madr + words_copy * 4);
-                       SPUDMA_INT(words * 4);
+                       set_event(PSXINT_SPUDMA, words * 4);
                        return;
 
                default:
@@ -159,7 +159,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        // careful: gpu_state_change() also messes with this
                        HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
                        // already 32-bit word size ((size * 4) / 4)
-                       GPUDMA_INT(words / 4);
+                       set_event(PSXINT_GPUDMA, words / 4);
                        return;
 
                case 0x01000201: // mem2vram
@@ -182,7 +182,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        // careful: gpu_state_change() also messes with this
                        HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
                        // already 32-bit word size ((size * 4) / 4)
-                       GPUDMA_INT(words / 4);
+                       set_event(PSXINT_GPUDMA, words / 4);
                        return;
 
                case 0x01000401: // dma chain
@@ -206,7 +206,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 
                        // Einhander = parse linked list in pieces (todo)
                        // Rebel Assault 2 = parse linked list in pieces (todo)
-                       GPUDMA_INT(size);
+                       set_event(PSXINT_GPUDMA, size);
                        return;
 
                default:
@@ -226,7 +226,7 @@ void gpuInterrupt() {
                u32 size, madr_next = 0xffffff;
                size = GPU_dmaChain((u32 *)psxM, HW_DMA2_MADR & 0x1fffff, &madr_next);
                HW_DMA2_MADR = SWAPu32(madr_next);
-               GPUDMA_INT(size);
+               set_event(PSXINT_GPUDMA, size);
                return;
        }
        if (HW_DMA2_CHCR & SWAP32(0x01000000))
@@ -261,10 +261,9 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
                }
                *++mem = SWAP32(0xffffff);
 
-               //GPUOTCDMA_INT(size);
                // halted
                psxRegs.cycle += words;
-               GPUOTCDMA_INT(16);
+               set_event(PSXINT_GPUOTCDMA, 16);
                return;
        }
        else {

diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h
index eaddb38..5c0ab4e 100644 (file)
--- a/libpcsxcore/psxdma.h
+++ b/libpcsxcore/psxdma.h
@@ -28,48 +28,7 @@ extern "C" {
 #include "r3000a.h"
 #include "psxhw.h"
 #include "psxmem.h"
-
-#define GPUDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_GPUDMA); \
-       psxRegs.intCycle[PSXINT_GPUDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_GPUDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_GPUDMA, eCycle); \
-}
-
-#define SPUDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_SPUDMA); \
-       psxRegs.intCycle[PSXINT_SPUDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_SPUDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_SPUDMA, eCycle); \
-}
-
-#define MDECOUTDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_MDECOUTDMA); \
-       psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_MDECOUTDMA, eCycle); \
-}
-
-#define MDECINDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_MDECINDMA); \
-       psxRegs.intCycle[PSXINT_MDECINDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_MDECINDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_MDECINDMA, eCycle); \
-}
-
-#define GPUOTCDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_GPUOTCDMA); \
-       psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_GPUOTCDMA, eCycle); \
-}
-
-#define CDRDMA_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_CDRDMA); \
-       psxRegs.intCycle[PSXINT_CDRDMA].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_CDRDMA].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_CDRDMA, eCycle); \
-}
+#include "psxevents.h"
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr);
 void psxDma3(u32 madr, u32 bcr, u32 chcr);

diff --git a/libpcsxcore/new_dynarec/events.c b/libpcsxcore/psxevents.c
similarity index 79%
rename from libpcsxcore/new_dynarec/events.c
rename to libpcsxcore/psxevents.c
index 2bc9332..06089f2 100644 (file)
--- a/libpcsxcore/new_dynarec/events.c
+++ b/libpcsxcore/psxevents.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include "../r3000a.h"
-#include "../cdrom.h"
-#include "../psxdma.h"
-#include "../mdec.h"
-#include "events.h"
+#include "r3000a.h"
+#include "cdrom.h"
+#include "psxdma.h"
+#include "mdec.h"
+#include "psxevents.h"
 
 extern int pending_exception;
 
@@ -31,6 +31,9 @@ u32 schedule_timeslice(void)
        return next_interupt;
 }
 
+static void irqNoOp() {
+}
+
 typedef void (irq_func)();
 
 static irq_func * const irq_funcs[] = {
@@ -43,6 +46,7 @@ static irq_func * const irq_funcs[] = {
        [PSXINT_MDECINDMA] = mdec0Interrupt,
        [PSXINT_GPUOTCDMA] = gpuotcInterrupt,
        [PSXINT_CDRDMA] = cdrDmaInterrupt,
+       [PSXINT_NEWDRC_CHECK] = irqNoOp,
        [PSXINT_CDRLID] = cdrLidSeekInterrupt,
        [PSXINT_IRQ10] = irq10Interrupt,
        [PSXINT_SPU_UPDATE] = spuUpdate,
@@ -50,7 +54,7 @@ static irq_func * const irq_funcs[] = {
 };
 
 /* local dupe of psxBranchTest, using event_cycles */
-static void irq_test(psxCP0Regs *cp0)
+void irq_test(psxCP0Regs *cp0)
 {
        u32 cycle = psxRegs.cycle;
        u32 irq, irq_bits;
@@ -88,4 +92,13 @@ void gen_interupt(psxCP0Regs *cp0)
                next_interupt, next_interupt - psxRegs.cycle);
 }
 
+void events_restore(void)
+{
+       int i;
+       for (i = 0; i < PSXINT_COUNT; i++)
+               event_cycles[i] = psxRegs.intCycle[i].sCycle + psxRegs.intCycle[i].cycle;
 
+       event_cycles[PSXINT_RCNT] = psxNextsCounter + psxNextCounter;
+       psxRegs.interrupt |=  1 << PSXINT_RCNT;
+       psxRegs.interrupt &= (1 << PSXINT_COUNT) - 1;
+}

diff --git a/libpcsxcore/psxevents.h b/libpcsxcore/psxevents.h
new file mode 100644 (file)
index 0000000..2f84a4a
--- /dev/null
+++ b/libpcsxcore/psxevents.h
@@ -0,0 +1,52 @@
+#ifndef __PSXEVENTS_H__
+#define __PSXEVENTS_H__
+
+#include "psxcommon.h"
+
+enum {
+       PSXINT_SIO = 0,      // sioInterrupt
+       PSXINT_CDR,          // cdrInterrupt
+       PSXINT_CDREAD,       // cdrPlayReadInterrupt
+       PSXINT_GPUDMA,       // gpuInterrupt
+       PSXINT_MDECOUTDMA,   // mdec1Interrupt
+       PSXINT_SPUDMA,       // spuInterrupt
+       PSXINT_UNUSED,       //
+       PSXINT_MDECINDMA,    // mdec0Interrupt
+       PSXINT_GPUOTCDMA,    // gpuotcInterrupt
+       PSXINT_CDRDMA,       // cdrDmaInterrupt
+       PSXINT_NEWDRC_CHECK, // (none)
+       PSXINT_RCNT,         // psxRcntUpdate
+       PSXINT_CDRLID,       // cdrLidSeekInterrupt
+       PSXINT_IRQ10,        // irq10Interrupt
+       PSXINT_SPU_UPDATE,   // spuUpdate
+       PSXINT_COUNT
+};
+
+extern u32 event_cycles[PSXINT_COUNT];
+extern u32 next_interupt;
+extern int stop;
+
+#define set_event_raw_abs(e, abs) { \
+       u32 abs_ = abs; \
+       s32 di_ = next_interupt - abs_; \
+       event_cycles[e] = abs_; \
+       if (di_ > 0) { \
+               /*printf("%u: next_interupt %u -> %u\n", psxRegs.cycle, next_interupt, abs_);*/ \
+               next_interupt = abs_; \
+       } \
+}
+
+#define set_event(e, c) do { \
+       psxRegs.interrupt |= (1 << (e)); \
+       psxRegs.intCycle[e].cycle = c; \
+       psxRegs.intCycle[e].sCycle = psxRegs.cycle; \
+       set_event_raw_abs(e, psxRegs.cycle + (c)) \
+} while (0)
+
+union psxCP0Regs_;
+u32  schedule_timeslice(void);
+void irq_test(union psxCP0Regs_ *cp0);
+void gen_interupt(union psxCP0Regs_ *cp0);
+void events_restore(void);
+
+#endif // __PSXEVENTS_H__

diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index f889a53..8be775b 100644 (file)
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -22,6 +22,7 @@
 */
 
 #include "psxhw.h"
+#include "psxevents.h"
 #include "mdec.h"
 #include "cdrom.h"
 #include "gpu.h"
@@ -62,7 +63,7 @@ void psxHwWriteImask(u32 value)
        if (stat & value) {
                //if ((psxRegs.CP0.n.SR & 0x401) == 0x401)
                //      log_unhandled("irq on unmask @%08x\n", psxRegs.pc);
-               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
+               set_event(PSXINT_NEWDRC_CHECK, 1);
        }
        psxRegs.CP0.n.Cause &= ~0x400;
        if (stat & value)

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 8035dfd..f0a0ddc 100644 (file)
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -27,6 +27,7 @@
 #include "gte.h"
 #include "psxinterpreter.h"
 #include "psxbios.h"
+#include "psxevents.h"
 #include "../include/compiler_features.h"
 
 R3000Acpu *psxCpu = NULL;
@@ -131,87 +132,9 @@ void psxBranchTest() {
        if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
                psxRcntUpdate();
 
-       if (psxRegs.interrupt) {
-               if ((psxRegs.interrupt & (1 << PSXINT_SIO))) { // sio
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_SIO);
-                               sioInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_CDR);
-                               cdrInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
-                               cdrPlayReadInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
-                               gpuInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
-                               mdec1Interrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
-                               spuInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_MDECINDMA)) { // mdec in
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECINDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECINDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_MDECINDMA);
-                               mdec0Interrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_GPUOTCDMA)) { // gpu otc
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_GPUOTCDMA);
-                               gpuotcInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_CDRDMA)) { // cdrom
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDRDMA].sCycle) >= psxRegs.intCycle[PSXINT_CDRDMA].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_CDRDMA);
-                               cdrDmaInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_CDRLID)) { // cdr lid states
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDRLID].sCycle) >= psxRegs.intCycle[PSXINT_CDRLID].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_CDRLID);
-                               cdrLidSeekInterrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_IRQ10)) { // irq10 - controller port pin8
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_IRQ10].sCycle) >= psxRegs.intCycle[PSXINT_IRQ10].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_IRQ10);
-                               irq10Interrupt();
-                       }
-               }
-               if (psxRegs.interrupt & (1 << PSXINT_SPU_UPDATE)) { // scheduled spu update
-                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPU_UPDATE].sCycle) >= psxRegs.intCycle[PSXINT_SPU_UPDATE].cycle) {
-                               psxRegs.interrupt &= ~(1 << PSXINT_SPU_UPDATE);
-                               spuUpdate();
-                       }
-               }
-       }
+       irq_test(&psxRegs.CP0);
 
-       psxRegs.CP0.n.Cause &= ~0x400;
-       if (psxHu32(0x1070) & psxHu32(0x1074))
-               psxRegs.CP0.n.Cause |= 0x400;
-       if (((psxRegs.CP0.n.Cause | 1) & psxRegs.CP0.n.SR & 0x401) == 0x401)
-               psxException(0, 0, &psxRegs.CP0);
-       else if (unlikely(psxRegs.pc == psxRegs.biosBranchCheck))
+       if (unlikely(psxRegs.pc == psxRegs.biosBranchCheck))
                psxBiosCheckBranch();
 }
 
@@ -267,7 +190,7 @@ static void psxScheduleIrq10One(u32 cycles_abs) {
        psxRegs.interrupt |= 1 << PSXINT_IRQ10;
        psxRegs.intCycle[PSXINT_IRQ10].cycle = c;
        psxRegs.intCycle[PSXINT_IRQ10].sCycle = rcnts[3].cycleStart;
-       new_dyna_set_event_abs(PSXINT_IRQ10, cycles_abs);
+       set_event_raw_abs(PSXINT_IRQ10, cycles_abs);
 }
 
 void irq10Interrupt() {

diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index 157d31b..4d2cfbd 100644 (file)
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -163,25 +163,6 @@ typedef union {
        PAIR p[32];
 } psxCP2Ctrl;
 
-enum {
-       PSXINT_SIO = 0,
-       PSXINT_CDR,
-       PSXINT_CDREAD,
-       PSXINT_GPUDMA,
-       PSXINT_MDECOUTDMA,
-       PSXINT_SPUDMA,
-       PSXINT_GPUBUSY,
-       PSXINT_MDECINDMA,
-       PSXINT_GPUOTCDMA,
-       PSXINT_CDRDMA,
-       PSXINT_NEWDRC_CHECK,
-       PSXINT_RCNT,
-       PSXINT_CDRLID,
-       PSXINT_IRQ10,
-       PSXINT_SPU_UPDATE,
-       PSXINT_COUNT
-};
-
 enum R3000Abdt {
        // corresponds to bits 31,30 of Cause reg
        R3000A_BRANCH_TAKEN = 3,
@@ -231,24 +212,8 @@ typedef struct {
 extern psxRegisters psxRegs;
 
 /* new_dynarec stuff */
-extern u32 event_cycles[PSXINT_COUNT];
-extern u32 next_interupt;
-
 void new_dyna_freeze(void *f, int mode);
 
-#define new_dyna_set_event_abs(e, abs) { \
-       u32 abs_ = abs; \
-       s32 di_ = next_interupt - abs_; \
-       event_cycles[e] = abs_; \
-       if (di_ > 0) { \
-               /*printf("%u: next_interupt %u -> %u\n", psxRegs.cycle, next_interupt, abs_);*/ \
-               next_interupt = abs_; \
-       } \
-}
-
-#define new_dyna_set_event(e, c) \
-       new_dyna_set_event_abs(e, psxRegs.cycle + (c))
-
 int  psxInit();
 void psxReset();
 void psxShutdown();

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 5d5019d..0bc763c 100644 (file)
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -23,6 +23,7 @@
 
 #include "misc.h"
 #include "psxcounters.h"
+#include "psxevents.h"
 #include "sio.h"
 #include <sys/stat.h>
 
@@ -73,13 +74,6 @@ static unsigned int padst;
 char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
 char McdDisable[2];
 
-#define SIO_INT(eCycle) { \
-       psxRegs.interrupt |= (1 << PSXINT_SIO); \
-       psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
-       psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
-       new_dyna_set_event(PSXINT_SIO, eCycle); \
-}
-
 // clk cycle byte
 // 4us * 8bits = (PSXCLK / 1000000) * 32; (linuzappz)
 // TODO: add SioModePrescaler and BaudReg
@@ -107,7 +101,7 @@ void sioWrite8(unsigned char value) {
 
                                if (more_data) {
                                        bufcount = parp + 1;
-                                       SIO_INT(SIO_CYCLES);
+                                       set_event(PSXINT_SIO, SIO_CYCLES);
                                }
                        }
                        else padst = 0;
@@ -121,14 +115,14 @@ void sioWrite8(unsigned char value) {
 
                        if (more_data) {
                                bufcount = parp + 1;
-                               SIO_INT(SIO_CYCLES);
+                               set_event(PSXINT_SIO, SIO_CYCLES);
                        }
                        return;
        }
 
        switch (mcdst) {
                case 1:
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        if (rdwr) { parp++; return; }
                        parp = 1;
                        switch (value) {
@@ -138,7 +132,7 @@ void sioWrite8(unsigned char value) {
                        }
                        return;
                case 2: // address H
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        adrH = value;
                        *buf = 0;
                        parp = 0;
@@ -146,7 +140,7 @@ void sioWrite8(unsigned char value) {
                        mcdst = 3;
                        return;
                case 3: // address L
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        adrL = value;
                        *buf = adrH;
                        parp = 0;
@@ -154,7 +148,7 @@ void sioWrite8(unsigned char value) {
                        mcdst = 4;
                        return;
                case 4:
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        parp = 0;
                        switch (rdwr) {
                                case 1: // read
@@ -204,7 +198,7 @@ void sioWrite8(unsigned char value) {
                        if (rdwr == 2) {
                                if (parp < 128) buf[parp + 1] = value;
                        }
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        return;
        }
 
@@ -219,7 +213,7 @@ void sioWrite8(unsigned char value) {
                        bufcount = 1;
                        parp = 0;
                        padst = 1;
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        return;
                case 0x81: // start memcard
                        if (CtrlReg & 0x2000)
@@ -239,7 +233,7 @@ void sioWrite8(unsigned char value) {
                        bufcount = 3;
                        mcdst = 1;
                        rdwr = 0;
-                       SIO_INT(SIO_CYCLES);
+                       set_event(PSXINT_SIO, SIO_CYCLES);
                        return;
                default:
                no_device:

diff --git a/libpcsxcore/spu.c b/libpcsxcore/spu.c
index 90d2f4d..69d65be 100644 (file)
--- a/libpcsxcore/spu.c
+++ b/libpcsxcore/spu.c
@@ -22,6 +22,7 @@
 */
 
 #include "spu.h"
+#include "psxevents.h"
 
 void CALLBACK SPUirq(void) {
        psxHu32ref(0x1070) |= SWAPu32(0x200);
@@ -29,10 +30,7 @@ void CALLBACK SPUirq(void) {
 
 // spuUpdate
 void CALLBACK SPUschedule(unsigned int cycles_after) {
-       psxRegs.interrupt |= (1 << PSXINT_SPU_UPDATE);
-       psxRegs.intCycle[PSXINT_SPU_UPDATE].cycle = cycles_after;
-       psxRegs.intCycle[PSXINT_SPU_UPDATE].sCycle = psxRegs.cycle;
-       new_dyna_set_event(PSXINT_SPU_UPDATE, cycles_after);
+       set_event(PSXINT_SPU_UPDATE, cycles_after);
 }
 
 void spuUpdate() {