X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=e747552f174fe41840748c2fc4d3312330bb9107;hb=88fd63ad10faa746ef9d7ad7d98a72e51fe2aa86;hp=9967f5c2877f58e7a326011fbef6f106046dce35;hpb=553c3eaa3a4bda6ba99d925ecab518fe82530cd6;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index 9967f5c..e747552 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -1,11 +1,11 @@
-// This is part of Pico Library
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * memory handling
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "pico_int.h"
 #include "memory.h"
@@ -23,6 +23,11 @@ uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
 static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
     const void *func_or_mh, int is_func)
 {
+#ifdef __clang__
+  // workaround bug (segfault) in 
+  // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
+  volatile 
+#endif
   uptr addr = (uptr)func_or_mh;
   int mask = (1 << shift) - 1;
   int i;
@@ -44,7 +49,7 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
   for (i = start_addr >> shift; i <= end_addr >> shift; i++) {
     map[i] = addr >> 1;
     if (is_func)
-      map[i] |= 1 << (sizeof(addr) * 8 - 1);
+      map[i] |= MAP_FLAG;
   }
 }
 
@@ -58,6 +63,17 @@ void cpu68k_map_set(uptr *map, int start_addr, int 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);
+#ifdef EMU_F68K
+  // setup FAME fetchmap
+  if (!is_func)
+  {
+    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;
+  }
+#endif
 }
 
 // more specialized/optimized function (does same as above)
@@ -84,6 +100,17 @@ void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)
   addr >>= 1;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     r8map[i] = r16map[i] = w8map[i] = w16map[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
 }
 
 static u32 m68k_unmapped_read8(u32 a)
@@ -110,25 +137,30 @@ static void m68k_unmapped_write16(u32 a, u32 d)
 
 void m68k_map_unmap(int start_addr, int end_addr)
 {
+#ifdef __clang__
+  // workaround bug (segfault) in 
+  // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
+  volatile 
+#endif
   uptr addr;
   int shift = M68K_MEM_SHIFT;
   int i;
 
   addr = (uptr)m68k_unmapped_read8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_read16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read16_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;
 }
 
 MAKE_68K_READ8(m68k_read8, m68k_read8_map)
@@ -166,7 +198,7 @@ void log_io(unsigned int addr, int bits, int rw);
 #if defined(EMU_C68K)
 void cyclone_crashed(u32 pc, struct Cyclone *context)
 {
-    elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x\n",
+    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;
@@ -176,89 +208,152 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
 // -----------------------------------------------------------------
 // memmap helpers
 
-#ifndef _ASM_MEMORY_C
-static
-#endif
-int PadRead(int i)
+static u32 read_pad_3btn(int i, u32 out_bits)
 {
-  int pad,value,data_reg;
-  pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
-  data_reg=Pico.ioports[i+1];
+  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  u32 value;
 
-  // orr the bits, which are set as output
-  value = data_reg&(Pico.ioports[i+4]|0x80);
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                      // ?1CB RLDU
+  else
+    value = ((pad & 0xc0) >> 2) | (pad & 3); // ?0SA 00DU
 
-  if (PicoOpt & POPT_6BTN_PAD)
-  {
-    int phase = Pico.m.padTHPhase[i];
-
-    if(phase == 2 && !(data_reg&0x40)) { // TH
-      value|=(pad&0xc0)>>2;              // ?0SA 0000
-      return value;
-    } else if(phase == 3) {
-      if(data_reg&0x40)
-        value|=(pad&0x30)|((pad>>8)&0xf);  // ?1CB MXYZ
-      else
-        value|=((pad&0xc0)>>2)|0x0f;       // ?0SA 1111
-      return value;
-    }
+  value |= out_bits & 0x40;
+  return value;
+}
+
+static u32 read_pad_6btn(int i, u32 out_bits)
+{
+  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  int phase = Pico.m.padTHPhase[i];
+  u32 value;
+
+  if (phase == 2 && !(out_bits & 0x40)) {
+    value = (pad & 0xc0) >> 2;                   // ?0SA 0000
+    goto out;
+  }
+  else if(phase == 3) {
+    if (out_bits & 0x40)
+      return (pad & 0x30) | ((pad >> 8) & 0xf);  // ?1CB MXYZ
+    else
+      return ((pad & 0xc0) >> 2) | 0x0f;         // ?0SA 1111
+    goto out;
   }
 
-  if(data_reg&0x40) // TH
-       value|=(pad&0x3f);              // ?1CB RLDU
-  else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                          // ?1CB RLDU
+  else
+    value = ((pad & 0xc0) >> 2) | (pad & 3);     // ?0SA 00DU
 
-  return value; // will mirror later
+out:
+  value |= out_bits & 0x40;
+  return value;
 }
 
-#ifndef _ASM_MEMORY_C
+static u32 read_nothing(int i, u32 out_bits)
+{
+  return 0xff;
+}
+
+typedef u32 (port_read_func)(int index, u32 out_bits);
+
+static port_read_func *port_readers[3] = {
+  read_pad_3btn,
+  read_pad_3btn,
+  read_nothing
+};
+
+static NOINLINE u32 port_read(int i)
+{
+  u32 data_reg = PicoMem.ioports[i + 1];
+  u32 ctrl_reg = PicoMem.ioports[i + 4] | 0x80;
+  u32 in, out;
+
+  out = data_reg & ctrl_reg;
+  out |= 0x7f & ~ctrl_reg; // pull-ups
+
+  in = port_readers[i](i, out);
+
+  return (in & ~ctrl_reg) | (data_reg & ctrl_reg);
+}
+
+void PicoSetInputDevice(int port, enum input_device device)
+{
+  port_read_func *func;
+
+  if (port < 0 || port > 2)
+    return;
+
+  switch (device) {
+  case PICO_INPUT_PAD_3BTN:
+    func = read_pad_3btn;
+    break;
+
+  case PICO_INPUT_PAD_6BTN:
+    func = read_pad_6btn;
+    break;
 
-static u32 io_ports_read(u32 a)
+  default:
+    func = read_nothing;
+    break;
+  }
+
+  port_readers[port] = func;
+}
+
+NOINLINE u32 io_ports_read(u32 a)
 {
   u32 d;
   a = (a>>1) & 0xf;
   switch (a) {
     case 0:  d = Pico.m.hardware; break; // Hardware value (Version register)
-    case 1:  d = PadRead(0); break;
-    case 2:  d = PadRead(1); break;
-    default: d = Pico.ioports[a]; break; // IO ports can be used as RAM
+    case 1:  d = port_read(0); break;
+    case 2:  d = port_read(1); break;
+    case 3:  d = port_read(2); break;
+    default: d = PicoMem.ioports[a]; break; // IO ports can be used as RAM
   }
   return d;
 }
 
-static void NOINLINE io_ports_write(u32 a, u32 d)
+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
-  if (1 <= a && a <= 2 && (PicoOpt & POPT_6BTN_PAD))
+  if (1 <= a && a <= 2)
   {
     Pico.m.padDelay[a - 1] = 0;
-    if (!(Pico.ioports[a] & 0x40) && (d & 0x40))
+    if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40))
       Pico.m.padTHPhase[a - 1]++;
   }
 
   // certain IO ports can be used as RAM
-  Pico.ioports[a] = d;
+  PicoMem.ioports[a] = d;
 }
 
-#endif // _ASM_MEMORY_C
+static int z80_cycles_from_68k(void)
+{
+  int m68k_cnt = SekCyclesDone() - Pico.t.m68c_frame_start;
+  return cycles_68k_to_z80(m68k_cnt);
+}
 
 void NOINLINE ctl_write_z80busreq(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%u] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80Run)
   {
     if (d)
     {
-      z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
+      Pico.t.z80c_cnt = z80_cycles_from_68k() + 2;
     }
     else
     {
-      z80stopCycle = SekCyclesDone();
-      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset)
-        PicoSyncZ80(z80stopCycle);
+      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {
+        pprof_start(m68k);
+        PicoSyncZ80(SekCyclesDone());
+        pprof_end_sub(m68k);
+      }
     }
     Pico.m.z80Run = d;
   }
@@ -267,25 +362,50 @@ void NOINLINE ctl_write_z80busreq(u32 d)
 void NOINLINE ctl_write_z80reset(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%u] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80_reset)
   {
     if (d)
     {
-      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run)
+      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) {
+        pprof_start(m68k);
         PicoSyncZ80(SekCyclesDone());
+        pprof_end_sub(m68k);
+      }
       YM2612ResetChip();
       timers_reset();
     }
     else
     {
-      z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
+      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 && PsndPsgLine < Pico.m.scanline)
+    PsndDoPSG(Pico.m.scanline);
+
+  SN76496Write(d);
+}
+
+static void psg_write_z80(u32 d)
+{
+  if ((d & 0x90) == 0x90) {
+    int scanline = get_scanline(1);
+    if (PsndPsgLine < scanline)
+      PsndDoPSG(scanline);
+  }
+
+  SN76496Write(d);
+}
+
 // -----------------------------------------------------------------
 
 #ifndef _ASM_MEMORY_C
@@ -294,14 +414,14 @@ void NOINLINE ctl_write_z80reset(u32 d)
 static u32 PicoRead8_sram(u32 a)
 {
   u32 d;
-  if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))
+  if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
-    if (SRam.flags & SRF_EEPROM) {
+    if (Pico.sv.flags & SRF_EEPROM) {
       d = EEPROM_read();
       if (!(a & 1))
         d >>= 8;
     } else
-      d = *(u8 *)(SRam.data - SRam.start + a);
+      d = *(u8 *)(Pico.sv.data - Pico.sv.start + a);
     elprintf(EL_SRAMIO, "sram r8  [%06x]   %02x @ %06x", a, d, SekPc);
     return d;
   }
@@ -316,12 +436,12 @@ static u32 PicoRead8_sram(u32 a)
 static u32 PicoRead16_sram(u32 a)
 {
   u32 d;
-  if (SRam.end >= a && a >= SRam.start && (Pico.m.sram_reg & SRR_MAPPED))
+  if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
-    if (SRam.flags & SRF_EEPROM)
+    if (Pico.sv.flags & SRF_EEPROM)
       d = EEPROM_read();
     else {
-      u8 *pm = (u8 *)(SRam.data - SRam.start + a);
+      u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
       d  = pm[0] << 8;
       d |= pm[1];
     }
@@ -339,20 +459,20 @@ static u32 PicoRead16_sram(u32 a)
 
 static void PicoWrite8_sram(u32 a, u32 d)
 {
-  if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
+  if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
     m68k_unmapped_write8(a, d);
     return;
   }
 
   elprintf(EL_SRAMIO, "sram w8  [%06x]   %02x @ %06x", a, d & 0xff, SekPc);
-  if (SRam.flags & SRF_EEPROM)
+  if (Pico.sv.flags & SRF_EEPROM)
   {
     EEPROM_write8(a, d);
   }
   else {
-    u8 *pm = (u8 *)(SRam.data - SRam.start + a);
+    u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
     if (*pm != (u8)d) {
-      SRam.changed = 1;
+      Pico.sv.changed = 1;
       *pm = (u8)d;
     }
   }
@@ -360,22 +480,25 @@ static void PicoWrite8_sram(u32 a, u32 d)
 
 static void PicoWrite16_sram(u32 a, u32 d)
 {
-  if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
+  if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
     m68k_unmapped_write16(a, d);
     return;
   }
 
   elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d & 0xffff, SekPc);
-  if (SRam.flags & SRF_EEPROM)
+  if (Pico.sv.flags & SRF_EEPROM)
   {
     EEPROM_write16(d);
   }
   else {
-    // XXX: hardware could easily use MSB too..
-    u8 *pm = (u8 *)(SRam.data - SRam.start + a);
-    if (*pm != (u8)d) {
-      SRam.changed = 1;
-      *pm = (u8)d;
+    u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
+    if (pm[0] != (u8)(d >> 8)) {
+      Pico.sv.changed = 1;
+      pm[0] = (u8)(d >> 8);
+    }
+    if (pm[1] != (u8)d) {
+      Pico.sv.changed = 1;
+      pm[1] = (u8)d;
     }
   }
 }
@@ -392,7 +515,7 @@ static u32 PicoRead8_z80(u32 a)
   }
 
   if ((a & 0x4000) == 0x0000)
-    d = Pico.zram[a & 0x1fff];
+    d = PicoMem.zram[a & 0x1fff];
   else if ((a & 0x6000) == 0x4000) // 0x4000-0x5fff
     d = ym2612_read_local_68k(); 
   else
@@ -415,8 +538,7 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
 
   if ((a & 0x4000) == 0x0000) { // z80 RAM
-    SekCyclesBurn(2); // hack
-    Pico.zram[a & 0x1fff] = (u8)d;
+    PicoMem.zram[a & 0x1fff] = (u8)d;
     return;
   }
   if ((a & 0x6000) == 0x4000) { // FM Sound
@@ -426,8 +548,7 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
   // TODO: probably other VDP access too? Maybe more mirrors?
   if ((a & 0x7ff9) == 0x7f11) { // PSG Sound
-    if (PicoOpt & POPT_EN_PSG)
-      SN76496Write(d);
+    psg_write_68k(d);
     return;
   }
   if ((a & 0x7f00) == 0x6000) // Z80 BANK register
@@ -471,7 +592,7 @@ u32 PicoRead8_io(u32 a)
 
     if ((a & 0xff01) == 0x1100) { // z80 busreq (verified)
       d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1;
-      elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
@@ -506,7 +627,7 @@ u32 PicoRead16_io(u32 a)
 
     if ((a & 0xff00) == 0x1100) { // z80 busreq
       d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8;
-      elprintf(EL_BUSREQ, "get_zrun: %04x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
@@ -580,10 +701,21 @@ void PicoWrite16_io(u32 a, u32 d)
 
 // VDP area (0xc00000 - 0xdfffff)
 // TODO: verify if lower byte goes to PSG on word writes
-static u32 PicoRead8_vdp(u32 a)
+u32 PicoRead8_vdp(u32 a)
 {
-  if ((a & 0x00e0) == 0x0000)
-    return PicoVideoRead8(a);
+  if ((a & 0x00f0) == 0x0000) {
+    switch (a & 0x0d)
+    {
+      case 0x00: return PicoVideoRead8DataH();
+      case 0x01: return PicoVideoRead8DataL();
+      case 0x04: return PicoVideoRead8CtlH();
+      case 0x05: return PicoVideoRead8CtlL();
+      case 0x08:
+      case 0x0c: return PicoVideoRead8HV_H();
+      case 0x09:
+      case 0x0d: return PicoVideoRead8HV_L();
+    }
+  }
 
   elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc);
   return 0;
@@ -601,8 +733,7 @@ static u32 PicoRead16_vdp(u32 a)
 static void PicoWrite8_vdp(u32 a, u32 d)
 {
   if ((a & 0x00f9) == 0x0011) { // PSG Sound
-    if (PicoOpt & POPT_EN_PSG)
-      SN76496Write(d);
+    psg_write_68k(d);
     return;
   }
   if ((a & 0x00e0) == 0x0000) {
@@ -616,11 +747,8 @@ static void PicoWrite8_vdp(u32 a, u32 d)
 
 static void PicoWrite16_vdp(u32 a, u32 d)
 {
-  if ((a & 0x00f9) == 0x0010) { // PSG Sound
-    if (PicoOpt & POPT_EN_PSG)
-      SN76496Write(d);
-    return;
-  }
+  if ((a & 0x00f9) == 0x0010) // PSG Sound
+    psg_write_68k(d);
   if ((a & 0x00e0) == 0x0000) {
     PicoVideoWrite(a, d);
     return;
@@ -637,7 +765,7 @@ static void m68k_mem_setup(void);
 
 PICO_INTERNAL void PicoMemSetup(void)
 {
-  int mask, rs, a;
+  int mask, rs, sstart, a;
 
   // setup the memory map
   cpu68k_map_set(m68k_read8_map,   0x000000, 0xffffff, m68k_unmapped_read8, 1);
@@ -653,15 +781,16 @@ PICO_INTERNAL void PicoMemSetup(void)
   cpu68k_map_set(m68k_read16_map, 0x000000, rs - 1, Pico.rom, 0);
 
   // Common case of on-cart (save) RAM, usually at 0x200000-...
-  if ((SRam.flags & SRF_ENABLED) && SRam.data != NULL) {
-    rs = SRam.end - SRam.start;
+  if ((Pico.sv.flags & SRF_ENABLED) && Pico.sv.data != NULL) {
+    sstart = Pico.sv.start;
+    rs = Pico.sv.end - sstart;
     rs = (rs + mask) & ~mask;
-    if (SRam.start + rs >= 0x1000000)
-      rs = 0x1000000 - SRam.start;
-    cpu68k_map_set(m68k_read8_map,   SRam.start, SRam.start + rs - 1, PicoRead8_sram, 1);
-    cpu68k_map_set(m68k_read16_map,  SRam.start, SRam.start + rs - 1, PicoRead16_sram, 1);
-    cpu68k_map_set(m68k_write8_map,  SRam.start, SRam.start + rs - 1, PicoWrite8_sram, 1);
-    cpu68k_map_set(m68k_write16_map, SRam.start, SRam.start + rs - 1, PicoWrite16_sram, 1);
+    if (sstart + rs >= 0x1000000)
+      rs = 0x1000000 - sstart;
+    cpu68k_map_set(m68k_read8_map,   sstart, sstart + rs - 1, PicoRead8_sram, 1);
+    cpu68k_map_set(m68k_read16_map,  sstart, sstart + rs - 1, PicoRead16_sram, 1);
+    cpu68k_map_set(m68k_write8_map,  sstart, sstart + rs - 1, PicoWrite8_sram, 1);
+    cpu68k_map_set(m68k_write16_map, sstart, sstart + rs - 1, PicoWrite16_sram, 1);
   }
 
   // Z80 region
@@ -688,10 +817,10 @@ PICO_INTERNAL void PicoMemSetup(void)
 
   // RAM and it's mirrors
   for (a = 0xe00000; a < 0x1000000; a += 0x010000) {
-    cpu68k_map_set(m68k_read8_map,   a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_read16_map,  a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_write8_map,  a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_write16_map, a, a + 0xffff, Pico.ram, 0);
+    cpu68k_map_set(m68k_read8_map,   a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_read16_map,  a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_write8_map,  a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_write16_map, a, a + 0xffff, PicoMem.ram, 0);
   }
 
   // Setup memory callbacks:
@@ -719,14 +848,12 @@ PICO_INTERNAL void PicoMemSetup(void)
   {
     int i;
     // by default, point everything to first 64k of ROM
-    for (i = 0; i < M68K_FETCHBANK1; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
+    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 int)Pico.rom;
-    // .. and RAM
-    for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
+    // RAM already set
   }
 #endif
 #ifdef EMU_M68K
@@ -769,10 +896,11 @@ static void m68k_mem_setup(void)
 static int get_scanline(int is_from_z80)
 {
   if (is_from_z80) {
-    int cycles = z80_cyclesDone();
-    while (cycles - z80_scanline_cycles >= 228)
-      z80_scanline++, z80_scanline_cycles += 228;
-    return z80_scanline;
+    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;
+    return Pico.t.z80_scanline;
   }
 
   return Pico.m.scanline;
@@ -832,7 +960,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
     int scanline = get_scanline(is_from_z80);
     //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", PsndDacLine, scanline, d, is_from_z80);
     ym2612.dacout = ((int)d - 0x80) << 6;
-    if (PsndOut && ym2612.dacen && scanline >= PsndDacLine)
+    if (ym2612.dacen)
       PsndDoDAC(scanline);
     return 0;
   }
@@ -869,7 +997,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             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() : cycles_68k_to_z80(SekCyclesDone());
+              int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
               timer_a_next_oflow = (cycles << 8) + timer_a_step;
             }
             elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, timer_a_next_oflow>>8);
@@ -884,7 +1012,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             //ym2612.OPN.ST.TBT  = 0;
             timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800
             if (ym2612.OPN.ST.mode & 2) {
-              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+              int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
               timer_b_next_oflow = (cycles << 8) + timer_b_step;
             }
             elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, timer_b_next_oflow>>8);
@@ -892,7 +1020,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
           return 0;
         case 0x27: { /* mode, timer control */
           int old_mode = ym2612.OPN.ST.mode;
-          int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+          int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
           ym2612.OPN.ST.mode = d;
 
           elprintf(EL_YMTIMER, "st mode %02x", d);
@@ -916,8 +1044,10 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
         }
         case 0x2b: { /* DAC Sel  (YM2612) */
           int scanline = get_scanline(is_from_z80);
-          ym2612.dacen = d & 0x80;
-          if (d & 0x80) PsndDacLine = scanline;
+          if (ym2612.dacen != (d & 0x80)) {
+            ym2612.dacen = d & 0x80;
+            PsndDacLine = scanline;
+          }
 #ifdef __GP2X__
           if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);
 #endif
@@ -970,7 +1100,7 @@ static u32 ym2612_read_local_z80(void)
 
 static u32 ym2612_read_local_68k(void)
 {
-  int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 8;
+  int xcycles = z80_cycles_from_68k() << 8;
 
   ym2612_read_local();
 
@@ -1052,12 +1182,35 @@ void ym2612_unpack_state(void)
   elprintf(EL_YMTIMER, "load: %i/%i, timer_b_next_oflow %i", tbt>>16, tbc>>16, timer_b_next_oflow >> 8);
 }
 
+#if defined(NO_32X) && defined(_ASM_MEMORY_C)
+// referenced by asm code
+u32 PicoRead8_32x(u32 a) { return 0; }
+u32 PicoRead16_32x(u32 a) { return 0; }
+void PicoWrite8_32x(u32 a, u32 d) {}
+void PicoWrite16_32x(u32 a, u32 d) {}
+#endif
+
 // -----------------------------------------------------------------
 //                        z80 memhandlers
 
 static unsigned char z80_md_vdp_read(unsigned short a)
 {
-  // TODO?
+  z80_subCLeft(2);
+
+  if ((a & 0x00f0) == 0x0000) {
+    switch (a & 0x0d)
+    {
+      case 0x00: return PicoVideoRead8DataH();
+      case 0x01: return PicoVideoRead8DataL();
+      case 0x04: return PicoVideoRead8CtlH();
+      case 0x05: return PicoVideoRead8CtlL();
+      case 0x08:
+      case 0x0c: return get_scanline(1); // FIXME: make it proper
+      case 0x09:
+      case 0x0d: return Pico.m.rotate++;
+    }
+  }
+
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
   return 0xff;
 }
@@ -1067,8 +1220,10 @@ static unsigned char z80_md_bank_read(unsigned short a)
   unsigned int addr68k;
   unsigned char ret;
 
-  addr68k = Pico.m.z80_bank68k<<15;
-  addr68k += a & 0x7fff;
+  z80_subCLeft(3);
+
+  addr68k = Pico.m.z80_bank68k << 15;
+  addr68k |= a & 0x7fff;
 
   ret = m68k_read8(addr68k);
 
@@ -1084,13 +1239,12 @@ static void z80_md_ym2612_write(unsigned int a, unsigned char data)
 
 static void z80_md_vdp_br_write(unsigned int a, unsigned char data)
 {
-  // TODO: allow full VDP access
   if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17
   {
-    if (PicoOpt & POPT_EN_PSG)
-      SN76496Write(data);
+    psg_write_z80(data);
     return;
   }
+  // at least VDP data writes hang my machine
 
   if ((a>>8) == 0x60)
   {
@@ -1129,14 +1283,14 @@ static void z80_md_out(unsigned short p, unsigned char d)
 
 static void z80_mem_setup(void)
 {
-  z80_map_set(z80_read_map, 0x0000, 0x1fff, Pico.zram, 0);
-  z80_map_set(z80_read_map, 0x2000, 0x3fff, Pico.zram, 0);
+  z80_map_set(z80_read_map, 0x0000, 0x1fff, PicoMem.zram, 0);
+  z80_map_set(z80_read_map, 0x2000, 0x3fff, PicoMem.zram, 0);
   z80_map_set(z80_read_map, 0x4000, 0x5fff, ym2612_read_local_z80, 1);
   z80_map_set(z80_read_map, 0x6000, 0x7fff, z80_md_vdp_read, 1);
   z80_map_set(z80_read_map, 0x8000, 0xffff, z80_md_bank_read, 1);
 
-  z80_map_set(z80_write_map, 0x0000, 0x1fff, Pico.zram, 0);
-  z80_map_set(z80_write_map, 0x2000, 0x3fff, Pico.zram, 0);
+  z80_map_set(z80_write_map, 0x0000, 0x1fff, PicoMem.zram, 0);
+  z80_map_set(z80_write_map, 0x2000, 0x3fff, PicoMem.zram, 0);
   z80_map_set(z80_write_map, 0x4000, 0x5fff, z80_md_ym2612_write, 1);
   z80_map_set(z80_write_map, 0x6000, 0x7fff, z80_md_vdp_br_write, 1);
   z80_map_set(z80_write_map, 0x8000, 0xffff, z80_md_bank_write, 1);
@@ -1146,10 +1300,11 @@ static void z80_mem_setup(void)
   drZ80.z80_out = z80_md_out;
 #endif
 #ifdef _USE_CZ80
-  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
-  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // mirror
+  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
 }
 
+// vim:shiftwidth=2:ts=2:expandtab