X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Fpcsxmem.c;h=4e22230894cf6ad27300e8aff083fdd600429a47;hp=586c760dabbbab67c6906c21c0c67144be0f615b;hb=59fb0bb456b51f5385a2e0b8b4cd8c043595b15d;hpb=b1be1eeee94d3547c20719acfa6b0082404897f1 diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c index 586c760d..4e222308 100644 --- a/libpcsxcore/new_dynarec/pcsxmem.c +++ b/libpcsxcore/new_dynarec/pcsxmem.c @@ -40,7 +40,7 @@ static void map_item(u32 *out, const void *h, u32 flag) #define IOMEM16(a) (0x1000/4 + (((a) & 0xfff) / 2)) #define IOMEM8(a) (0x1000/4 + 0x1000/2 + ((a) & 0xfff)) -static u8 unmapped_mem[0x1000]; +u8 zero_mem[0x1000]; u32 read_mem_dummy() { @@ -79,11 +79,7 @@ static void io_write_sio32(u32 value) static void map_rcnt_rcount0(u32 mode) { - if (mode & 0x01) { // gate - map_item(&mem_iortab[IOMEM32(0x1100)], &psxH[0x1000], 0); - map_item(&mem_iortab[IOMEM16(0x1100)], &psxH[0x1000], 0); - } - else if (mode & 0x100) { // pixel clock + if (mode & 0x100) { // pixel clock map_item(&mem_iortab[IOMEM32(0x1100)], rcnt0_read_count_m1, 1); map_item(&mem_iortab[IOMEM16(0x1100)], rcnt0_read_count_m1, 1); } @@ -95,11 +91,7 @@ static void map_rcnt_rcount0(u32 mode) static void map_rcnt_rcount1(u32 mode) { - if (mode & 0x01) { // gate - map_item(&mem_iortab[IOMEM32(0x1110)], &psxH[0x1000], 0); - map_item(&mem_iortab[IOMEM16(0x1110)], &psxH[0x1000], 0); - } - else if (mode & 0x100) { // hcnt + if (mode & 0x100) { // hcnt map_item(&mem_iortab[IOMEM32(0x1110)], rcnt1_read_count_m1, 1); map_item(&mem_iortab[IOMEM16(0x1110)], rcnt1_read_count_m1, 1); } @@ -290,7 +282,7 @@ void new_dyna_pcsx_mem_init(void) // default/unmapped memhandlers for (i = 0; i < 0x100000; i++) { //map_item(&mem_readtab[i], mem_unmrtab, 1); - map_l1_mem(mem_readtab, i, 0, 0x1000, unmapped_mem); + map_l1_mem(mem_readtab, i, 0, 0x1000, zero_mem); map_item(&mem_writetab[i], mem_unmwtab, 1); }