X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=0be0a4211696215efbb698f61bdcdebf36276fec;hb=110df09c8a2479c6a58655ad6b09b50584fbe5f4;hp=e0b5d08e74c94cd7b09ab1d4ddd0e4ee4c0309f5;hpb=0af33fe0ef24a3e3b65217ad0d7aa2db03d16fc1;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index e0b5d08..0be0a42 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -2,37 +2,43 @@
 // Loosely based on Gens code.
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
-// A68K no longer supported here
 
 //#define __debug_io
 
 #include "../PicoInt.h"
 
-#include "../sound/sound.h"
 #include "../sound/ym2612.h"
 #include "../sound/sn76496.h"
 
 #include "gfx_cd.h"
 #include "pcm.h"
 
+#ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
 typedef unsigned short u16;
 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;
@@ -278,7 +284,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:
@@ -291,9 +296,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)
@@ -311,9 +314,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;
@@ -391,6 +392,24 @@ static u32 OtherRead16End(u32 a, int realsize)
     goto end;
   }
 
+  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;
+  }
+
   dprintf("m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);
 
 end:
@@ -402,10 +421,23 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 {
   if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }
 
+  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;
+  }
+
   dprintf("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"
@@ -415,58 +447,88 @@ 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);
+#endif
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -480,50 +542,80 @@ 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);
+#endif
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -537,54 +629,89 @@ 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);
+#endif
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
+    lastread_a = a;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -596,22 +723,20 @@ 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);
 #endif
-  //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
-  //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
-
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
 
   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];
@@ -619,6 +744,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);
@@ -641,7 +768,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  OtherWrite8(a,d,8);
+  OtherWrite8(a,d);
 }
 #endif
 
@@ -654,15 +781,15 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef __debug_io
   dprintf("w16: %06x, %04x", a&0xffffff, d);
 #endif
-  //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
 
   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];
@@ -671,6 +798,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);
@@ -705,6 +834,12 @@ static void PicoWriteM68k16(u32 a,u16 d)
     return;
   }
 
+  // VDP
+  if ((a&0xe700e0)==0xc00000) {
+    PicoVideoWrite(a,(u16)d);
+    return;
+  }
+
   OtherWrite16(a,d);
 }
 #endif
@@ -718,6 +853,9 @@ static void PicoWriteM68k32(u32 a,u32 d)
 #ifdef __debug_io
   dprintf("w32: %06x, %08x", a&0xffffff, d);
 #endif
+#ifdef EMU_CORE_DEBUG
+  lastwrite_cyc_d[lwp_cyc++&15] = d;
+#endif
 
   if ((a&0xe00000)==0xe00000)
   {
@@ -727,8 +865,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];
@@ -737,6 +873,8 @@ static void PicoWriteM68k32(u32 a,u32 d)
     return;
   }
 
+  a&=0xfffffe;
+
   // word RAM
   if ((a&0xfc0000)==0x200000) {
     if (d != 0) // don't log clears
@@ -767,6 +905,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);
 }
@@ -784,6 +930,9 @@ static u32 PicoReadS68k8(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xffffff;
 
   // prg RAM
@@ -815,7 +964,7 @@ 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;
@@ -834,7 +983,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;
@@ -867,6 +1016,10 @@ static u32 PicoReadS68k8(u32 a)
 
 #ifdef __debug_io2
   dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
+#endif
+#ifdef EMU_CORE_DEBUG
+  lastread_a = ab;
+  lastread_d[lrp_cyc++&15] = d;
 #endif
   return d;
 }
@@ -880,6 +1033,9 @@ static u32 PicoReadS68k16(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xfffffe;
 
   // prg RAM
@@ -905,7 +1061,7 @@ 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");
@@ -923,7 +1079,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;
@@ -960,6 +1116,10 @@ static u32 PicoReadS68k16(u32 a)
 
 #ifdef __debug_io2
   dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
+#endif
+#ifdef EMU_CORE_DEBUG
+  lastread_a = ab;
+  lastread_d[lrp_cyc++&15] = d;
 #endif
   return d;
 }
@@ -973,6 +1133,9 @@ static u32 PicoReadS68k32(u32 a)
 {
   u32 d=0;
 
+#ifdef EMU_CORE_DEBUG
+  u32 ab=a&0xfffffe;
+#endif
   a&=0xfffffe;
 
   // prg RAM
@@ -997,7 +1160,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];
@@ -1016,7 +1179,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;
@@ -1063,6 +1226,12 @@ static u32 PicoReadS68k32(u32 a)
 
 #ifdef __debug_io2
   dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
+#endif
+#ifdef EMU_CORE_DEBUG
+  if (ab > 0x78) { // not vectors and stuff
+    lastread_a = ab;
+    lastread_d[lrp_cyc++&15] = d;
+  }
 #endif
   return d;
 }
@@ -1073,7 +1242,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;
@@ -1096,7 +1265,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;
 
@@ -1133,6 +1302,10 @@ static void PicoWriteS68k8(u32 a,u8 d)
 
   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));
@@ -1171,7 +1344,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;
   }
@@ -1209,6 +1382,10 @@ static void PicoWriteS68k16(u32 a,u16 d)
 
   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);
@@ -1254,7 +1431,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;
   }
@@ -1295,6 +1472,10 @@ static void PicoWriteS68k32(u32 a,u32 d)
 
   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)) {
@@ -1344,7 +1525,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;
@@ -1385,7 +1566,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)
@@ -1399,7 +1580,7 @@ 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;
     }
   }
@@ -1413,12 +1594,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;
 }
 
 
@@ -1431,7 +1612,7 @@ 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;
   }
 
@@ -1444,37 +1625,101 @@ 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
 
-void PicoMemSetupCD()
+PICO_INTERNAL void PicoMemSetupCD(void)
 {
   dprintf("PicoMemSetupCD()");
 #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;
 }
@@ -1482,33 +1727,34 @@ void PicoMemSetupCD()
 
 #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);
@@ -1527,14 +1773,15 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int 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);
@@ -1553,15 +1800,16 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int 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];
     }