drc: some PCSX-specific const addr io handlers

[pcsx_rearmed.git] / libpcsxcore / new_dynarec / emu_if.c

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 0942874..b44feb3 100644 (file)
--- 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 */
@@ -154,7 +155,6 @@ static int ari64_init()
 {
        extern void (*psxCP2[64])();
        extern void psxNULL();
-       extern void *psxH_ptr;
        size_t i;
 
        new_dynarec_init();
@@ -174,6 +174,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 +203,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);
 }