spu: rework synchronization

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

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 88e8112..d5c32be 100644 (file)
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -30,11 +30,16 @@ static u32 mem_ffwtab[(1+2+4) * 0x1000 / 4];
 //static u32 mem_unmrtab[(1+2+4) * 0x1000 / 4];
 static u32 mem_unmwtab[(1+2+4) * 0x1000 / 4];
 
+// When this is called in a loop, and 'h' is a function pointer, clang will crash.
+#ifdef __clang__
+static __attribute__ ((noinline)) void map_item(u32 *out, const void *h, u32 flag)
+#else
 static void map_item(u32 *out, const void *h, u32 flag)
+#endif
 {
        u32 hv = (u32)h;
        if (hv & 1) {
-               fprintf(stderr, "FATAL: %p has LSB set\n", h);
+               SysPrintf("FATAL: %p has LSB set\n", h);
                abort();
        }
        *out = (hv >> 1) | (flag << 31);
@@ -147,9 +152,9 @@ make_rcnt_funcs(2)
 
 static void io_write_ireg16(u32 value)
 {
-       if (Config.Sio) psxHu16ref(0x1070) |= 0x80;
+       //if (Config.Sio) psxHu16ref(0x1070) |= 0x80;
        if (Config.SpuIrq) psxHu16ref(0x1070) |= 0x200;
-       psxHu16ref(0x1070) &= psxHu16(0x1074) & value;
+       psxHu16ref(0x1070) &= value;
 }
 
 static void io_write_imask16(u32 value)
@@ -161,9 +166,9 @@ static void io_write_imask16(u32 value)
 
 static void io_write_ireg32(u32 value)
 {
-       if (Config.Sio) psxHu32ref(0x1070) |= 0x80;
+       //if (Config.Sio) psxHu32ref(0x1070) |= 0x80;
        if (Config.SpuIrq) psxHu32ref(0x1070) |= 0x200;
-       psxHu32ref(0x1070) &= psxHu32(0x1074) & value;
+       psxHu32ref(0x1070) &= value;
 }
 
 static void io_write_imask32(u32 value)
@@ -205,7 +210,7 @@ make_dma_func(6)
 static void io_spu_write16(u32 value)
 {
        // meh
-       SPU_writeRegister(address, value);
+       SPU_writeRegister(address, value, psxRegs.cycle);
 }
 
 static void io_spu_write32(u32 value)
@@ -213,8 +218,8 @@ static void io_spu_write32(u32 value)
        SPUwriteRegister wfunc = SPU_writeRegister;
        u32 a = address;
 
-       wfunc(a, value & 0xffff);
-       wfunc(a + 2, value >> 16);
+       wfunc(a, value & 0xffff, psxRegs.cycle);
+       wfunc(a + 2, value >> 16, psxRegs.cycle);
 }
 
 static u32 io_gpu_read_status(void)
@@ -303,7 +308,7 @@ void new_dyna_pcsx_mem_init(void)
        // have to map these further to keep tcache close to .text
        mem_readtab = psxMap(0x08000000, 0x200000 * 4, 0, MAP_TAG_LUTS);
        if (mem_readtab == NULL) {
-               fprintf(stderr, "failed to map mem tables\n");
+               SysPrintf("failed to map mem tables\n");
                exit(1);
        }
        mem_writetab = mem_readtab + 0x100000;
@@ -338,11 +343,17 @@ void new_dyna_pcsx_mem_init(void)
 
        // scratchpad
        map_l1_mem(mem_readtab, 0, 0x1f800000, 0x1000, psxH);
+       map_l1_mem(mem_readtab, 0, 0x9f800000, 0x1000, psxH);
        map_l1_mem(mem_writetab, 0, 0x1f800000, 0x1000, psxH);
+       map_l1_mem(mem_writetab, 0, 0x9f800000, 0x1000, psxH);
 
        // I/O
        map_item(&mem_readtab[0x1f801000 >> 12], mem_iortab, 1);
+       map_item(&mem_readtab[0x9f801000 >> 12], mem_iortab, 1);
+       map_item(&mem_readtab[0xbf801000 >> 12], mem_iortab, 1);
        map_item(&mem_writetab[0x1f801000 >> 12], mem_iowtab, 1);
+       map_item(&mem_writetab[0x9f801000 >> 12], mem_iowtab, 1);
+       map_item(&mem_writetab[0xbf801000 >> 12], mem_iowtab, 1);
 
        // L2
        // unmapped tables
@@ -475,3 +486,9 @@ void new_dyna_pcsx_mem_reset(void)
 
        map_item(&mem_iowtab[IOMEM32(0x1810)], GPU_writeData, 1);
 }
+
+void new_dyna_pcsx_mem_shutdown(void)
+{
+       psxUnmap(mem_readtab, 0x200000 * 4, MAP_TAG_LUTS);
+       mem_writetab = mem_readtab = NULL;
+}