From 760e26c7ddf3a6a3f5d3360cd5d0f04ca5d9c121 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 30 May 2008 20:46:37 +0000 Subject: [PATCH] timing hack for PacMan 2 git-svn-id: file:///home/notaz/opt/svn/PicoDrive@475 be3aeb3a-fb24-0410-a615-afba39da0efa --- Pico/Memory.s | 4 ++++ Pico/MemoryCmn.c | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Pico/Memory.s b/Pico/Memory.s index 04d062f0..a042d81d 100644 --- a/Pico/Memory.s +++ b/Pico/Memory.s @@ -868,7 +868,11 @@ m_write8_misc2: bic r0, r0, #0xff0000 bic r0, r0, #0x00e000 tst r2, #1 + ldr r2, =SekCycleCnt streqb r1, [r3, r0] @ zram + ldr r0, [r2] + add r0, r0, #2 @ hack? + str r0, [r2] bx lr m_write8_z80_not_ram: diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c index 4b5620da..1b8a1b91 100644 --- a/Pico/MemoryCmn.c +++ b/Pico/MemoryCmn.c @@ -155,11 +155,9 @@ void OtherWrite8(u32 a,u32 d) #if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS) if ((a&0xe700f9)==0xc00011||(a&0xff7ff9)==0xa07f11) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound if ((a&0xff4000)==0xa00000) { // z80 RAM - if (!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)d; - else { - elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x @ %06x", a, d&0xff, SekPc); - SekCyclesBurn(4); // hack? - } + SekCyclesBurn(2); // hack + if (!(Pico.m.z80Run&1) && !Pico.m.z80_reset) Pico.zram[a&0x1fff]=(u8)d; + else elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %02x @ %06x", a, d&0xff, SekPc); return; } if ((a&0xff6000)==0xa04000) { if(PicoOpt&1) emustatus|=ym2612_write_local(a&3, d&0xff, 0)&1; return; } // FM Sound @@ -207,8 +205,8 @@ void OtherWrite16(u32 a,u32 d) if ((a&0xe700f8)==0xc00010||(a&0xff7ff8)==0xa07f10) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound if ((a&0xff6000)==0xa04000) { if(PicoOpt&1) emustatus|=ym2612_write_local(a&3, d&0xff, 0)&1; return; } // FM Sound if ((a&0xff4000)==0xa00000) { // Z80 ram (MSB only) - if (!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); - else elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x @ %06x", a, d&0xffff, SekPc); + if (!(Pico.m.z80Run&1) && !Pico.m.z80_reset) Pico.zram[a&0x1fff]=(u8)(d>>8); + else elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %04x @ %06x", a, d&0xffff, SekPc); return; } if (a==0xa11200) { -- 2.39.5