drc: map bios and fix dummy reads

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

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index a526ac5..a323c18 100644 (file)
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -72,6 +72,9 @@ extern void ari_write_ram32();
 extern void ari_write_ram_mirror8();
 extern void ari_write_ram_mirror16();
 extern void ari_write_ram_mirror32();
+extern void ari_read_bios8();
+extern void ari_read_bios16();
+extern void ari_read_bios32();
 extern void ari_read_io8();
 extern void ari_read_io16();
 extern void ari_read_io32();
@@ -134,7 +137,7 @@ static void io_write_imask16(u32 value)
 {
        psxHu16ref(0x1074) = value;
        if (psxHu16ref(0x1070) & value)
-               new_dyna_set_event(6, 1);
+               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
 }
 
 static void io_write_ireg32(u32 value)
@@ -148,7 +151,7 @@ static void io_write_imask32(u32 value)
 {
        psxHu32ref(0x1074) = value;
        if (psxHu32ref(0x1070) & value)
-               new_dyna_set_event(6, 1);
+               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
 }
 
 static void io_write_dma_icr32(u32 value)
@@ -295,7 +298,7 @@ void new_dyna_pcsx_mem_init(void)
                writemem[i] = write_mem32;
 #if 1
                readmemb[i] = readmemh[i] = readmem[i] = read_mem_dummy;
-               readmemb[i] = readmemh[i] = readmem[i] = write_mem_dummy;
+               writememb[i] = writememh[i] = writemem[i] = write_mem_dummy;
 #endif
        }
 
@@ -320,6 +323,13 @@ void new_dyna_pcsx_mem_init(void)
                writemem[i] = ari_write_ram32;
        }
 
+       // BIOS and it's mirrors
+       for (i = 0x1fc0; i < 0x1fc8; i++) {
+               readmemb[i] = readmemb[0x8000|i] = readmemb[0xa000|i] = ari_read_bios8;
+               readmemh[i] = readmemh[0x8000|i] = readmemh[0xa000|i] = ari_read_bios16;
+               readmem[i]  = readmem[0x8000|i]  = readmem[0xa000|i]  = ari_read_bios32;
+       }
+
        // I/O
        readmemb[0x1f80] = ari_read_io8;
        readmemh[0x1f80] = ari_read_io16;