X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=a46760da6097717d30add0c284f709906ad36564;hb=HEAD;hp=c633c89b255fb7217304d6777fb2f28f288dc164;hpb=6311a3baf533d4a034e51dfe38e8cb213a1bf442;p=picodrive.git diff --git a/pico/memory.c b/pico/memory.c index c633c89b..e1a892ae 100644 --- a/pico/memory.c +++ b/pico/memory.c @@ -2,13 +2,16 @@ * memory handling * (c) Copyright Dave, 2004 * (C) notaz, 2006-2010 + * (C) irixxxx, 2019-2024 * * This work is licensed under the terms of MAME license. * See COPYING file in the top-level directory. */ +#include #include "pico_int.h" #include "memory.h" +#include "state.h" #include "sound/ym2612.h" #include "sound/sn76496.h" @@ -20,7 +23,7 @@ uptr m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT]; uptr m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT]; uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT]; -static void xmap_set(uptr *map, int shift, int start_addr, int end_addr, +static void xmap_set(uptr *map, int shift, u32 start_addr, u32 end_addr, const void *func_or_mh, int is_func) { #ifdef __clang__ @@ -53,31 +56,68 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr, } } -void z80_map_set(uptr *map, int start_addr, int end_addr, +void z80_map_set(uptr *map, u16 start_addr, u16 end_addr, const void *func_or_mh, int is_func) { xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func); +#ifdef _USE_CZ80 + if (!is_func) + Cz80_Set_Fetch(&CZ80, start_addr, end_addr, (FPTR)func_or_mh); +#endif } -void cpu68k_map_set(uptr *map, int start_addr, int end_addr, +void cpu68k_map_set(uptr *map, u32 start_addr, u32 end_addr, const void *func_or_mh, int is_func) { - xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func); + xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func & 1); #ifdef EMU_F68K // setup FAME fetchmap - if (!is_func) + if (!(is_func & 1)) { + M68K_CONTEXT *ctx = is_func & 2 ? &PicoCpuFS68k : &PicoCpuFM68k; int shiftout = 24 - FAMEC_FETCHBITS; int i = start_addr >> shiftout; uptr base = (uptr)func_or_mh - (i << shiftout); for (; i <= (end_addr >> shiftout); i++) - PicoCpuFM68k.Fetch[i] = base; + ctx->Fetch[i] = base; } #endif } // more specialized/optimized function (does same as above) -void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub) +void cpu68k_map_read_mem(u32 start_addr, u32 end_addr, void *ptr, int is_sub) +{ + uptr *r8map, *r16map; + uptr addr = (uptr)ptr; + int shift = M68K_MEM_SHIFT; + int i; + + if (!is_sub) { + r8map = m68k_read8_map; + r16map = m68k_read16_map; + } else { + r8map = s68k_read8_map; + r16map = s68k_read16_map; + } + + addr -= start_addr; + addr >>= 1; + for (i = start_addr >> shift; i <= end_addr >> shift; i++) + r8map[i] = r16map[i] = addr; +#ifdef EMU_F68K + // setup FAME fetchmap + { + M68K_CONTEXT *ctx = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k; + int shiftout = 24 - FAMEC_FETCHBITS; + i = start_addr >> shiftout; + addr = (uptr)ptr - (i << shiftout); + for (; i <= (end_addr >> shiftout); i++) + ctx->Fetch[i] = addr; + } +#endif +} + +void cpu68k_map_all_ram(u32 start_addr, u32 end_addr, void *ptr, int is_sub) { uptr *r8map, *r16map, *w8map, *w16map; uptr addr = (uptr)ptr; @@ -113,16 +153,74 @@ void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub) #endif } +void cpu68k_map_read_funcs(u32 start_addr, u32 end_addr, u32 (*r8)(u32), u32 (*r16)(u32), int is_sub) +{ + uptr *r8map, *r16map; + uptr ar8 = (uptr)r8, ar16 = (uptr)r16; + int shift = M68K_MEM_SHIFT; + int i; + + if (!is_sub) { + r8map = m68k_read8_map; + r16map = m68k_read16_map; + } else { + r8map = s68k_read8_map; + r16map = s68k_read16_map; + } + + ar8 = (ar8 >> 1 ) | MAP_FLAG; + ar16 = (ar16 >> 1 ) | MAP_FLAG; + for (i = start_addr >> shift; i <= end_addr >> shift; i++) + r8map[i] = ar8, r16map[i] = ar16; +} + +void cpu68k_map_all_funcs(u32 start_addr, u32 end_addr, u32 (*r8)(u32), u32 (*r16)(u32), void (*w8)(u32, u32), void (*w16)(u32, u32), int is_sub) +{ + uptr *r8map, *r16map, *w8map, *w16map; + uptr ar8 = (uptr)r8, ar16 = (uptr)r16; + uptr aw8 = (uptr)w8, aw16 = (uptr)w16; + int shift = M68K_MEM_SHIFT; + int i; + + if (!is_sub) { + r8map = m68k_read8_map; + r16map = m68k_read16_map; + w8map = m68k_write8_map; + w16map = m68k_write16_map; + } else { + r8map = s68k_read8_map; + r16map = s68k_read16_map; + w8map = s68k_write8_map; + w16map = s68k_write16_map; + } + + ar8 = (ar8 >> 1 ) | MAP_FLAG; + ar16 = (ar16 >> 1 ) | MAP_FLAG; + aw8 = (aw8 >> 1 ) | MAP_FLAG; + aw16 = (aw16 >> 1 ) | MAP_FLAG; + for (i = start_addr >> shift; i <= end_addr >> shift; i++) + r8map[i] = ar8, r16map[i] = ar16, w8map[i] = aw8, w16map[i] = aw16; +} + +u32 PicoRead16_floating(u32 a) +{ + // faking open bus + u16 d = (Pico.m.rotate += 0x41); + d ^= (d << 5) ^ (d << 8); + if ((a & 0xff0000) == 0xa10000) return d; // MegaCD pulldowns don't work here curiously + return (PicoIn.AHW & PAHW_MCD) ? 0x00 : d; // pulldown if MegaCD2 attached +} + static u32 m68k_unmapped_read8(u32 a) { elprintf(EL_UIO, "m68k unmapped r8 [%06x] @%06x", a, SekPc); - return 0; // assume pulldown, as if MegaCD2 was attached + return a < 0x400000 ? 0 : (u8)PicoRead16_floating(a); } static u32 m68k_unmapped_read16(u32 a) { elprintf(EL_UIO, "m68k unmapped r16 [%06x] @%06x", a, SekPc); - return 0; + return a < 0x400000 ? 0 : PicoRead16_floating(a); } static void m68k_unmapped_write8(u32 a, u32 d) @@ -135,7 +233,7 @@ static void m68k_unmapped_write16(u32 a, u32 d) elprintf(EL_UIO, "m68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc); } -void m68k_map_unmap(int start_addr, int end_addr) +void m68k_map_unmap(u32 start_addr, u32 end_addr) { #ifdef __clang__ // workaround bug (segfault) in @@ -163,12 +261,14 @@ void m68k_map_unmap(int start_addr, int end_addr) m68k_write16_map[i] = (addr >> 1) | MAP_FLAG; } +#ifndef _ASM_MEMORY_C MAKE_68K_READ8(m68k_read8, m68k_read8_map) MAKE_68K_READ16(m68k_read16, m68k_read16_map) MAKE_68K_READ32(m68k_read32, m68k_read16_map) MAKE_68K_WRITE8(m68k_write8, m68k_write8_map) MAKE_68K_WRITE16(m68k_write16, m68k_write16_map) MAKE_68K_WRITE32(m68k_write32, m68k_write16_map) +#endif // ----------------------------------------------------------------- @@ -196,12 +296,22 @@ void log_io(unsigned int addr, int bits, int rw); #endif #if defined(EMU_C68K) -void cyclone_crashed(u32 pc, struct Cyclone *context) +u32 cyclone_crashed(u32 pc, struct Cyclone *context) { - elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x", - context == &PicoCpuCM68k ? 'm' : 's', pc); + // check for underlying ROM, in case of on-cart hw overlaying part of ROM + // NB assumes code isn't executed from the overlay, but I've never seen this + u32 pc24 = pc & 0xffffff; + if (pc24 >= Pico.romsize) { + // no ROM, so it's probably an illegal access + pc24 = Pico.romsize; + elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x", + context == &PicoCpuCM68k ? 'm' : 's', pc); + } + context->membase = (u32)Pico.rom; - context->pc = (u32)Pico.rom + Pico.romsize; + context->pc = (u32)Pico.rom + pc24; + + return context->pc; } #endif @@ -232,11 +342,11 @@ static u32 read_pad_6btn(int i, u32 out_bits) value = (pad & 0xc0) >> 2; // ?0SA 0000 goto out; } - else if(phase == 3) { + else if (phase == 3) { if (out_bits & 0x40) - return (pad & 0x30) | ((pad >> 8) & 0xf); // ?1CB MXYZ + value = (pad & 0x30) | ((pad >> 8) & 0xf); // ?1CB MXYZ else - return ((pad & 0xc0) >> 2) | 0x0f; // ?0SA 1111 + value = ((pad & 0xc0) >> 2) | 0x0f; // ?0SA 1111 goto out; } @@ -250,6 +360,103 @@ out: return value; } +static u32 read_pad_team(int i, u32 out_bits) +{ + u32 pad; + int phase = Pico.m.padTHPhase[i]; + u32 value; + + switch (phase) { + case 0: + value = 0x03; + break; + case 1: + value = 0x0f; + break; + case 4: case 5: case 6: case 7: // controller IDs, all 3 btn for now + value = 0x00; + break; + case 8: case 10: case 12: case 14: + pad = ~PicoIn.padInt[(phase-8) >> 1]; + value = pad & 0x0f; // ?x?x RLDU + break; + case 9: case 11: case 13: case 15: + pad = ~PicoIn.padInt[(phase-8) >> 1]; + value = (pad & 0xf0) >> 4; // ?x?x SACB + break; + default: + value = 0; + break; + } + + value |= (out_bits & 0x40) | ((out_bits & 0x20)>>1); + return value; +} + +static u32 read_pad_4way(int i, u32 out_bits) +{ + u32 pad = (PicoMem.ioports[2] & 0x70) >> 4; + u32 value = 0; + + if (i == 0 && pad <= 3) + value = read_pad_3btn(pad, out_bits); + + value |= (out_bits & 0x40); + return value; +} + +static u32 read_pad_mouse(int i, u32 out_bits) +{ + int phase = Pico.m.padTHPhase[i]; + u32 value; + + int x = PicoIn.mouseInt[0] - PicoIn.mouseInt[2]; + int y = PicoIn.mouseInt[3] - PicoIn.mouseInt[1]; + + switch (phase) { + case 0: + value = 0x00; + break; + case 1: + value = 0x0b; + break; + case 2: + value = 0x0f; + // store last read values for x,y difference calculation + PicoIn.mouseInt[2] = PicoIn.mouseInt[0]; + PicoIn.mouseInt[3] = PicoIn.mouseInt[1]; + break; + case 3: + value = 0x0f; + // latch current mouse position during readout + PicoIn.mouseInt[0] = PicoIn.mouse[0]; + PicoIn.mouseInt[1] = PicoIn.mouse[1]; + break; + case 4: // xxxx OOSS, OO = y,x overflow, SS = y,x sign bits + value = (x<0) | ((y<0)<<1) | ((x<-255||x>255)<<2) | ((y<-255||y>255)<<3); + break; + case 5: + value = (PicoIn.padInt[i] & 0xf0) >> 4; // SMRL, mapped from SACB + break; + case 6: // high nibble of x + value = (x>>4) & 0xf; + break; + case 7: // low nibble of x + value = x & 0xf; + break; + case 8: // high nibble of y + value = (y>>4) & 0xf; + break; + case 9: // low nibble of y + default: // also sent on all later phases + value = y & 0xf; + break; + } + + value |= (out_bits & 0x40) | ((out_bits & 0x20)>>1); + return value; +} + static u32 read_nothing(int i, u32 out_bits) { return 0xff; @@ -263,6 +470,9 @@ static port_read_func *port_readers[3] = { read_nothing }; +static int padTHLatency[3]; +static int padTLLatency[3]; + static NOINLINE u32 port_read(int i) { u32 data_reg = PicoMem.ioports[i + 1]; @@ -270,13 +480,36 @@ static NOINLINE u32 port_read(int i) u32 in, out; out = data_reg & ctrl_reg; - out |= 0x7f & ~ctrl_reg; // pull-ups + + // pull-ups: should be 0x7f, but Decap Attack has a bug where it temp. + // disables output before doing TH-low read, so emulate RC filter for TH. + // Decap Attack reportedly doesn't work on Nomad but works on most + // other MD revisions (different pull-up strength?). + u32 mask = 0x3f; + if (CYCLES_GE(SekCyclesDone(), padTHLatency[i])) { + mask |= 0x40; + padTHLatency[i] = SekCyclesDone(); + } + out |= mask & ~ctrl_reg; in = port_readers[i](i, out); + // Sega mouse uses the TL/TR lines for req/ack. For buggy drivers, make sure + // there's some delay before ack is sent by taking over the new TL line level + if (CYCLES_GE(SekCyclesDone(), padTLLatency[i])) + padTLLatency[i] = SekCyclesDone(); + else + in ^= 0x10; // TL + return (in & ~ctrl_reg) | (data_reg & ctrl_reg); } +// pad export for J-Cart +u32 PicoReadPad(int i, u32 out_bits) +{ + return read_pad_3btn(i, out_bits); +} + void PicoSetInputDevice(int port, enum input_device device) { port_read_func *func; @@ -284,7 +517,10 @@ void PicoSetInputDevice(int port, enum input_device device) if (port < 0 || port > 2) return; - switch (device) { + if (port == 1 && port_readers[0] == read_pad_team) + func = read_nothing; + + else switch (device) { case PICO_INPUT_PAD_3BTN: func = read_pad_3btn; break; @@ -293,6 +529,18 @@ void PicoSetInputDevice(int port, enum input_device device) func = read_pad_6btn; break; + case PICO_INPUT_PAD_TEAM: + func = read_pad_team; + break; + + case PICO_INPUT_PAD_4WAY: + func = read_pad_4way; + break; + + case PICO_INPUT_MOUSE: + func = read_pad_mouse; + break; + default: func = read_nothing; break; @@ -319,18 +567,87 @@ NOINLINE void io_ports_write(u32 a, u32 d) { a = (a>>1) & 0xf; - // 6 button gamepad: if TH went from 0 to 1, gamepad changes state + // for some controllers, changing TH/TR changes controller state if (1 <= a && a <= 2) { Pico.m.padDelay[a - 1] = 0; - if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40)) + if (port_readers[a - 1] == read_pad_team) { + if (d & 0x40) + Pico.m.padTHPhase[a - 1] = 0; + else if ((d^PicoMem.ioports[a]) & 0x60) + Pico.m.padTHPhase[a - 1]++; + } else if (port_readers[0] == read_pad_4way) { + if (a == 2 && ((PicoMem.ioports[a] ^ d) & 0x70)) + Pico.m.padTHPhase[0] = 0; + if (a == 1 && !(PicoMem.ioports[a] & 0x40) && (d & 0x40)) + Pico.m.padTHPhase[0]++; + } else if (port_readers[a - 1] == read_pad_mouse) { + if ((d^PicoMem.ioports[a]) & 0x20) { + if (Pico.m.padTHPhase[a - 1]) { // in readout? + padTLLatency[a - 1] = SekCyclesDone() + 100; + Pico.m.padTHPhase[a - 1]++; + } else // in ID cycle + padTLLatency[a - 1] = SekCyclesDone() + 25; // Cannon Fodder + } + if ((d^PicoMem.ioports[a]) & 0x40) { + // 1->0 transition starts the readout protocol + Pico.m.padTHPhase[a - 1] = !(d & 0x40); + } + } else if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40)) Pico.m.padTHPhase[a - 1]++; } + // after switching TH to input there's a latency before the pullup value is + // read back as input (see Decap Attack, not in Samurai Showdown, 32x WWF Raw) + if (4 <= a && a <= 5) { + if ((PicoMem.ioports[a] & 0x40) && !(d & 0x40) && !(PicoMem.ioports[a - 3] & 0x40)) + // latency after switching to input and output was low + padTHLatency[a - 4] = SekCyclesDone() + 25; + } + // certain IO ports can be used as RAM PicoMem.ioports[a] = d; } +int io_ports_pack(void *buf, size_t size) +{ + size_t b, i; + memcpy(buf, PicoMem.ioports, (b = sizeof(PicoMem.ioports))); + for (i = 0; i < ARRAY_SIZE(Pico.m.padTHPhase); i++) + save_u8_(buf, &b, Pico.m.padTHPhase[i]); + for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++) + save_u8_(buf, &b, Pico.m.padDelay[i]); + for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) { + save_s32(buf, &b, padTHLatency[i]); + save_s32(buf, &b, padTLLatency[i]); + } + for (i = 0; i < 4; i++) + save_u16(buf, &b, PicoIn.padInt[i]); + for (i = 0; i < 4; i++) + save_s32(buf, &b, PicoIn.mouseInt[i]); + assert(b <= size); + return b; +} + +void io_ports_unpack(const void *buf, size_t size) +{ + size_t b, i; + memcpy(PicoMem.ioports, buf, (b = sizeof(PicoMem.ioports))); + for (i = 0; i < ARRAY_SIZE(Pico.m.padTHPhase); i++) + Pico.m.padTHPhase[i] = load_u8_(buf, &b); + for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++) + Pico.m.padDelay[i] = load_u8_(buf, &b); + for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) { + padTHLatency[i] = load_s32(buf, &b); + padTLLatency[i] = load_s32(buf, &b); + } + for (i = 0; i < 4; i++) + PicoIn.padInt[i] = load_u16(buf, &b); + for (i = 0; i < 4; i++) + PicoIn.mouseInt[i] = load_s32(buf, &b); + assert(b <= size); +} + static int z80_cycles_from_68k(void) { int m68k_cnt = SekCyclesDone() - Pico.t.m68c_frame_start; @@ -345,14 +662,22 @@ void NOINLINE ctl_write_z80busreq(u32 d) { if (d) { - Pico.t.z80c_cnt = z80_cycles_from_68k() + 2; + Pico.t.z80c_aim = Pico.t.z80c_cnt = z80_cycles_from_68k() + 2; + Pico.t.z80c_cnt += Pico.t.z80_busdelay >> 8; + Pico.t.z80_busdelay &= 0xff; } else { if ((PicoIn.opt & POPT_EN_Z80) && !Pico.m.z80_reset) { + // Z80 grants bus after the current M cycle, even within an insn + // simulate this by accumulating the last insn overhang in busdelay + unsigned granted; pprof_start(m68k); PicoSyncZ80(SekCyclesDone()); pprof_end_sub(m68k); + granted = Pico.t.z80c_aim + 6; // M cycle is 3-6 cycles + Pico.t.z80_busdelay += (Pico.t.z80c_cnt - granted) << 8; + Pico.t.z80c_cnt = granted; } } Pico.m.z80Run = d; @@ -372,37 +697,28 @@ void NOINLINE ctl_write_z80reset(u32 d) PicoSyncZ80(SekCyclesDone()); pprof_end_sub(m68k); } + Pico.t.z80_busdelay &= 0xff; // also resets bus request YM2612ResetChip(); timers_reset(); } else { - Pico.t.z80c_cnt = z80_cycles_from_68k() + 2; + Pico.t.z80c_aim = Pico.t.z80c_cnt = z80_cycles_from_68k() + 2; z80_reset(); } Pico.m.z80_reset = d; } } -static int get_scanline(int is_from_z80); - static void psg_write_68k(u32 d) { - // look for volume write and update if needed - if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline) - PsndDoPSG(Pico.m.scanline); - + PsndDoPSG(z80_cycles_from_68k()); SN76496Write(d); } static void psg_write_z80(u32 d) { - if ((d & 0x90) == 0x90) { - int scanline = get_scanline(1); - if (Pico.snd.psg_line < scanline) - PsndDoPSG(scanline); - } - + PsndDoPSG(z80_cyclesDone()); SN76496Write(d); } @@ -420,6 +736,7 @@ static u32 PicoRead8_sram(u32 a) d = EEPROM_read(); if (!(a & 1)) d >>= 8; + d &= 0xff; } else d = *(u8 *)(Pico.sv.data - Pico.sv.start + a); elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc); @@ -428,7 +745,7 @@ static u32 PicoRead8_sram(u32 a) // XXX: this is banking unfriendly if (a < Pico.romsize) - return Pico.rom[a ^ 1]; + return Pico.rom[MEM_BE2(a)]; return m68k_unmapped_read8(a); } @@ -507,19 +824,22 @@ static void PicoWrite16_sram(u32 a, u32 d) // TODO: verify mirrors VDP and bank reg (bank area mirroring verified) static u32 PicoRead8_z80(u32 a) { - u32 d = 0xff; - if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) { + u32 d; + if ((Pico.m.z80Run | Pico.m.z80_reset | (z80_cycles_from_68k() < Pico.t.z80c_cnt)) && + !(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK)) { elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc); - // open bus. Pulled down if MegaCD2 is attached. - return 0; + return (u8)PicoRead16_floating(a); } + SekCyclesBurnRun(1); - if ((a & 0x4000) == 0x0000) + if ((a & 0x4000) == 0x0000) { d = PicoMem.zram[a & 0x1fff]; - else if ((a & 0x6000) == 0x4000) // 0x4000-0x5fff + } else if ((a & 0x6000) == 0x4000) // 0x4000-0x5fff d = ym2612_read_local_68k(); - else + else { elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc); + d = (u8)PicoRead16_floating(a); + } return d; } @@ -531,11 +851,12 @@ static u32 PicoRead16_z80(u32 a) static void PicoWrite8_z80(u32 a, u32 d) { - if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) { + if ((Pico.m.z80Run | Pico.m.z80_reset) && !(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK)) { // verified on real hw elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %02x @ %06x", a, d&0xff, SekPc); return; } + SekCyclesBurnRun(1); if ((a & 0x4000) == 0x0000) { // z80 RAM PicoMem.zram[a & 0x1fff] = (u8)d; @@ -543,7 +864,7 @@ static void PicoWrite8_z80(u32 a, u32 d) } if ((a & 0x6000) == 0x4000) { // FM Sound if (PicoIn.opt & POPT_EN_FM) - Pico.m.status |= ym2612_write_local(a & 3, d & 0xff, 0) & 1; + ym2612_write_local(a & 3, d & 0xff, 0); return; } // TODO: probably other VDP access too? Maybe more mirrors? @@ -581,18 +902,18 @@ u32 PicoRead8_io(u32 a) goto end; } - // faking open bus (MegaCD pulldowns don't work here curiously) - d = Pico.m.rotate++; - d ^= d << 6; - if ((a & 0xfc00) == 0x1000) { - // bit8 seems to be readable in this range - if (!(a & 1)) - d &= ~0x01; + d = (u8)PicoRead16_floating(a); if ((a & 0xff01) == 0x1100) { // z80 busreq (verified) - d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1; - elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc); + // bit8 seems to be readable in this range + if (!(a & 1)) { + d &= ~0x01; + // Z80 ahead of 68K only if in BUSREQ, BUSACK only after 68K reached Z80 + d |= (z80_cycles_from_68k() < Pico.t.z80c_cnt); + d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1; + elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc); + } } goto end; } @@ -613,15 +934,13 @@ u32 PicoRead16_io(u32 a) goto end; } - // faking open bus - d = (Pico.m.rotate += 0x41); - d ^= (d << 5) ^ (d << 8); - // bit8 seems to be readable in this range if ((a & 0xfc00) == 0x1000) { - d &= ~0x0100; + d = PicoRead16_floating(a); if ((a & 0xff00) == 0x1100) { // z80 busreq + d &= ~0x0100; + d |= (z80_cycles_from_68k() < Pico.t.z80c_cnt) << 8; d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8; elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc); } @@ -686,22 +1005,25 @@ void PicoWrite16_io(u32 a, u32 d) // TODO: verify if lower byte goes to PSG on word writes u32 PicoRead8_vdp(u32 a) { + u32 d; if ((a & 0x00f0) == 0x0000) { switch (a & 0x0d) { - case 0x00: return PicoVideoRead8DataH(); - case 0x01: return PicoVideoRead8DataL(); - case 0x04: return PicoVideoRead8CtlH(); - case 0x05: return PicoVideoRead8CtlL(); + case 0x00: d = PicoVideoRead8DataH(0); break; + case 0x01: d = PicoVideoRead8DataL(0); break; + case 0x04: d = PicoVideoRead8CtlH(0); break; + case 0x05: d = PicoVideoRead8CtlL(0); break; case 0x08: - case 0x0c: return PicoVideoRead8HV_H(); + case 0x0c: d = PicoVideoRead8HV_H(0); break; case 0x09: - case 0x0d: return PicoVideoRead8HV_L(); + case 0x0d: d = PicoVideoRead8HV_L(0); break; + default: d = (u8)PicoRead16_floating(a); break; } + } else { + elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc); + d = (u8)PicoRead16_floating(a); } - - elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc); - return 0; + return d; } static u32 PicoRead16_vdp(u32 a) @@ -730,8 +1052,10 @@ static void PicoWrite8_vdp(u32 a, u32 d) static void PicoWrite16_vdp(u32 a, u32 d) { - if ((a & 0x00f9) == 0x0010) // PSG Sound + if ((a & 0x00f9) == 0x0010) { // PSG Sound psg_write_68k(d); + return; + } if ((a & 0x00e0) == 0x0000) { PicoVideoWrite(a, d); return; @@ -760,12 +1084,15 @@ PICO_INTERNAL void PicoMemSetup(void) // align to bank size. We know ROM loader allocated enough for this mask = (1 << M68K_MEM_SHIFT) - 1; rs = (Pico.romsize + mask) & ~mask; - cpu68k_map_set(m68k_read8_map, 0x000000, rs - 1, Pico.rom, 0); - cpu68k_map_set(m68k_read16_map, 0x000000, rs - 1, Pico.rom, 0); + if (rs > 0xa00000) rs = 0xa00000; // max cartridge area + if (rs) { + cpu68k_map_set(m68k_read8_map, 0x000000, rs - 1, Pico.rom, 0); + cpu68k_map_set(m68k_read16_map, 0x000000, rs - 1, Pico.rom, 0); + } // Common case of on-cart (save) RAM, usually at 0x200000-... if ((Pico.sv.flags & SRF_ENABLED) && Pico.sv.data != NULL) { - sstart = Pico.sv.start; + sstart = Pico.sv.start & ~mask; rs = Pico.sv.end - sstart; rs = (rs + mask) & ~mask; if (sstart + rs >= 0x1000000) @@ -820,24 +1147,12 @@ PICO_INTERNAL void PicoMemSetup(void) PicoCpuCM68k.fetch32 = NULL; #endif #ifdef EMU_F68K - PicoCpuFM68k.read_byte = m68k_read8; - PicoCpuFM68k.read_word = m68k_read16; - PicoCpuFM68k.read_long = m68k_read32; - PicoCpuFM68k.write_byte = m68k_write8; - PicoCpuFM68k.write_word = m68k_write16; - PicoCpuFM68k.write_long = m68k_write32; - - // setup FAME fetchmap - { - int i; - // by default, point everything to first 64k of ROM - for (i = 0; i < M68K_FETCHBANK1 * 0xe0 / 0x100; i++) - PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom - (i<<(24-FAMEC_FETCHBITS)); - // now real ROM - for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++) - PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom; - // RAM already set - } + PicoCpuFM68k.read_byte = (void *)m68k_read8; + PicoCpuFM68k.read_word = (void *)m68k_read16; + PicoCpuFM68k.read_long = (void *)m68k_read32; + PicoCpuFM68k.write_byte = (void *)m68k_write8; + PicoCpuFM68k.write_word = (void *)m68k_write16; + PicoCpuFM68k.write_long = (void *)m68k_write32; #endif #ifdef EMU_M68K m68k_mem_setup(); @@ -879,55 +1194,91 @@ static void m68k_mem_setup(void) static int get_scanline(int is_from_z80) { if (is_from_z80) { - int mclk_z80 = z80_cyclesDone() * 15; - int mclk_line = Pico.t.z80_scanline * 488 * 7; - while (mclk_z80 - mclk_line >= 488 * 7) - Pico.t.z80_scanline++, mclk_line += 488 * 7; + // ugh... compute by dividing cycles since frame start by cycles per line + // need some fractional resolution here, else there may be an extra line + int cycles_line = cycles_68k_to_z80((unsigned)(488.5*256))+1; // cycles per line, Q8 + int cycles_z80 = (z80_cyclesLeft<0 ? Pico.t.z80c_aim:z80_cyclesDone())<<8; + int cycles = cycles_line * Pico.t.z80_scanline; + // approximation by multiplying with inverse + if (cycles_z80 - cycles >= 4*cycles_line) { + // compute 1/cycles_line, storing the result to avoid future dividing + static int cycles_line_o, cycles_line_i; + if (cycles_line_o != cycles_line) + { cycles_line_o = cycles_line, cycles_line_i = (1<<22) / cycles_line; } + // compute lines = diff/cycles_line = diff*(1/cycles_line) + int lines = ((cycles_z80 - cycles) * cycles_line_i) >> 22; + Pico.t.z80_scanline += lines, cycles += cycles_line * lines; + } + // handle any rounding leftover + while (cycles_z80 - cycles >= cycles_line) + Pico.t.z80_scanline ++, cycles += cycles_line; return Pico.t.z80_scanline; } return Pico.m.scanline; } +#define ym2612_update_status(xcycles) \ + ym2612.OPN.ST.status &= ~0x80; \ + ym2612.OPN.ST.status |= (xcycles < Pico.t.ym2612_busy) * 0x80; \ + if (xcycles >= Pico.t.timer_a_next_oflow) \ + ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \ + if (xcycles >= Pico.t.timer_b_next_oflow) \ + ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2 + /* probably should not be in this file, but it's near related code here */ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new) { int xcycles = z80_cycles << 8; - /* check for overflows */ - if ((mode_old & 4) && xcycles > Pico.t.timer_a_next_oflow) - ym2612.OPN.ST.status |= 1; - - if ((mode_old & 8) && xcycles > Pico.t.timer_b_next_oflow) - ym2612.OPN.ST.status |= 2; + // update timer status + ym2612_update_status(xcycles); - /* update timer a */ + // update timer a if (mode_old & 1) - while (xcycles > Pico.t.timer_a_next_oflow) + while (xcycles >= Pico.t.timer_a_next_oflow) Pico.t.timer_a_next_oflow += Pico.t.timer_a_step; - if ((mode_old ^ mode_new) & 1) // turning on/off + // turning on/off + if ((mode_old ^ mode_new) & 1) { if (mode_old & 1) Pico.t.timer_a_next_oflow = TIMER_NO_OFLOW; - else - Pico.t.timer_a_next_oflow = xcycles + Pico.t.timer_a_step; + else { + /* The internal tick of the YM2612 takes 144 clock cycles (with clock + * being OSC/7), or 67.2 z80 cycles. Timers are run once each tick. + * Starting a timer takes place at the next tick, so xcycles needs to be + * rounded up to that: t = next tick# = (xcycles / TICK_ZCYCLES) + 1 + */ + unsigned t = ((xcycles * (((1LL<<32)/TIMER_A_TICK_ZCYCLES)+1))>>32) + 1; + Pico.t.timer_a_next_oflow = t*TIMER_A_TICK_ZCYCLES + Pico.t.timer_a_step; + } } + if (mode_new & 1) elprintf(EL_YMTIMER, "timer a upd to %i @ %i", Pico.t.timer_a_next_oflow>>8, z80_cycles); - /* update timer b */ + // update timer b if (mode_old & 2) - while (xcycles > Pico.t.timer_b_next_oflow) + while (xcycles >= Pico.t.timer_b_next_oflow) Pico.t.timer_b_next_oflow += Pico.t.timer_b_step; + // turning on/off if ((mode_old ^ mode_new) & 2) { if (mode_old & 2) Pico.t.timer_b_next_oflow = TIMER_NO_OFLOW; - else - Pico.t.timer_b_next_oflow = xcycles + Pico.t.timer_b_step; + else { + /* timer b has a divider of 16 which runs in its own counter. It is not + * reset by loading timer b. The first run of timer b after loading is + * therefore shorter by up to 15 ticks. + */ + unsigned t = ((xcycles * (((1LL<<32)/TIMER_A_TICK_ZCYCLES)+1))>>32) + 1; + int step = Pico.t.timer_b_step - TIMER_A_TICK_ZCYCLES*(t&15); + Pico.t.timer_b_next_oflow = t*TIMER_A_TICK_ZCYCLES + step; + } } + if (mode_new & 2) elprintf(EL_YMTIMER, "timer b upd to %i @ %i", Pico.t.timer_b_next_oflow>>8, z80_cycles); } @@ -935,36 +1286,30 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new) // ym2612 DAC and timer I/O handlers for z80 static int ym2612_write_local(u32 a, u32 d, int is_from_z80) { + int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k(); int addr; a &= 3; - if (a == 1 && ym2612.OPN.ST.address == 0x2a) /* DAC data */ - { - int scanline = get_scanline(is_from_z80); - //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", Pico.snd.dac_line, scanline, d, is_from_z80); - ym2612.dacout = ((int)d - 0x80) << 6; - if (ym2612.dacen) - PsndDoDAC(scanline); - return 0; - } - switch (a) { case 0: /* address port 0 */ + case 2: /* address port 1 */ ym2612.OPN.ST.address = d; - ym2612.addr_A1 = 0; + ym2612.addr_A1 = (a & 2) >> 1; #ifdef __GP2X__ if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1); #endif return 0; case 1: /* data port 0 */ - if (ym2612.addr_A1 != 0) - return 0; - - addr = ym2612.OPN.ST.address; + case 3: /* data port 1 */ + addr = ym2612.OPN.ST.address | ((int)ym2612.addr_A1 << 8); ym2612.REGS[addr] = d; + // the busy flag in the YM2612 status is actually a 32 cycle timer + // (89.6 Z80 cycles), triggered by any write to the data port. + Pico.t.ym2612_busy = (cycles << 8) + YMBUSY_ZCYCLES; // Q8 for convenience + switch (addr) { case 0x24: // timer A High 8 @@ -973,42 +1318,35 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80) : ((ym2612.OPN.ST.TA & 0x3fc)|(d&3)); if (ym2612.OPN.ST.TA != TAnew) { + ym2612_sync_timers(cycles, ym2612.OPN.ST.mode, ym2612.OPN.ST.mode); //elprintf(EL_STATUS, "timer a set %i", TAnew); ym2612.OPN.ST.TA = TAnew; //ym2612.OPN.ST.TAC = (1024-TAnew)*18; //ym2612.OPN.ST.TAT = 0; Pico.t.timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew); - if (ym2612.OPN.ST.mode & 1) { - // this is not right, should really be done on overflow only - int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k(); - Pico.t.timer_a_next_oflow = (cycles << 8) + Pico.t.timer_a_step; - } elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, Pico.t.timer_a_next_oflow>>8); } return 0; } case 0x26: // timer B if (ym2612.OPN.ST.TB != d) { + ym2612_sync_timers(cycles, ym2612.OPN.ST.mode, ym2612.OPN.ST.mode); //elprintf(EL_STATUS, "timer b set %i", d); ym2612.OPN.ST.TB = d; //ym2612.OPN.ST.TBC = (256-d) * 288; //ym2612.OPN.ST.TBT = 0; - Pico.t.timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800 - if (ym2612.OPN.ST.mode & 2) { - int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k(); - Pico.t.timer_b_next_oflow = (cycles << 8) + Pico.t.timer_b_step; - } + Pico.t.timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, Pico.t.timer_b_next_oflow>>8); } return 0; case 0x27: { /* mode, timer control */ int old_mode = ym2612.OPN.ST.mode; - int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k(); - ym2612.OPN.ST.mode = d; elprintf(EL_YMTIMER, "st mode %02x", d); ym2612_sync_timers(cycles, old_mode, d); + ym2612.OPN.ST.mode = d; + /* reset Timer a flag */ if (d & 0x10) ym2612.OPN.ST.status &= ~1; @@ -1021,60 +1359,43 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80) #ifdef __GP2X__ if (PicoIn.opt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80)); #endif + PsndDoFM(cycles); return 1; } return 0; } + case 0x2a: { /* DAC data */ + //elprintf(EL_STATUS, "%03i dac w %08x z80 %i", cycles, d, is_from_z80); + if (ym2612.dacen) + PsndDoDAC(cycles); + ym2612.dacout = ((int)d - 0x80) << DAC_SHIFT; + return 0; + } case 0x2b: { /* DAC Sel (YM2612) */ - int scanline = get_scanline(is_from_z80); - if (ym2612.dacen != (d & 0x80)) { - ym2612.dacen = d & 0x80; - Pico.snd.dac_line = scanline; - } + ym2612.dacen = d & 0x80; #ifdef __GP2X__ - if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, scanline); + if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80)); #endif return 0; } } break; - - case 2: /* address port 1 */ - ym2612.OPN.ST.address = d; - ym2612.addr_A1 = 1; -#ifdef __GP2X__ - if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1); -#endif - return 0; - - case 3: /* data port 1 */ - if (ym2612.addr_A1 != 1) - return 0; - - addr = ym2612.OPN.ST.address | 0x100; - ym2612.REGS[addr] = d; - break; } #ifdef __GP2X__ if (PicoIn.opt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80)); #endif + PsndDoFM(cycles); return YM2612Write_(a, d); } -#define ym2612_read_local() \ - if (xcycles >= Pico.t.timer_a_next_oflow) \ - ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \ - if (xcycles >= Pico.t.timer_b_next_oflow) \ - ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2 - static u32 ym2612_read_local_z80(void) { int xcycles = z80_cyclesDone() << 8; - ym2612_read_local(); + ym2612_update_status(xcycles); elprintf(EL_YMTIMER, "timer z80 read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status, Pico.t.timer_a_next_oflow >> 8, @@ -1086,7 +1407,7 @@ static u32 ym2612_read_local_68k(void) { int xcycles = z80_cycles_from_68k() << 8; - ym2612_read_local(); + ym2612_update_status(xcycles); elprintf(EL_YMTIMER, "timer 68k read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status, Pico.t.timer_a_next_oflow >> 8, @@ -1094,33 +1415,60 @@ static u32 ym2612_read_local_68k(void) return ym2612.OPN.ST.status; } -void ym2612_pack_state(void) +// legacy code, only used for GP2X +void ym2612_pack_state_old(void) +{ + // timers are saved as tick counts, in 16.16 int format + int tat = 0, tbt = 0, busy = 0; + u8 buf[16]; + size_t b = 0; + + ym2612_pack_timers(buf, sizeof(buf)); + load_u16(buf, &b), load_u16(buf, &b); + tat = load_u32(buf, &b); + tbt = load_u32(buf, &b); + busy = load_u32(buf, &b); + +#ifdef __GP2X__ + if (PicoIn.opt & POPT_EXT_FM) + YM2612PicoStateSave2_940(tat, tbt); + else +#endif + YM2612PicoStateSave2(tat, tbt, busy); +} + +int ym2612_pack_timers(void *buf, size_t size) { // timers are saved as tick counts, in 16.16 int format - int tac, tat = 0, tbc, tbt = 0; + int tac, tat = 0, tbc, tbt = 0, busy = 0; + size_t b = 0; + tac = 1024 - ym2612.OPN.ST.TA; tbc = 256 - ym2612.OPN.ST.TB; + if (Pico.t.ym2612_busy > 0) + busy = cycles_z80_to_68k(Pico.t.ym2612_busy); if (Pico.t.timer_a_next_oflow != TIMER_NO_OFLOW) - tat = (int)((double)(Pico.t.timer_a_step - Pico.t.timer_a_next_oflow) - / (double)Pico.t.timer_a_step * tac * 65536); + tat = ((Pico.t.timer_a_step - Pico.t.timer_a_next_oflow) * ((1LL<<32)/TIMER_A_TICK_ZCYCLES+1))>>16; if (Pico.t.timer_b_next_oflow != TIMER_NO_OFLOW) - tbt = (int)((double)(Pico.t.timer_b_step - Pico.t.timer_b_next_oflow) - / (double)Pico.t.timer_b_step * tbc * 65536); + tbt = ((Pico.t.timer_b_step - Pico.t.timer_b_next_oflow) * ((1LL<<32)/TIMER_B_TICK_ZCYCLES+1))>>16; elprintf(EL_YMTIMER, "save: timer a %i/%i", tat >> 16, tac); elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc); -#ifdef __GP2X__ - if (PicoIn.opt & POPT_EXT_FM) - YM2612PicoStateSave2_940(tat, tbt); - else -#endif - YM2612PicoStateSave2(tat, tbt); + assert(size >= 16); + save_u16(buf, &b, ym2612.OPN.ST.TA); + save_u16(buf, &b, ym2612.OPN.ST.TB); + save_u32(buf, &b, tat); + save_u32(buf, &b, tbt); + save_u32(buf, &b, busy); + return b; } -void ym2612_unpack_state(void) +// legacy code, only used for GP2X +void ym2612_unpack_state_old(void) { - int i, ret, tac, tat, tbc, tbt; + int i, ret, tat, tbt, busy = 0; YM2612PicoStateLoad(); + Pico.t.m68c_frame_start = SekCyclesDone(); // feed all the registers and update internal state for (i = 0x20; i < 0xA0; i++) { @@ -1149,20 +1497,44 @@ void ym2612_unpack_state(void) ret = YM2612PicoStateLoad2_940(&tat, &tbt); else #endif - ret = YM2612PicoStateLoad2(&tat, &tbt); + ret = YM2612PicoStateLoad2(&tat, &tbt, &busy); if (ret != 0) { elprintf(EL_STATUS, "old ym2612 state"); return; // no saved timers } + { + u8 tmp[16]; + size_t b = 0; + save_u16(tmp, &b, ym2612.OPN.ST.TA); + save_u16(tmp, &b, ym2612.OPN.ST.TB); + save_u32(tmp, &b, tat); + save_u32(tmp, &b, tbt); + save_u32(tmp, &b, busy); + ym2612_unpack_timers(tmp, b); + } +} +void ym2612_unpack_timers(const void *buf, size_t size) +{ + int tac, tat, tbc, tbt, busy; + size_t b = 0; + assert(size >= 16); + if (size < 16) + return; + ym2612.OPN.ST.TA = load_u16(buf, &b); + ym2612.OPN.ST.TB = load_u16(buf, &b); + tat = load_u32(buf, &b); + tbt = load_u32(buf, &b); + busy = load_u32(buf, &b); + Pico.t.ym2612_busy = cycles_68k_to_z80(busy); tac = (1024 - ym2612.OPN.ST.TA) << 16; tbc = (256 - ym2612.OPN.ST.TB) << 16; if (ym2612.OPN.ST.mode & 1) - Pico.t.timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * Pico.t.timer_a_step); + Pico.t.timer_a_next_oflow = (1LL * (tac-tat) * TIMER_A_TICK_ZCYCLES)>>16; else Pico.t.timer_a_next_oflow = TIMER_NO_OFLOW; if (ym2612.OPN.ST.mode & 2) - Pico.t.timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * Pico.t.timer_b_step); + Pico.t.timer_b_next_oflow = (1LL * (tbc-tbt) * TIMER_B_TICK_ZCYCLES)>>16; else Pico.t.timer_b_next_oflow = TIMER_NO_OFLOW; elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, Pico.t.timer_a_next_oflow >> 8); @@ -1180,19 +1552,34 @@ void PicoWrite16_32x(u32 a, u32 d) {} // ----------------------------------------------------------------- // z80 memhandlers +static void access_68k_bus(int delay) // bus delay as Q8 +{ + // TODO: if the 68K is in DMA wait, Z80 has to wait until DMA ends + + // 68k bus access delay for z80. The fractional part needs to be accumulated + // until an additional cycle is full. That is then added to the integer part. + Pico.t.z80_busdelay += (delay&0xff); // accumulate + z80_subCLeft((delay>>8) + (Pico.t.z80_busdelay>>8)); + Pico.t.z80_busdelay &= 0xff; // leftover cycle fraction + // don't use SekCyclesBurn() here since the Z80 doesn't run in cycle lock to + // the 68K. Count the stolen cycles to be accounted later in the 68k CPU runs + Pico.t.z80_buscycles += 0x80; // TODO <=8.4 for Rick 2, but >=8.9 for misc_test +} + static unsigned char z80_md_vdp_read(unsigned short a) { - z80_subCLeft(2); + if ((a & 0xff00) == 0x7f00) { + // 68k bus access delay=3.3 per kabuto, for notaz picotest 2.422.42) - 0x292(<2.57) - if ((a & 0x00f0) == 0x0000) { switch (a & 0x0d) { - case 0x00: return PicoVideoRead8DataH(); - case 0x01: return PicoVideoRead8DataL(); - case 0x04: return PicoVideoRead8CtlH(); - case 0x05: return PicoVideoRead8CtlL(); + case 0x00: return PicoVideoRead8DataH(1); + case 0x01: return PicoVideoRead8DataL(1); + case 0x04: return PicoVideoRead8CtlH(1); + case 0x05: return PicoVideoRead8CtlL(1); case 0x08: - case 0x0c: return get_scanline(1); // FIXME: make it proper + case 0x0c: return PicoVideoGetV(get_scanline(1), 1); case 0x09: case 0x0d: return Pico.m.rotate++; } @@ -1205,14 +1592,16 @@ static unsigned char z80_md_vdp_read(unsigned short a) static unsigned char z80_md_bank_read(unsigned short a) { unsigned int addr68k; - unsigned char ret; + unsigned char ret = 0xff; - z80_subCLeft(3); + // 68k bus access delay=3.3 per kabuto, but for notaz picotest 3.023.02)-0x351(<3.32) addr68k = Pico.m.z80_bank68k << 15; addr68k |= a & 0x7fff; - ret = m68k_read8(addr68k); + if (addr68k < 0xe00000) // can't read from 68K RAM + ret = m68k_read8(addr68k); elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret); return ret; @@ -1221,7 +1610,7 @@ static unsigned char z80_md_bank_read(unsigned short a) static void z80_md_ym2612_write(unsigned int a, unsigned char data) { if (PicoIn.opt & POPT_EN_FM) - Pico.m.status |= ym2612_write_local(a, data, 1) & 1; + ym2612_write_local(a, data, 1); } static void z80_md_vdp_br_write(unsigned int a, unsigned char data) @@ -1248,6 +1637,9 @@ static void z80_md_bank_write(unsigned int a, unsigned char data) { unsigned int addr68k; + // 68k bus access delay=3.3 per kabuto, but for notaz picotest 3.023.02)-0x351(<3.32) + addr68k = Pico.m.z80_bank68k << 15; addr68k += a & 0x7fff; @@ -1287,8 +1679,6 @@ static void z80_mem_setup(void) drZ80.z80_out = z80_md_out; #endif #ifdef _USE_CZ80 - Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)PicoMem.zram); // main RAM - Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)PicoMem.zram); // mirror Cz80_Set_INPort(&CZ80, z80_md_in); Cz80_Set_OUTPort(&CZ80, z80_md_out); #endif