drc: invalidate RAM mirrors correctly

[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 a37f7a2..bdb9675 100644 (file)
--- 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;
 }
 
@@ -200,23 +202,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);
 }