X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2Fmemory.c;h=fb5fa9be09d0dfc863b241b8571995c708d32de7;hp=5160df15bfe2d7d4552f592066bf411c461e3032;hb=4f2cdbf551ad1a7f487b65b4754cbf7983e80b8a;hpb=974fdb5bfda8ed006661031e22c920828ddb60dc

diff --git a/pico/memory.c b/pico/memory.c
index 5160df1..fb5fa9b 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"
@@ -15,15 +15,20 @@
 
 extern unsigned int lastSSRamWrite; // used by serial eeprom code
 
-unsigned long m68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
+uptr m68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
+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(unsigned long *map, int shift, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
+    const void *func_or_mh, int is_func)
 {
-  unsigned long addr = (unsigned long)func_or_mh;
+#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,27 +49,38 @@ static void xmap_set(unsigned long *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;
   }
 }
 
-void z80_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+void z80_map_set(uptr *map, int start_addr, int 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);
 }
 
-void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+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)
 void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)
 {
-  unsigned long *r8map, *r16map, *w8map, *w16map;
-  unsigned long addr = (unsigned long)ptr;
+  uptr *r8map, *r16map, *w8map, *w16map;
+  uptr addr = (uptr)ptr;
   int shift = M68K_MEM_SHIFT;
   int i;
 
@@ -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)
 {
-  unsigned long 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 = (unsigned long)m68k_unmapped_read8;
+  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 = (unsigned long)m68k_unmapped_read16;
+  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 = (unsigned long)m68k_unmapped_write8;
+  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 = (unsigned long)m68k_unmapped_write16;
+  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)
@@ -144,6 +176,10 @@ static u32 ym2612_read_local_68k(void);
 static int ym2612_write_local(u32 a, u32 d, int is_from_z80);
 static void z80_mem_setup(void);
 
+#ifdef _ASM_MEMORY_C
+u32 PicoRead8_sram(u32 a);
+u32 PicoRead16_sram(u32 a);
+#endif
 
 #ifdef EMU_CORE_DEBUG
 u32 lastread_a, lastread_d[16]={0,}, lastwrite_cyc_d[16]={0,}, lastwrite_mus_d[16]={0,};
@@ -160,122 +196,149 @@ void log_io(unsigned int addr, int bits, int rw);
 #endif
 
 #if defined(EMU_C68K)
-static __inline int PicoMemBase(u32 pc)
+void cyclone_crashed(u32 pc, struct Cyclone *context)
 {
-  int membase=0;
+    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;
+}
+#endif
 
-  if (pc<Pico.romsize+4)
-  {
-    membase=(int)Pico.rom; // Program Counter in Rom
-  }
-  else if ((pc&0xe00000)==0xe00000)
-  {
-    membase=(int)Pico.ram-(pc&0xff0000); // Program Counter in Ram
-  }
+// -----------------------------------------------------------------
+// memmap helpers
+
+static u32 read_pad_3btn(int i, u32 out_bits)
+{
+  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  u32 value;
+
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                      // ?1CB RLDU
   else
-  {
-    // Error - Program Counter is invalid
-    membase=(int)Pico.rom;
-  }
+    value = ((pad & 0xc0) >> 2) | (pad & 3); // ?0SA 00DU
 
-  return membase;
+  value |= out_bits & 0x40;
+  return value;
 }
-#endif
 
-
-PICO_INTERNAL u32 PicoCheckPc(u32 pc)
+static u32 read_pad_6btn(int i, u32 out_bits)
 {
-  u32 ret=0;
-#if defined(EMU_C68K)
-  pc-=PicoCpuCM68k.membase; // Get real pc
-//  pc&=0xfffffe;
-  pc&=~1;
-  if ((pc<<8) == 0)
-  {
-    elprintf(EL_STATUS|EL_ANOMALY, "%i:%03i: game crash detected @ %06x\n",
-      Pico.m.frame_count, Pico.m.scanline, SekPc);
-    return (int)Pico.rom + Pico.romsize; // common crash condition, may happen with bad ROMs
+  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;
   }
 
-  PicoCpuCM68k.membase=PicoMemBase(pc&0x00ffffff);
-  PicoCpuCM68k.membase-=pc&0xff000000;
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                          // ?1CB RLDU
+  else
+    value = ((pad & 0xc0) >> 2) | (pad & 3);     // ?0SA 00DU
 
-  ret = PicoCpuCM68k.membase+pc;
-#endif
-  return ret;
+out:
+  value |= out_bits & 0x40;
+  return value;
 }
 
-
-PICO_INTERNAL void PicoInitPc(u32 pc)
+static u32 read_nothing(int i, u32 out_bits)
 {
-  PicoCheckPc(pc);
+  return 0xff;
 }
 
-// -----------------------------------------------------------------
-// memmap helpers
+typedef u32 (port_read_func)(int index, u32 out_bits);
 
-static int PadRead(int i)
+static port_read_func *port_readers[3] = {
+  read_pad_3btn,
+  read_pad_3btn,
+  read_nothing
+};
+
+static NOINLINE u32 port_read(int i)
 {
-  int pad,value,data_reg;
-  pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
-  data_reg=Pico.ioports[i+1];
+  u32 data_reg = Pico.ioports[i + 1];
+  u32 ctrl_reg = Pico.ioports[i + 4] | 0x80;
+  u32 in, out;
 
-  // orr the bits, which are set as output
-  value = data_reg&(Pico.ioports[i+4]|0x80);
+  out = data_reg & ctrl_reg;
+  out |= 0x7f & ~ctrl_reg; // pull-ups
 
-  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;
-    }
-  }
+  in = port_readers[i](i, out);
 
-  if(data_reg&0x40) // TH
-       value|=(pad&0x3f);              // ?1CB RLDU
-  else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
+  return (in & ~ctrl_reg) | (data_reg & ctrl_reg);
+}
 
-  return value; // will mirror later
+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;
+
+  default:
+    func = read_nothing;
+    break;
+  }
+
+  port_readers[port] = func;
 }
 
-static u32 io_ports_read(u32 a)
+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;
+    case 1:  d = port_read(0); break;
+    case 2:  d = port_read(1); break;
+    case 3:  d = port_read(2); break;
     default: d = Pico.ioports[a]; break; // IO ports can be used as RAM
   }
   return d;
 }
 
-static void 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))
       Pico.m.padTHPhase[a - 1]++;
   }
 
-  // cartain IO ports can be used as RAM
+  // certain IO ports can be used as RAM
   Pico.ioports[a] = d;
 }
 
-static void ctl_write_z80busreq(u32 d)
+// lame..
+static int z80_cycles_from_68k(void)
+{
+  return z80_cycle_aim
+    + cycles_68k_to_z80(SekCyclesDone() - last_z80_sync);
+}
+
+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);
@@ -283,19 +346,21 @@ static void ctl_write_z80busreq(u32 d)
   {
     if (d)
     {
-      z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
+      z80_cycle_cnt = z80_cycles_from_68k();
     }
     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;
   }
 }
 
-static void ctl_write_z80reset(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);
@@ -303,14 +368,17 @@ static void ctl_write_z80reset(u32 d)
   {
     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());
+      z80_cycle_cnt = z80_cycles_from_68k();
       z80_reset();
     }
     Pico.m.z80_reset = d;
@@ -319,6 +387,8 @@ static void ctl_write_z80reset(u32 d)
 
 // -----------------------------------------------------------------
 
+#ifndef _ASM_MEMORY_C
+
 // cart (save) RAM area (usually 0x200000 - ...)
 static u32 PicoRead8_sram(u32 a)
 {
@@ -345,7 +415,7 @@ 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 (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
     if (SRam.flags & SRF_EEPROM)
       d = EEPROM_read();
@@ -364,6 +434,8 @@ static u32 PicoRead16_sram(u32 a)
   return m68k_unmapped_read16(a);
 }
 
+#endif // _ASM_MEMORY_C
+
 static void PicoWrite8_sram(u32 a, u32 d)
 {
   if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
@@ -398,11 +470,14 @@ static void PicoWrite16_sram(u32 a, u32 d)
     EEPROM_write16(d);
   }
   else {
-    // XXX: hardware could easily use MSB too..
     u8 *pm = (u8 *)(SRam.data - SRam.start + a);
-    if (*pm != (u8)d) {
+    if (pm[0] != (u8)(d >> 8)) {
       SRam.changed = 1;
-      *pm = (u8)d;
+      pm[0] = (u8)(d >> 8);
+    }
+    if (pm[1] != (u8)d) {
+      SRam.changed = 1;
+      pm[1] = (u8)d;
     }
   }
 }
@@ -442,7 +517,7 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
 
   if ((a & 0x4000) == 0x0000) { // z80 RAM
-    SekCyclesBurn(2); // hack
+    SekCyclesBurnRun(2); // FIXME hack
     Pico.zram[a & 0x1fff] = (u8)d;
     return;
   }
@@ -457,7 +532,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
       SN76496Write(d);
     return;
   }
-#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
   if ((a & 0x7f00) == 0x6000) // Z80 BANK register
   {
     Pico.m.z80_bank68k >>= 1;
@@ -466,7 +540,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
     elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k << 15);
     return;
   }
-#endif
   elprintf(EL_UIO|EL_ANOMALY, "68k bad write [%06x] %02x @ %06x", a, d&0xff, SekPc);
 }
 
@@ -477,6 +550,8 @@ static void PicoWrite16_z80(u32 a, u32 d)
   PicoWrite8_z80(a, d >> 8);
 }
 
+#ifndef _ASM_MEMORY_C
+
 // IO/control area (0xa10000 - 0xa1ffff)
 u32 PicoRead8_io(u32 a)
 {
@@ -491,17 +566,19 @@ u32 PicoRead8_io(u32 a)
   d = Pico.m.rotate++;
   d ^= d << 6;
 
-  // bit8 seems to be readable in this range
-  if ((a & 0xfc01) == 0x1000)
-    d &= ~0x01;
+  if ((a & 0xfc00) == 0x1000) {
+    // bit8 seems to be readable in this range
+    if (!(a & 1))
+      d &= ~0x01;
 
-  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);
+    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);
+    }
     goto end;
   }
 
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     d = PicoRead8_32x(a);
     goto end;
   }
@@ -517,6 +594,7 @@ u32 PicoRead16_io(u32 a)
 
   if ((a & 0xffe0) == 0x0000) { // I/O ports
     d = io_ports_read(a);
+    d |= d << 8;
     goto end;
   }
 
@@ -525,16 +603,17 @@ u32 PicoRead16_io(u32 a)
   d ^= (d << 5) ^ (d << 8);
 
   // bit8 seems to be readable in this range
-  if ((a & 0xfc00) == 0x1000)
+  if ((a & 0xfc00) == 0x1000) {
     d &= ~0x0100;
 
-  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);
+    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);
+    }
     goto end;
   }
 
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     d = PicoRead16_32x(a);
     goto end;
   }
@@ -564,7 +643,7 @@ void PicoWrite8_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     PicoWrite8_32x(a, d);
     return;
   }
@@ -592,13 +671,15 @@ void PicoWrite16_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     PicoWrite16_32x(a, d);
     return;
   }
   m68k_unmapped_write16(a, d);
 }
 
+#endif // _ASM_MEMORY_C
+
 // VDP area (0xc00000 - 0xdfffff)
 // TODO: verify if lower byte goes to PSG on word writes
 static u32 PicoRead8_vdp(u32 a)
@@ -717,13 +798,16 @@ PICO_INTERNAL void PicoMemSetup(void)
 
   // Setup memory callbacks:
 #ifdef EMU_C68K
-  PicoCpuCM68k.checkpc = PicoCheckPc;
-  PicoCpuCM68k.fetch8  = PicoCpuCM68k.read8  = m68k_read8;
-  PicoCpuCM68k.fetch16 = PicoCpuCM68k.read16 = m68k_read16;
-  PicoCpuCM68k.fetch32 = PicoCpuCM68k.read32 = m68k_read32;
-  PicoCpuCM68k.write8  = m68k_write8;
-  PicoCpuCM68k.write16 = m68k_write16;
-  PicoCpuCM68k.write32 = m68k_write32;
+  PicoCpuCM68k.read8  = (void *)m68k_read8_map;
+  PicoCpuCM68k.read16 = (void *)m68k_read16_map;
+  PicoCpuCM68k.read32 = (void *)m68k_read16_map;
+  PicoCpuCM68k.write8  = (void *)m68k_write8_map;
+  PicoCpuCM68k.write16 = (void *)m68k_write16_map;
+  PicoCpuCM68k.write32 = (void *)m68k_write16_map;
+  PicoCpuCM68k.checkpc = NULL; /* unused */
+  PicoCpuCM68k.fetch8  = NULL;
+  PicoCpuCM68k.fetch16 = NULL;
+  PicoCpuCM68k.fetch32 = NULL;
 #endif
 #ifdef EMU_F68K
   PicoCpuFM68k.read_byte  = m68k_read8;
@@ -737,14 +821,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
@@ -850,7 +932,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;
   }
@@ -887,7 +969,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);
@@ -902,7 +984,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);
@@ -910,7 +992,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);
@@ -934,8 +1016,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
@@ -975,7 +1059,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   if (xcycles >= timer_b_next_oflow) \
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2
 
-static u32 MEMH_FUNC ym2612_read_local_z80(void)
+static u32 ym2612_read_local_z80(void)
 {
   int xcycles = z80_cyclesDone() << 8;
 
@@ -988,7 +1072,7 @@ static u32 MEMH_FUNC 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();
 
@@ -1070,17 +1154,27 @@ 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 MEMH_FUNC z80_md_vdp_read(unsigned short a)
+static unsigned char z80_md_vdp_read(unsigned short a)
 {
-  // TODO?
+  if ((a & 0x00e0) == 0x0000)
+    return PicoVideoRead8(a); // FIXME: depends on 68k cycles
+
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
   return 0xff;
 }
 
-static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
+static unsigned char z80_md_bank_read(unsigned short a)
 {
   unsigned int addr68k;
   unsigned char ret;
@@ -1094,21 +1188,21 @@ static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
   return ret;
 }
 
-static void MEMH_FUNC z80_md_ym2612_write(unsigned int a, unsigned char data)
+static void z80_md_ym2612_write(unsigned int a, unsigned char data)
 {
   if (PicoOpt & POPT_EN_FM)
     emustatus |= ym2612_write_local(a, data, 1) & 1;
 }
 
-static void MEMH_FUNC z80_md_vdp_br_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);
     return;
   }
+  // at least VDP data writes hang my machine
 
   if ((a>>8) == 0x60)
   {
@@ -1121,7 +1215,7 @@ static void MEMH_FUNC z80_md_vdp_br_write(unsigned int a, unsigned char data)
   elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
 }
 
-static void MEMH_FUNC z80_md_bank_write(unsigned int a, unsigned char data)
+static void z80_md_bank_write(unsigned int a, unsigned char data)
 {
   unsigned int addr68k;
 
@@ -1164,10 +1258,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)Pico.zram); // main RAM
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)Pico.zram); // mirror
   Cz80_Set_INPort(&CZ80, z80_md_in);
   Cz80_Set_OUTPort(&CZ80, z80_md_out);
 #endif
 }
 
+// vim:shiftwidth=2:ts=2:expandtab