X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=66719a8c50800bcb10de3c56b0bc30b79e0b39ba;hb=f53f286a8b48d19c65e83f90d00aa47e8e87c889;hp=71ec377be0ce7ce70b670fe31ed007ed535e1a3e;hpb=eff55556cff77fd64cff4be32e449e0a58aed6fe;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 71ec377..66719a8 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -2,9 +2,6 @@
 // Loosely based on Gens code.
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
-// A68K no longer supported here
-
-//#define __debug_io
 
 #include "../PicoInt.h"
 
@@ -21,20 +18,20 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED
 #endif
 
-//#define __debug_io
-//#define __debug_io2
-
-#define rdprintf dprintf
-//#define rdprintf(...)
+//#define rdprintf dprintf
+#define rdprintf(...)
 //#define wrdprintf dprintf
 #define wrdprintf(...)
-#define plprintf dprintf
-//#define plprintf(...)
+
+#ifdef EMU_CORE_DEBUG
+extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];
+extern int lrp_cyc, lwp_cyc;
+#undef USE_POLL_DETECT
+#endif
 
 // -----------------------------------------------------------------
 
 // poller detection
-//#undef USE_POLL_DETECT
 #define POLL_LIMIT 16
 #define POLL_CYCLES 124
 // int m68k_poll_addr, m68k_poll_cnt;
@@ -67,7 +64,7 @@ static u32 m68k_reg_read16(u32 a)
       d = Read_CDC_Host(0);
       goto end;
     case 0xA:
-      dprintf("m68k FIXME: reserved read");
+      elprintf(EL_UIO, "m68k FIXME: reserved read");
       goto end;
     case 0xC:
       d = Pico_mcd->m.timer_stopwatch >> 16;
@@ -81,11 +78,10 @@ static u32 m68k_reg_read16(u32 a)
     goto end;
   }
 
-  dprintf("m68k_regs FIXME invalid read @ %02x", a);
+  elprintf(EL_UIO, "m68k_regs FIXME invalid read @ %02x", a);
 
 end:
 
-  // dprintf("ret = %04x", d);
   return d;
 }
 #endif
@@ -101,7 +97,7 @@ void m68k_reg_write8(u32 a, u32 d)
   switch (a) {
     case 0:
       d &= 1;
-      if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { dprintf("m68k: s68k irq 2"); SekInterruptS68k(2); }
+      if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { elprintf(EL_INTS, "m68k: s68k irq 2"); SekInterruptS68k(2); }
       return;
     case 1:
       d &= 3;
@@ -145,7 +141,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        plprintf("s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -165,7 +161,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        plprintf("s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -176,13 +172,13 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        plprintf("s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
   }
 
-  dprintf("m68k FIXME: invalid write? [%02x] %02x", a, d);
+  elprintf(EL_UIO, "m68k FIXME: invalid write? [%02x] %02x", a, d);
 }
 
 #ifndef _ASM_CD_MEMORY_C
@@ -191,6 +187,8 @@ static
 u32 s68k_poll_detect(u32 a, u32 d)
 {
 #ifdef USE_POLL_DETECT
+  // needed mostly for Cyclone, which doesn't always check it's cycle counter
+  if (SekIsStoppedS68k()) return d;
   // polling detection
   if (a == (s68k_poll_adclk&0xff)) {
     unsigned int clkdiff = SekCyclesDoneS68k() - (s68k_poll_adclk>>8);
@@ -199,7 +197,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
       //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);
       if (s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(1);
-        plprintf("s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);
+        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x", SekPcS68k, a);
       }
       s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
       return d;
@@ -280,7 +278,6 @@ void s68k_reg_write8(u32 a, u32 d)
 {
   //dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);
 
-  // TODO: review against Gens
   // Warning: d might have upper bits set
   switch (a) {
     case 2:
@@ -293,9 +290,7 @@ void s68k_reg_write8(u32 a, u32 d)
       if (d&4) {
         if ((d ^ dold) & 5) {
           d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit
-#ifdef _ASM_CD_MEMORY_C
           PicoMemResetCD(d);
-#endif
         }
 #ifdef _ASM_CD_MEMORY_C
         if ((d ^ dold) & 0x1d)
@@ -313,9 +308,7 @@ void s68k_reg_write8(u32 a, u32 d)
             d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode
           }
           wram_1M_to_2M(Pico_mcd->word_ram2M);
-#ifdef _ASM_CD_MEMORY_C
           PicoMemResetCD(d);
-#endif
         }
         else
           d |= dold&1;
@@ -375,7 +368,7 @@ void s68k_reg_write8(u32 a, u32 d)
 
   if ((a&0x1f0) == 0x10 || (a >= 0x38 && a < 0x42))
   {
-    dprintf("s68k FIXME: invalid write @ %02x?", a);
+    elprintf(EL_UIO, "s68k FIXME: invalid write @ %02x?", a);
     return;
   }
 
@@ -393,7 +386,25 @@ static u32 OtherRead16End(u32 a, int realsize)
     goto end;
   }
 
-  dprintf("m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);
+  if (a==0x400000) {
+    if (SRam.data != NULL) d=3; // 64k cart
+    goto end;
+  }
+
+  if ((a&0xfe0000)==0x600000) {
+    if (SRam.data != NULL) {
+      d=SRam.data[((a>>1)&0xffff)+0x2000];
+      if (realsize == 8) d|=d<<8;
+    }
+    goto end;
+  }
+
+  if (a==0x7ffffe) {
+    d=Pico_mcd->m.bcram_reg;
+    goto end;
+  }
+
+  elprintf(EL_UIO, "m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);
 
 end:
   return d;
@@ -404,10 +415,23 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 {
   if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }
 
-  dprintf("m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);
-}
+  if ((a&0xfe0000)==0x600000) {
+    if (SRam.data != NULL && (Pico_mcd->m.bcram_reg&1)) {
+      SRam.data[((a>>1)&0xffff)+0x2000]=d;
+      SRam.changed = 1;
+    }
+    return;
+  }
+
+  if (a==0x7fffff) {
+    Pico_mcd->m.bcram_reg=d;
+    return;
+  }
 
+  elprintf(EL_UIO, "m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);
+}
 
+#define _CD_MEMORY_C
 #undef _ASM_MEMORY_C
 #include "../MemoryCmn.c"
 #include "cell_map.c"
@@ -417,58 +441,86 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 // -----------------------------------------------------------------
 //                     Read Rom and read Ram
 
-//u8 PicoReadM68k8_(u32 a);
 #ifdef _ASM_CD_MEMORY_C
 u32 PicoReadM68k8(u32 a);
 #else
-static u32 PicoReadM68k8(u32 a)
+u32 PicoReadM68k8(u32 a)
 {
   u32 d=0;
 
-  if ((a&0xe00000)==0xe00000) { d = *(u8 *)(Pico.ram+((a^1)&0xffff)); goto end; } // Ram
-
   a&=0xffffff;
 
-  if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios
+  switch (a >> 17)
+  {
+    case 0x00>>1: // BIOS: 000000 - 020000
+      d = *(u8 *)(Pico_mcd->bios+(a^1));
+      break;
+    case 0x02>>1: // prg RAM
+      if ((Pico_mcd->m.busreq&3)!=1) {
+        u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
+        d = *(prg_bank+((a^1)&0x1ffff));
+      }
+      break;
+    case 0x20>>1: // word RAM: 200000 - 220000
+      wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);
+      a &= 0x1ffff;
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
+        int bank = Pico_mcd->s68k_regs[3]&1;
+        d = Pico_mcd->word_ram1M[bank][a^1];
+      } else {
+        // allow access in any mode, like Gens does
+        d = Pico_mcd->word_ram2M[a^1];
+      }
+      wrdprintf("ret = %02x", (u8)d);
+      break;
+    case 0x22>>1: // word RAM: 220000 - 240000
+      wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
+        int bank = Pico_mcd->s68k_regs[3]&1;
+        a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged
+        d = Pico_mcd->word_ram1M[bank][a^1];
+      } else {
+        // allow access in any mode, like Gens does
+        d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];
+      }
+      wrdprintf("ret = %02x", (u8)d);
+      break;
+    case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1:
+    case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1:
+    case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1:
+    case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1:
+      // VDP
+      if ((a&0xe700e0)==0xc00000) {
+        d=PicoVideoRead(a);
+        if ((a&1)==0) d>>=8;
+      }
+      break;
+    case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1:
+    case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1:
+    case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1:
+    case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1:
+      // RAM:
+      d = *(u8 *)(Pico.ram+((a^1)&0xffff));
+      break;
+    default:
+      if ((a&0xff4000)==0xa00000) { d=z80Read8(a); break; } // Z80 Ram
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);
 
-  // prg RAM
-  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
-    u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
-    d = *(prg_bank+((a^1)&0x1ffff));
-    goto end;
-  }
+      d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;
 
-  // word RAM
-  if ((a&0xfc0000)==0x200000) {
-    wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
-      int bank = Pico_mcd->s68k_regs[3]&1;
-      if (a >= 0x220000)
-           a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged
-      else a &= 0x1ffff;
-      d = Pico_mcd->word_ram1M[bank][a^1];
-    } else {
-      // allow access in any mode, like Gens does
-      d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];
-    }
-    wrdprintf("ret = %02x", (u8)d);
-    goto end;
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("ret = %02x", (u8)d);
+      break;
   }
 
-  if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
 
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);
-
-  d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;
-
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("ret = %02x", (u8)d);
-
-  end:
-
-#ifdef __debug_io
-  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
+  elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -482,50 +534,78 @@ static u32 PicoReadM68k16(u32 a)
 {
   u32 d=0;
 
-  if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram
-
   a&=0xfffffe;
 
-  if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios
+  switch (a >> 17)
+  {
+    case 0x00>>1: // BIOS: 000000 - 020000
+      d = *(u16 *)(Pico_mcd->bios+a);
+      break;
+    case 0x02>>1: // prg RAM
+      if ((Pico_mcd->m.busreq&3)!=1) {
+        u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
+        wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc);
+        d = *(u16 *)(prg_bank+(a&0x1fffe));
+        wrdprintf("ret = %04x", d);
+      }
+      break;
+    case 0x20>>1: // word RAM: 200000 - 220000
+      wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);
+      a &= 0x1fffe;
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
+        int bank = Pico_mcd->s68k_regs[3]&1;
+        d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a);
+      } else {
+        // allow access in any mode, like Gens does
+        d = *(u16 *)(Pico_mcd->word_ram2M+a);
+      }
+      wrdprintf("ret = %04x", d);
+      break;
+    case 0x22>>1: // word RAM: 220000 - 240000
+      wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
+        int bank = Pico_mcd->s68k_regs[3]&1;
+        a = (a&2) | (cell_map(a >> 2) << 2); // cell arranged
+        d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a);
+      } else {
+        // allow access in any mode, like Gens does
+        d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
+      }
+      wrdprintf("ret = %04x", d);
+      break;
+    case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1:
+    case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1:
+    case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1:
+    case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1:
+      // VDP
+      if ((a&0xe700e0)==0xc00000)
+        d=PicoVideoRead(a);
+      break;
+    case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1:
+    case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1:
+    case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1:
+    case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1:
+      // RAM:
+      d=*(u16 *)(Pico.ram+(a&0xfffe));
+      break;
+    default:
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);
 
-  // prg RAM
-  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
-    u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
-    wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc);
-    d = *(u16 *)(prg_bank+(a&0x1fffe));
-    wrdprintf("ret = %04x", d);
-    goto end;
-  }
+      d = OtherRead16(a, 16);
 
-  // word RAM
-  if ((a&0xfc0000)==0x200000) {
-    wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
-      int bank = Pico_mcd->s68k_regs[3]&1;
-      if (a >= 0x220000)
-           a = (a&2) | (cell_map(a >> 2) << 2); // cell arranged
-      else a &= 0x1fffe;
-      d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a);
-    } else {
-      // allow access in any mode, like Gens does
-      d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
-    }
-    wrdprintf("ret = %04x", d);
-    goto end;
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("ret = %04x", d);
+      break;
   }
 
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);
-
-  d = OtherRead16(a, 16);
-
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("ret = %04x", d);
-
-  end:
 
-#ifdef __debug_io
-  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -539,54 +619,87 @@ static u32 PicoReadM68k32(u32 a)
 {
   u32 d=0;
 
-  if ((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); d = (pm[0]<<16)|pm[1]; goto end; } // Ram
-
   a&=0xfffffe;
 
-  if (a < 0x20000) { u16 *pm=(u16 *)(Pico_mcd->bios+a); d = (pm[0]<<16)|pm[1]; goto end; } // bios
-
-  // prg RAM
-  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
-    u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
-    u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));
-    d = (pm[0]<<16)|pm[1];
-    goto end;
-  }
-
-  // word RAM
-  if ((a&0xfc0000)==0x200000) {
-    wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
-      int bank = Pico_mcd->s68k_regs[3]&1;
-      if (a >= 0x220000) { // cell arranged
+  switch (a >> 17)
+  {
+    case 0x00>>1: { // BIOS: 000000 - 020000
+      u16 *pm=(u16 *)(Pico_mcd->bios+a);
+      d = (pm[0]<<16)|pm[1];
+      break;
+    }
+    case 0x02>>1: // prg RAM
+      if ((Pico_mcd->m.busreq&3)!=1) {
+        u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
+        u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));
+        d = (pm[0]<<16)|pm[1];
+      }
+      break;
+    case 0x20>>1: // word RAM: 200000 - 220000
+      wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);
+      a&=0x1fffe;
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
+        int bank = Pico_mcd->s68k_regs[3]&1;
+        u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+a);
+	d = (pm[0]<<16)|pm[1];
+      } else {
+        // allow access in any mode, like Gens does
+        u16 *pm=(u16 *)(Pico_mcd->word_ram2M+a);
+	d = (pm[0]<<16)|pm[1];
+      }
+      wrdprintf("ret = %08x", d);
+      break;
+    case 0x22>>1: // word RAM: 220000 - 240000
+      wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);
+      if (Pico_mcd->s68k_regs[3]&4) { // 1M mode, cell arranged?
         u32 a1, a2;
+        int bank = Pico_mcd->s68k_regs[3]&1;
         a1 = (a&2) | (cell_map(a >> 2) << 2);
         if (a&2) a2 = cell_map((a+2) >> 2) << 2;
         else     a2 = a1 + 2;
         d  = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16;
         d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2);
       } else {
-        u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
+        // allow access in any mode, like Gens does
+        u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
+	d = (pm[0]<<16)|pm[1];
       }
-    } else {
-      // allow access in any mode, like Gens does
-      u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); d = (pm[0]<<16)|pm[1];
+      wrdprintf("ret = %08x", d);
+      break;
+    case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1:
+    case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1:
+    case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1:
+    case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1:
+      // VDP
+      d = (PicoVideoRead(a)<<16)|PicoVideoRead(a+2);
+      break;
+    case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1:
+    case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1:
+    case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1:
+    case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1: {
+      // RAM:
+      u16 *pm=(u16 *)(Pico.ram+(a&0xfffe));
+      d = (pm[0]<<16)|pm[1];
+      break;
     }
-    wrdprintf("ret = %08x", d);
-    goto end;
-  }
+    default:
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);
 
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);
+      d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
 
-  d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
+      if ((a&0xffffc0)==0xa12000)
+        rdprintf("ret = %08x", d);
+      break;
+  }
 
-  if ((a&0xffffc0)==0xa12000)
-    rdprintf("ret = %08x", d);
 
-  end:
-#ifdef __debug_io
-  dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
+  elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -598,22 +711,18 @@ static u32 PicoReadM68k32(u32 a)
 #ifdef _ASM_CD_MEMORY_C
 void PicoWriteM68k8(u32 a,u8 d);
 #else
-static void PicoWriteM68k8(u32 a,u8 d)
+void PicoWriteM68k8(u32 a,u8 d)
 {
-#ifdef __debug_io
-  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
+  elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
-  //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
-  //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
-
 
   if ((a&0xe00000)==0xe00000) { // Ram
     *(u8 *)(Pico.ram+((a^1)&0xffff)) = d;
     return;
   }
 
-  a&=0xffffff;
-
   // prg RAM
   if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
@@ -621,6 +730,8 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
+  a&=0xffffff;
+
   // word RAM
   if ((a&0xfc0000)==0x200000) {
     wrdprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, SekPc);
@@ -643,7 +754,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  OtherWrite8(a,d,8);
+  OtherWrite8(a,d);
 }
 #endif
 
@@ -653,18 +764,16 @@ void PicoWriteM68k16(u32 a,u16 d);
 #else
 static void PicoWriteM68k16(u32 a,u16 d)
 {
-#ifdef __debug_io
-  dprintf("w16: %06x, %04x", a&0xffffff, d);
+  elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d);
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
-  //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
 
   if ((a&0xe00000)==0xe00000) { // Ram
     *(u16 *)(Pico.ram+(a&0xfffe))=d;
     return;
   }
 
-  a&=0xfffffe;
-
   // prg RAM
   if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
@@ -673,6 +782,8 @@ static void PicoWriteM68k16(u32 a,u16 d)
     return;
   }
 
+  a&=0xfffffe;
+
   // word RAM
   if ((a&0xfc0000)==0x200000) {
     wrdprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, SekPc);
@@ -697,7 +808,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        plprintf("s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -707,6 +818,12 @@ static void PicoWriteM68k16(u32 a,u16 d)
     return;
   }
 
+  // VDP
+  if ((a&0xe700e0)==0xc00000) {
+    PicoVideoWrite(a,(u16)d);
+    return;
+  }
+
   OtherWrite16(a,d);
 }
 #endif
@@ -717,8 +834,9 @@ void PicoWriteM68k32(u32 a,u32 d);
 #else
 static void PicoWriteM68k32(u32 a,u32 d)
 {
-#ifdef __debug_io
-  dprintf("w32: %06x, %08x", a&0xffffff, d);
+  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
 
   if ((a&0xe00000)==0xe00000)
@@ -729,8 +847,6 @@ static void PicoWriteM68k32(u32 a,u32 d)
     return;
   }
 
-  a&=0xfffffe;
-
   // prg RAM
   if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
@@ -739,6 +855,8 @@ static void PicoWriteM68k32(u32 a,u32 d)
     return;
   }
 
+  a&=0xfffffe;
+
   // word RAM
   if ((a&0xfc0000)==0x200000) {
     if (d != 0) // don't log clears
@@ -769,6 +887,14 @@ static void PicoWriteM68k32(u32 a,u32 d)
     if ((a&0x3e) == 0xe) dprintf("m68k FIXME: w32 [%02x]", a&0x3f);
   }
 
+  // VDP
+  if ((a&0xe700e0)==0xc00000)
+  {
+    PicoVideoWrite(a,  (u16)(d>>16));
+    PicoVideoWrite(a+2,(u16)d);
+    return;
+  }
+
   OtherWrite16(a,  (u16)(d>>16));
   OtherWrite16(a+2,(u16)d);
 }
@@ -786,6 +912,9 @@ static u32 PicoReadS68k8(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xffffff;
 
   // prg RAM
@@ -817,11 +946,10 @@ static u32 PicoReadS68k8(u32 a)
     // test: batman returns
     wrdprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];
       if (a&1) d &= 0x0f;
       else d >>= 4;
-      dprintf("FIXME: decode");
     } else {
       // allow access in any mode, like Gens does
       d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];
@@ -836,7 +964,7 @@ static u32 PicoReadS68k8(u32 a)
     wrdprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff];
     wrdprintf("ret = %02x", (u8)d);
     goto end;
@@ -844,7 +972,7 @@ static u32 PicoReadS68k8(u32 a)
 
   // PCM
   if ((a&0xff8000)==0xff0000) {
-    dprintf("s68k_pcm r8: [%06x] @%06x", a, SekPcS68k);
+    elprintf(EL_IO, "s68k_pcm r8: [%06x] @%06x", a, SekPcS68k);
     a &= 0x7fff;
     if (a >= 0x2000)
       d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff];
@@ -853,7 +981,7 @@ static u32 PicoReadS68k8(u32 a)
       d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;
       if (a & 2) d >>= 8;
     }
-    dprintf("ret = %02x", (u8)d);
+    elprintf(EL_IO, "ret = %02x", (u8)d);
     goto end;
   }
 
@@ -863,12 +991,14 @@ static u32 PicoReadS68k8(u32 a)
     goto end;
   }
 
-  dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
+  elprintf(EL_UIO, "s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
 
   end:
 
-#ifdef __debug_io2
-  dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
+  elprintf(EL_IO, "s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
+#ifdef EMU_CORE_DEBUG
+  lastread_a = ab;
+  lastread_d[lrp_cyc++&15] = d;
 #endif
   return d;
 }
@@ -882,6 +1012,9 @@ static u32 PicoReadS68k16(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xfffffe;
 
   // prg RAM
@@ -907,10 +1040,9 @@ static u32 PicoReadS68k16(u32 a)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
     wrdprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];
       d |= d << 4; d &= ~0xf0;
-      dprintf("FIXME: decode");
     } else {
       // allow access in any mode, like Gens does
       d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
@@ -925,7 +1057,7 @@ static u32 PicoReadS68k16(u32 a)
     wrdprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
     wrdprintf("ret = %04x", d);
     goto end;
@@ -956,12 +1088,14 @@ static u32 PicoReadS68k16(u32 a)
     goto end;
   }
 
-  dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_UIO, "s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
 
   end:
 
-#ifdef __debug_io2
-  dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_IO, "s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
+#ifdef EMU_CORE_DEBUG
+  lastread_a = ab;
+  lastread_d[lrp_cyc++&15] = d;
 #endif
   return d;
 }
@@ -975,6 +1109,9 @@ static u32 PicoReadS68k32(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xfffffe;
 
   // prg RAM
@@ -999,7 +1136,7 @@ static u32 PicoReadS68k32(u32 a)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
     wrdprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       a >>= 1;
       d  = Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] << 16;
       d |= Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff];
@@ -1018,7 +1155,7 @@ static u32 PicoReadS68k32(u32 a)
     wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
     wrdprintf("ret = %08x", d);
     goto end;
@@ -1059,12 +1196,16 @@ static u32 PicoReadS68k32(u32 a)
     goto end;
   }
 
-  dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_UIO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
 
   end:
 
-#ifdef __debug_io2
-  dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_IO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
+#ifdef EMU_CORE_DEBUG
+  if (ab > 0x78) { // not vectors and stuff
+    lastread_a = ab;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -1075,7 +1216,7 @@ static u32 PicoReadS68k32(u32 a)
 /* check: jaguar xj 220 (draws entire world using decode) */
 static void decode_write8(u32 a, u8 d, int r3)
 {
-  u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);
+  u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff);
   u8 oldmask = (a&1) ? 0xf0 : 0x0f;
 
   r3 &= 0x18;
@@ -1098,7 +1239,7 @@ do_it:
 
 static void decode_write16(u32 a, u16 d, int r3)
 {
-  u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);
+  u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff);
 
   //if ((a & 0x3ffff) < 0x28000) return;
 
@@ -1129,12 +1270,14 @@ void PicoWriteS68k8(u32 a,u8 d);
 #else
 static void PicoWriteS68k8(u32 a,u8 d)
 {
-#ifdef __debug_io2
-  dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
-#endif
+  elprintf(EL_IO, "s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
 
   a&=0xffffff;
 
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
+
   // prg RAM
   if (a < 0x80000) {
     u8 *pm=(u8 *)(Pico_mcd->prg_ram+(a^1));
@@ -1173,7 +1316,7 @@ static void PicoWriteS68k8(u32 a,u8 d)
       wrdprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d;
     return;
   }
@@ -1195,7 +1338,7 @@ static void PicoWriteS68k8(u32 a,u8 d)
     return;
   }
 
-  dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_UIO, "s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
 }
 #endif
 
@@ -1205,12 +1348,14 @@ void PicoWriteS68k16(u32 a,u16 d);
 #else
 static void PicoWriteS68k16(u32 a,u16 d)
 {
-#ifdef __debug_io2
-  dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
-#endif
+  elprintf(EL_IO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
 
   a&=0xfffffe;
 
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
+
   // prg RAM
   if (a < 0x80000) {
     wrdprintf("s68k_prgram w16: [%06x] %04x @%06x", a, d, SekPcS68k);
@@ -1256,7 +1401,7 @@ static void PicoWriteS68k16(u32 a,u16 d)
       wrdprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d;
     return;
   }
@@ -1281,7 +1426,7 @@ static void PicoWriteS68k16(u32 a,u16 d)
     return;
   }
 
-  dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_UIO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
 }
 #endif
 
@@ -1291,12 +1436,14 @@ void PicoWriteS68k32(u32 a,u32 d);
 #else
 static void PicoWriteS68k32(u32 a,u32 d)
 {
-#ifdef __debug_io2
-  dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
-#endif
+  elprintf(EL_IO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
 
   a&=0xfffffe;
 
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
+
   // prg RAM
   if (a < 0x80000) {
     if (a >= (Pico_mcd->s68k_regs[2]<<8)) {
@@ -1346,7 +1493,7 @@ static void PicoWriteS68k32(u32 a,u32 d)
       wrdprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
 //    if (!(Pico_mcd->s68k_regs[3]&4))
 //      dprintf("s68k_wram1M FIXME: wrong mode");
-    bank = !(Pico_mcd->s68k_regs[3]&1);
+    bank = (Pico_mcd->s68k_regs[3]&1)^1;
     pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
     pm[0]=(u16)(d>>16); pm[1]=(u16)d;
     return;
@@ -1379,7 +1526,7 @@ static void PicoWriteS68k32(u32 a,u32 d)
     return;
   }
 
-  dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
+  elprintf(EL_UIO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
 }
 #endif
 
@@ -1387,7 +1534,7 @@ static void PicoWriteS68k32(u32 a,u32 d)
 // -----------------------------------------------------------------
 
 
-#if defined(EMU_C68K)
+#ifdef EMU_C68K
 static __inline int PicoMemBaseM68k(u32 pc)
 {
   if ((pc&0xe00000)==0xe00000)
@@ -1401,13 +1548,13 @@ static __inline int PicoMemBaseM68k(u32 pc)
     if (!(Pico_mcd->s68k_regs[3]&4))
       return (int)Pico_mcd->word_ram2M - 0x200000; // Program Counter in Word Ram
     if (pc < 0x220000) {
-      int bank = (Pico_mcd->s68k_regs[3]&1);
+      int bank = Pico_mcd->s68k_regs[3]&1;
       return (int)Pico_mcd->word_ram1M[bank] - 0x200000;
     }
   }
 
   // Error - Program Counter is invalid
-  dprintf("m68k FIXME: unhandled jump to %06x", pc);
+  elprintf(EL_ANOMALY, "m68k FIXME: unhandled jump to %06x", pc);
 
   return (int)Pico_mcd->bios;
 }
@@ -1415,12 +1562,12 @@ static __inline int PicoMemBaseM68k(u32 pc)
 
 static u32 PicoCheckPcM68k(u32 pc)
 {
-  pc-=PicoCpu.membase; // Get real pc
+  pc-=PicoCpuCM68k.membase; // Get real pc
   pc&=0xfffffe;
 
-  PicoCpu.membase=PicoMemBaseM68k(pc);
+  PicoCpuCM68k.membase=PicoMemBaseM68k(pc);
 
-  return PicoCpu.membase+pc;
+  return PicoCpuCM68k.membase+pc;
 }
 
 
@@ -1433,12 +1580,12 @@ static __inline int PicoMemBaseS68k(u32 pc)
     return (int)Pico_mcd->word_ram2M - 0x080000;
 
   if ((pc&0xfe0000)==0x0c0000) {        // word RAM 1M area
-    int bank = !(Pico_mcd->s68k_regs[3]&1);
+    int bank = (Pico_mcd->s68k_regs[3]&1)^1;
     return (int)Pico_mcd->word_ram1M[bank] - 0x0c0000;
   }
 
   // Error - Program Counter is invalid
-  dprintf("s68k FIXME: unhandled jump to %06x", pc);
+  elprintf(EL_ANOMALY, "s68k FIXME: unhandled jump to %06x", pc);
 
   return (int)Pico_mcd->prg_ram;
 }
@@ -1446,37 +1593,104 @@ static __inline int PicoMemBaseS68k(u32 pc)
 
 static u32 PicoCheckPcS68k(u32 pc)
 {
-  pc-=PicoCpuS68k.membase; // Get real pc
+  pc-=PicoCpuCS68k.membase; // Get real pc
   pc&=0xfffffe;
 
-  PicoCpuS68k.membase=PicoMemBaseS68k(pc);
+  PicoCpuCS68k.membase=PicoMemBaseS68k(pc);
 
-  return PicoCpuS68k.membase+pc;
+  return PicoCpuCS68k.membase+pc;
 }
 #endif
 
+#ifndef _ASM_CD_MEMORY_C
+void PicoMemResetCD(int r3)
+{
+#ifdef EMU_F68K
+  // update fetchmap..
+  int i;
+  if (!(r3 & 4))
+  {
+    for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x200000;
+  }
+  else
+  {
+    for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;
+    for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)
+      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;
+  }
+#endif
+}
+#endif
 
 PICO_INTERNAL void PicoMemSetupCD(void)
 {
-  dprintf("PicoMemSetupCD()");
+  // additional handlers for common code
+  PicoRead16Hook = OtherRead16End;
+  PicoWrite8Hook = OtherWrite8End;
+
 #ifdef EMU_C68K
   // Setup m68k memory callbacks:
-  PicoCpu.checkpc=PicoCheckPcM68k;
-  PicoCpu.fetch8 =PicoCpu.read8 =PicoReadM68k8;
-  PicoCpu.fetch16=PicoCpu.read16=PicoReadM68k16;
-  PicoCpu.fetch32=PicoCpu.read32=PicoReadM68k32;
-  PicoCpu.write8 =PicoWriteM68k8;
-  PicoCpu.write16=PicoWriteM68k16;
-  PicoCpu.write32=PicoWriteM68k32;
+  PicoCpuCM68k.checkpc=PicoCheckPcM68k;
+  PicoCpuCM68k.fetch8 =PicoCpuCM68k.read8 =PicoReadM68k8;
+  PicoCpuCM68k.fetch16=PicoCpuCM68k.read16=PicoReadM68k16;
+  PicoCpuCM68k.fetch32=PicoCpuCM68k.read32=PicoReadM68k32;
+  PicoCpuCM68k.write8 =PicoWriteM68k8;
+  PicoCpuCM68k.write16=PicoWriteM68k16;
+  PicoCpuCM68k.write32=PicoWriteM68k32;
+  // s68k
+  PicoCpuCS68k.checkpc=PicoCheckPcS68k;
+  PicoCpuCS68k.fetch8 =PicoCpuCS68k.read8 =PicoReadS68k8;
+  PicoCpuCS68k.fetch16=PicoCpuCS68k.read16=PicoReadS68k16;
+  PicoCpuCS68k.fetch32=PicoCpuCS68k.read32=PicoReadS68k32;
+  PicoCpuCS68k.write8 =PicoWriteS68k8;
+  PicoCpuCS68k.write16=PicoWriteS68k16;
+  PicoCpuCS68k.write32=PicoWriteS68k32;
+#endif
+#ifdef EMU_F68K
+  // m68k
+  PicoCpuFM68k.read_byte =PicoReadM68k8;
+  PicoCpuFM68k.read_word =PicoReadM68k16;
+  PicoCpuFM68k.read_long =PicoReadM68k32;
+  PicoCpuFM68k.write_byte=PicoWriteM68k8;
+  PicoCpuFM68k.write_word=PicoWriteM68k16;
+  PicoCpuFM68k.write_long=PicoWriteM68k32;
   // s68k
-  PicoCpuS68k.checkpc=PicoCheckPcS68k;
-  PicoCpuS68k.fetch8 =PicoCpuS68k.read8 =PicoReadS68k8;
-  PicoCpuS68k.fetch16=PicoCpuS68k.read16=PicoReadS68k16;
-  PicoCpuS68k.fetch32=PicoCpuS68k.read32=PicoReadS68k32;
-  PicoCpuS68k.write8 =PicoWriteS68k8;
-  PicoCpuS68k.write16=PicoWriteS68k16;
-  PicoCpuS68k.write32=PicoWriteS68k32;
+  PicoCpuFS68k.read_byte =PicoReadS68k8;
+  PicoCpuFS68k.read_word =PicoReadS68k16;
+  PicoCpuFS68k.read_long =PicoReadS68k32;
+  PicoCpuFS68k.write_byte=PicoWriteS68k8;
+  PicoCpuFS68k.write_word=PicoWriteS68k16;
+  PicoCpuFS68k.write_long=PicoWriteS68k32;
+
+  // setup FAME fetchmap
+  {
+    int i;
+    // M68k
+    // by default, point everything to fitst 64k of ROM (BIOS)
+    for (i = 0; i < M68K_FETCHBANK1; i++)
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
+    // now real ROM (BIOS)
+    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));
+    // S68k
+    // PRG RAM is default
+    for (i = 0; i < M68K_FETCHBANK1; i++)
+      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));
+    // real PRG RAM
+    for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0x80000; i++)
+      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram;
+    // WORD RAM 2M area
+    for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)
+      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000;
+    // PicoMemResetCD() will setup word ram for both
+  }
 #endif
+
   // m68k_poll_addr = m68k_poll_cnt = 0;
   s68k_poll_adclk = s68k_poll_cnt = 0;
 }
@@ -1484,36 +1698,37 @@ PICO_INTERNAL void PicoMemSetupCD(void)
 
 #ifdef EMU_M68K
 unsigned char  PicoReadCD8w (unsigned int a) {
-	return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k8(a) : PicoReadM68k8(a);
+	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k8(a) : PicoReadM68k8(a);
 }
 unsigned short PicoReadCD16w(unsigned int a) {
-	return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k16(a) : PicoReadM68k16(a);
+	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k16(a) : PicoReadM68k16(a);
 }
 unsigned int   PicoReadCD32w(unsigned int a) {
-	return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k32(a) : PicoReadM68k32(a);
+	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k32(a) : PicoReadM68k32(a);
 }
 void PicoWriteCD8w (unsigned int a, unsigned char d) {
-	if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);
+	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);
 }
 void PicoWriteCD16w(unsigned int a, unsigned short d) {
-	if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);
+	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);
 }
 void PicoWriteCD32w(unsigned int a, unsigned int d) {
-	if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);
+	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);
 }
 
 // these are allowed to access RAM
-unsigned int  m68k_read_pcrelative_CD8 (unsigned int a) {
+unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
+{
   a&=0xffffff;
-  if(m68ki_cpu_p == &PicoS68kCPU) {
+  if(m68ki_cpu_p == &PicoCpuMS68k) {
     if (a < 0x80000) return *(u8 *)(Pico_mcd->prg_ram+(a^1)); // PRG Ram
     if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)
       return *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff));
     if ((a&0xfe0000)==0x0c0000 &&  (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff));
     }
-    dprintf("s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);
   } else {
     if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
     if(a<0x20000)              return *(u8 *)(Pico.rom+(a^1)); // Bios
@@ -1525,21 +1740,22 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int a) {
         return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff));
       }
     }
-    dprintf("m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);
   }
   return 0;//(u8)  lastread_d;
 }
-unsigned int  m68k_read_pcrelative_CD16(unsigned int a) {
+unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
+{
   a&=0xffffff;
-  if(m68ki_cpu_p == &PicoS68kCPU) {
+  if(m68ki_cpu_p == &PicoCpuMS68k) {
     if (a < 0x80000) return *(u16 *)(Pico_mcd->prg_ram+(a&~1)); // PRG Ram
     if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)
       return *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
     if ((a&0xfe0000)==0x0c0000 &&  (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
     }
-    dprintf("s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);
   } else {
     if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
     if(a<0x20000)              return *(u16 *)(Pico.rom+(a&~1)); // Bios
@@ -1551,23 +1767,24 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a) {
         return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
       }
     }
-    dprintf("m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);
   }
   return 0;
 }
-unsigned int  m68k_read_pcrelative_CD32(unsigned int a) {
+unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
+{
   u16 *pm;
   a&=0xffffff;
-  if(m68ki_cpu_p == &PicoS68kCPU) {
+  if(m68ki_cpu_p == &PicoCpuMS68k) {
     if (a < 0x80000) { u16 *pm=(u16 *)(Pico_mcd->prg_ram+(a&~1)); return (pm[0]<<16)|pm[1]; } // PRG Ram
     if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)
       { pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; }
     if ((a&0xfe0000)==0x0c0000 &&  (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
+      int bank = (Pico_mcd->s68k_regs[3]&1)^1;
       pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
       return (pm[0]<<16)|pm[1];
     }
-    dprintf("s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);
   } else {
     if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
     if(a<0x20000)              { u16 *pm=(u16 *)(Pico.rom+(a&~1));     return (pm[0]<<16)|pm[1]; }
@@ -1580,7 +1797,7 @@ unsigned int  m68k_read_pcrelative_CD32(unsigned int a) {
         return (pm[0]<<16)|pm[1];
       }
     }
-    dprintf("m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);
   }
   return 0;
 }