X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=dc9c7386404bb0b8b0c54ad33a8b4e3d4d77d990;hb=f58f05d28a40e783a6159186d01dbfe67cdc0728;hp=3104eb414aa92123ddcee6fadd317833fa8c10ed;hpb=312e9ce192d49b4bea2f8a7e3cd2eb91a860564f;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 3104eb4..dc9c738 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -7,23 +7,26 @@
 // For commercial use, separate licencing terms must be obtained.
 
 
-//#define __debug_io
+#define __debug_io
 
 #include "PicoInt.h"
 
-#include "sound/sound.h"
 #include "sound/ym2612.h"
 #include "sound/sn76496.h"
 
+#ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
+#define UTYPES_DEFINED
+#endif
 
 extern unsigned int lastSSRamWrite; // used by serial SRAM code
 
 #ifdef _ASM_MEMORY_C
-u8   PicoRead8(u32 a);
-u16  PicoRead16(u32 a);
+u32  PicoRead8(u32 a);
+u32  PicoRead16(u32 a);
+void PicoWrite8(u32 a,u8 d);
 void PicoWriteRomHW_SSF2(u32 a,u32 d);
 void PicoWriteRomHW_in1 (u32 a,u32 d);
 #endif
@@ -36,6 +39,12 @@ int lrp_cyc=0, lrp_mus=0, lwp_cyc=0, lwp_mus=0;
 extern unsigned int ppop;
 #endif
 
+#ifdef IO_STATS
+void log_io(unsigned int addr, int bits, int rw);
+#else
+#define log_io(...)
+#endif
+
 #if defined(EMU_C68K) || defined(EMU_A68K)
 static __inline int PicoMemBase(u32 pc)
 {
@@ -69,9 +78,13 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
   u32 ret=0;
 #if defined(EMU_C68K)
   pc-=PicoCpu.membase; // Get real pc
-  pc&=0xfffffe;
+//  pc&=0xfffffe;
+  pc&=~1;
+  if ((pc<<8) == 0)
+    return (int)Pico.rom + Pico.romsize; // common crash condition, can happen if acc timing is off
 
-  PicoCpu.membase=PicoMemBase(pc);
+  PicoCpu.membase=PicoMemBase(pc&0x00ffffff);
+  PicoCpu.membase-=pc&0xff000000;
 
   ret = PicoCpu.membase+pc;
 #elif defined(EMU_A68K)
@@ -84,94 +97,67 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
 }
 
 
-int PicoInitPc(u32 pc)
+PICO_INTERNAL int PicoInitPc(u32 pc)
 {
   PicoCheckPc(pc);
   return 0;
 }
 
 #ifndef _ASM_MEMORY_C
-void PicoMemReset()
+PICO_INTERNAL_ASM void PicoMemReset(void)
 {
 }
 #endif
 
 // -----------------------------------------------------------------
 
-#ifndef _ASM_MEMORY_C
-// address must already be checked
-static int SRAMRead(u32 a)
-{
-  u8 *d = SRam.data-SRam.start+a;
-  return (d[0]<<8)|d[1];
-}
-#endif
-
-static int PadRead(int i)
+int PadRead(int i)
 {
-  int pad=0,value=0,TH;
+  int pad,value,data_reg;
   pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU
-  TH=Pico.ioports[i+1]&0x40;
+  data_reg=Pico.ioports[i+1];
+
+  // orr the bits, which are set as output
+  value = data_reg&(Pico.ioports[i+4]|0x80);
 
   if(PicoOpt & 0x20) { // 6 button gamepad enabled
     int phase = Pico.m.padTHPhase[i];
 
-    if(phase == 2 && !TH) {
-      value=(pad&0xc0)>>2;              // ?0SA 0000
-      goto end;
-    } else if(phase == 3 && TH) {
-      value=(pad&0x30)|((pad>>8)&0xf);  // ?1CB MXYZ
-      goto end;
-    } else if(phase == 3 && !TH) {
-      value=((pad&0xc0)>>2)|0x0f;       // ?0SA 1111
-      goto end;
+    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;
     }
   }
 
-  if(TH) value=(pad&0x3f);              // ?1CB RLDU
-  else   value=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
-
-  end:
-
-  // orr the bits, which are set as output
-  value |= Pico.ioports[i+1]&Pico.ioports[i+4];
+  if(data_reg&0x40) // TH
+       value|=(pad&0x3f);              // ?1CB RLDU
+  else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
 
   return value; // will mirror later
 }
 
-u8 z80Read8(u32 a)
-{
-  if(Pico.m.z80Run&1) return 0;
-
-  a&=0x1fff;
 
-  if(!(PicoOpt&4)) {
-    // Z80 disabled, do some faking
-    static u8 zerosent = 0;
-    if(a == Pico.m.z80_lastaddr) { // probably polling something
-      u8 d = Pico.m.z80_fakeval;
-      if((d & 0xf) == 0xf && !zerosent) {
-        d = 0; zerosent = 1;
-      } else {
-        Pico.m.z80_fakeval++;
-        zerosent = 0;
-      }
-      return d;
-    } else {
-      Pico.m.z80_fakeval = 0;
-    }
-  }
-
-  Pico.m.z80_lastaddr = (u16) a;
-  return Pico.zram[a];
+#ifndef _ASM_MEMORY_C
+// address must already be checked
+static int SRAMRead(u32 a)
+{
+  u8 *d = SRam.data-SRam.start+a;
+  return (d[0]<<8)|d[1];
 }
+#endif
 
 
 // for nonstandard reads
 #ifndef _ASM_MEMORY_C
 static
 #endif
-u32 UnusualRead16(u32 a, int realsize)
+u32 OtherRead16End(u32 a, int realsize)
 {
   u32 d=0;
 
@@ -242,111 +228,16 @@ end:
   return d;
 }
 
-#ifndef _ASM_MEMORY_C
-static
-#endif
-u32 OtherRead16(u32 a, int realsize)
-{
-  u32 d=0;
-
-  if ((a&0xff0000)==0xa00000) {
-    if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
-    if ((a&0x6000)==0x4000) { if(PicoOpt&1) d=YM2612Read(); else d=Pico.m.rotate++&3; dprintf("read ym2612: %04x", d); goto end; } // 0x4000-0x5fff, Fudge if disabled
-    d=0xffff; goto end;
-  }
-  if ((a&0xffffe0)==0xa10000) { // I/O ports
-    a=(a>>1)&0xf;
-    switch(a) {
-      case 0:  d=Pico.m.hardware; break; // Hardware value (Version register)
-      case 1:  d=PadRead(0); d|=Pico.ioports[1]&0x80; break;
-      case 2:  d=PadRead(1); d|=Pico.ioports[2]&0x80; break;
-      default: d=Pico.ioports[a]; break; // IO ports can be used as RAM
-    }
-    d|=d<<8;
-    goto end;
-  }
-  // |=0x80 for Shadow of the Beast & Super Offroad; rotate fakes next fetched instruction for Time Killers
-  if (a==0xa11100) {
-    d=Pico.m.z80Run&1;
-#if 0
-    if (!d) {
-      // do we need this?
-      extern int z80stopCycle; // TODO: tidy
-      int stop_before = SekCyclesDone() - z80stopCycle;
-      if (stop_before > 0 && stop_before <= 16) // Gens uses 16 here
-        d = 1; // bus not yet available
-    }
-#endif
-    d=(d<<8)|0x8000|Pico.m.rotate++;
-    dprintf("get_zrun: %04x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), SekPc);
-    goto end; }
-
-#ifndef _ASM_MEMORY_C
-  if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
-#endif
-
-  d = UnusualRead16(a, realsize);
-
-end:
-  return d;
-}
 
 //extern UINT32 mz80GetRegisterValue(void *, UINT32);
 
-static void OtherWrite8(u32 a,u32 d,int realsize)
+static void OtherWrite8End(u32 a,u32 d,int realsize)
 {
-  if ((a&0xe700f9)==0xc00011||(a&0xff7ff9)==0xa07f11) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
-  if ((a&0xff4000)==0xa00000)  { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)d; return; } // Z80 ram
-  if ((a&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d); return; } // FM Sound
-  if ((a&0xffffe0)==0xa10000)  { // I/O ports
-    a=(a>>1)&0xf;
-    // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-    if(PicoOpt&0x20) {
-      if(a==1) {
-        Pico.m.padDelay[0] = 0;
-        if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
-      }
-      else if(a==2) {
-        Pico.m.padDelay[1] = 0;
-        if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
-      }
-    }
-    Pico.ioports[a]=(u8)d; // IO ports can be used as RAM
-    return;
-  }
-  if (a==0xa11100) {
-    extern int z80startCycle, z80stopCycle;
-    //int lineCycles=(488-SekCyclesLeft)&0x1ff;
-    d&=1; d^=1;
-    if(!d) {
-       // hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)
-      // if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20); // FIXME: movies
-      z80stopCycle = SekCyclesDone();
-      //z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()
-    } else {
-      z80startCycle = SekCyclesDone();
-      //if(Pico.m.scanline != -1)
-      //z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;
-    }
-    dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);
-    Pico.m.z80Run=(u8)d; return;
-  }
-  if (a==0xa11200) { dprintf("write z80Reset: %02x", d); if(!(d&1)) z80_reset(); return; }
-
-  if ((a&0xff7f00)==0xa06000) // Z80 BANK register
-  {
-    Pico.m.z80_bank68k>>=1;
-    Pico.m.z80_bank68k|=(d&1)<<8;
-    Pico.m.z80_bank68k&=0x1ff; // 9 bits and filled in the new top one
-    return;
-  }
-
-  if ((a&0xe700e0)==0xc00000)  { PicoVideoWrite(a,(u16)(d|(d<<8))); return; } // Byte access gets mirrored
-
   // sram
   //if(a==0x200000) dprintf("cc : %02x @ %06x [%i|%i]", d, SekPc, SekCyclesDoneT(), SekCyclesDone());
   //if(a==0x200001) dprintf("w8 : %02x @ %06x [%i]", d, SekPc, SekCyclesDoneT());
   if(a >= SRam.start && a <= SRam.end) {
+    dprintf("sram w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);
     unsigned int sreg = Pico.m.sram_reg;
     if(!(sreg & 0x10)) {
       // not detected SRAM
@@ -384,7 +275,9 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
 #else
   // sram access register
   if(a == 0xA130F1) {
-    Pico.m.sram_reg = (u8)(d&3);
+    dprintf("sram reg=%02x", d);
+    Pico.m.sram_reg &= ~3;
+    Pico.m.sram_reg |= (u8)(d&3);
     return;
   }
 #endif
@@ -406,39 +299,15 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
     Pico.m.prot_bytes[(a>>2)&1] = (u8)d;
 }
 
-static void OtherWrite16(u32 a,u32 d)
-{
-  if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; }
-  if ((a&0xff4000)==0xa00000) { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); return; } // Z80 ram (MSB only)
-
-  if ((a&0xffffe0)==0xa10000) { // I/O ports
-    a=(a>>1)&0xf;
-    // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-    if(PicoOpt&0x20) {
-      if(a==1) {
-        Pico.m.padDelay[0] = 0;
-        if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
-      }
-      else if(a==2) {
-        Pico.m.padDelay[1] = 0;
-        if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
-      }
-    }
-    Pico.ioports[a]=(u8)d; // IO ports can be used as RAM
-    return;
-  }
-  if (a==0xa11100) { OtherWrite8(a, d>>8, 16); return; }
-  if (a==0xa11200) { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
 
-  OtherWrite8(a,  d>>8, 16);
-  OtherWrite8(a+1,d&0xff, 16);
-}
+#include "MemoryCmn.c"
+
 
 // -----------------------------------------------------------------
 //                     Read Rom and read Ram
 
 #ifndef _ASM_MEMORY_C
-u8 CPU_CALL PicoRead8(u32 a)
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead8(u32 a)
 {
   u32 d=0;
 
@@ -464,6 +333,7 @@ u8 CPU_CALL PicoRead8(u32 a)
 #endif
 
   if (a<Pico.romsize) { d = *(u8 *)(Pico.rom+(a^1)); goto end; } // Rom
+  log_io(a, 8, 0);
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
 
   d=OtherRead16(a&~1, 8); if ((a&1)==0) d>>=8;
@@ -481,17 +351,17 @@ u8 CPU_CALL PicoRead8(u32 a)
   dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
 #endif
 #if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = (u8)d;
   }
 #endif
-  return (u8)d;
+  return d;
 }
 
-u16 CPU_CALL PicoRead16(u32 a)
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead16(u32 a)
 {
-  u16 d=0;
+  u32 d=0;
 
   if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram
 
@@ -500,14 +370,15 @@ u16 CPU_CALL PicoRead16(u32 a)
 #if !(defined(EMU_C68K) && defined(EMU_M68K))
   // sram
   if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg & 1)) {
-    d = (u16) SRAMRead(a);
+    d = SRAMRead(a);
     goto end;
   }
 #endif
 
   if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom
+  log_io(a, 16, 0);
 
-  d = (u16)OtherRead16(a, 16);
+  d = OtherRead16(a, 16);
 
   end:
   //if ((a&0xe0ffff)==0xe0AF0E+0x69c||(a&0xe0ffff)==0xe0A9A8+0x69c||(a&0xe0ffff)==0xe0A9AA+0x69c||(a&0xe0ffff)==0xe0A9AC+0x69c)
@@ -517,7 +388,7 @@ u16 CPU_CALL PicoRead16(u32 a)
   dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
 #endif
 #if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = d;
   }
@@ -525,7 +396,7 @@ u16 CPU_CALL PicoRead16(u32 a)
   return d;
 }
 
-u32 CPU_CALL PicoRead32(u32 a)
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead32(u32 a)
 {
   u32 d=0;
 
@@ -540,6 +411,7 @@ u32 CPU_CALL PicoRead32(u32 a)
   }
 
   if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom
+  log_io(a, 32, 0);
 
   d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
 
@@ -548,7 +420,7 @@ u32 CPU_CALL PicoRead32(u32 a)
   dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
 #endif
 #if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = d;
   }
@@ -560,7 +432,8 @@ u32 CPU_CALL PicoRead32(u32 a)
 // -----------------------------------------------------------------
 //                            Write Ram
 
-static void CPU_CALL PicoWrite8(u32 a,u8 d)
+#ifndef _ASM_MEMORY_C
+PICO_INTERNAL_ASM void CPU_CALL PicoWrite8(u32 a,u8 d)
 {
 #ifdef __debug_io
   dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
@@ -571,16 +444,15 @@ static void CPU_CALL PicoWrite8(u32 a,u8 d)
   //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
   //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 
-
-  if ((a&0xe00000)==0xe00000) {
-	  if((a&0xffff)==0xf62a) dprintf("(f62a) = %02x [%i|%i] @ %x", d, Pico.m.scanline, SekCyclesDone(), SekPc);
-	   u8 *pm=(u8 *)(Pico.ram+((a^1)&0xffff)); pm[0]=d; return; } // Ram
+  if ((a&0xe00000)==0xe00000) { *(u8 *)(Pico.ram+((a^1)&0xffff))=d; return; } // Ram
+  log_io(a, 8, 1);
 
   a&=0xffffff;
-  OtherWrite8(a,d,8);
+  OtherWrite8(a,d);
 }
+#endif
 
-static void CPU_CALL PicoWrite16(u32 a,u16 d)
+void CPU_CALL PicoWrite16(u32 a,u16 d)
 {
 #ifdef __debug_io
   dprintf("w16: %06x, %04x", a&0xffffff, d);
@@ -592,6 +464,7 @@ static void CPU_CALL PicoWrite16(u32 a,u16 d)
   //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
 
   if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram
+  log_io(a, 16, 1);
 
   a&=0xfffffe;
   OtherWrite16(a,d);
@@ -613,6 +486,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
     pm[0]=(u16)(d>>16); pm[1]=(u16)d;
     return;
   }
+  log_io(a, 32, 1);
 
   a&=0xfffffe;
   OtherWrite16(a,  (u16)(d>>16));
@@ -621,7 +495,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 
 
 // -----------------------------------------------------------------
-int PicoMemInit()
+PICO_INTERNAL void PicoMemSetup(void)
 {
 #ifdef EMU_C68K
   // Setup memory callbacks:
@@ -633,7 +507,6 @@ int PicoMemInit()
   PicoCpu.write16=PicoWrite16;
   PicoCpu.write32=PicoWrite32;
 #endif
-  return 0;
 }
 
 #ifdef EMU_A68K
@@ -678,39 +551,78 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a);
 unsigned int  m68k_read_pcrelative_CD32(unsigned int a);
 
 // these are allowed to access RAM
-unsigned int  m68k_read_pcrelative_8 (unsigned int a) {
+static unsigned int  m68k_read_8 (unsigned int a, int do_fake) {
   a&=0xffffff;
   if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
   if(a<Pico.romsize)         return *(u8 *)(Pico.rom+(a^1)); // Rom
+#ifdef EMU_C68K
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
+#endif
   if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
-  return 0;//(u8)  lastread_d;
+  return 0;
 }
-unsigned int  m68k_read_pcrelative_16(unsigned int a) {
+static unsigned int  m68k_read_16(unsigned int a, int do_fake) {
   a&=0xffffff;
   if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
   if(a<Pico.romsize)         return *(u16 *)(Pico.rom+(a&~1)); // Rom
+#ifdef EMU_C68K
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
+#endif
   if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
-  return 0;//(u16) lastread_d;
+  return 0;
 }
-unsigned int  m68k_read_pcrelative_32(unsigned int a) {
+static unsigned int  m68k_read_32(unsigned int a, int do_fake) {
   a&=0xffffff;
   if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
   if(a<Pico.romsize)         { u16 *pm=(u16 *)(Pico.rom+(a&~1));     return (pm[0]<<16)|pm[1]; }
+#ifdef EMU_C68K
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
+#endif
   if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
-  return 0;//lastread_d;
+  return 0;
 }
 
-unsigned int m68k_read_immediate_16(unsigned int a)    { return m68k_read_pcrelative_16(a); }
-unsigned int m68k_read_immediate_32(unsigned int a)    { return m68k_read_pcrelative_32(a); }
-unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_pcrelative_8 (a); }
-unsigned int m68k_read_disassembler_16(unsigned int a) { return m68k_read_pcrelative_16(a); }
-unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_pcrelative_32(a); }
+unsigned int m68k_read_pcrelative_8 (unsigned int a)   { return m68k_read_8 (a, 1); }
+unsigned int m68k_read_pcrelative_16(unsigned int a)   { return m68k_read_16(a, 1); }
+unsigned int m68k_read_pcrelative_32(unsigned int a)   { return m68k_read_32(a, 1); }
+unsigned int m68k_read_immediate_16(unsigned int a)    { return m68k_read_16(a, 0); }
+unsigned int m68k_read_immediate_32(unsigned int a)    { return m68k_read_32(a, 0); }
+unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_8 (a, 0); }
+unsigned int m68k_read_disassembler_16(unsigned int a) { return m68k_read_16(a, 0); }
+unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_32(a, 0); }
 
 #ifdef EMU_C68K
 // ROM only
-unsigned int  m68k_read_memory_8(unsigned int a)  { if(a<Pico.romsize) return  *(u8 *) (Pico.rom+(a^1)); return (u8)  lastread_d[lrp_mus++&15]; }
-unsigned int  m68k_read_memory_16(unsigned int a) { if(a<Pico.romsize) return  *(u16 *)(Pico.rom+(a&~1));return (u16) lastread_d[lrp_mus++&15]; }
-unsigned int  m68k_read_memory_32(unsigned int a) { if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));return (pm[0]<<16)|pm[1];} return lastread_d[lrp_mus++&15]; }
+unsigned int m68k_read_memory_8(unsigned int a)
+{
+  u8 d;
+  if(a<Pico.romsize) d = *(u8 *) (Pico.rom+(a^1));
+  else d = (u8) lastread_d[lrp_mus++&15];
+#ifdef __debug_io
+  dprintf("r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
+#endif
+  return d;
+}
+unsigned int m68k_read_memory_16(unsigned int a)
+{
+  u16 d;
+  if(a<Pico.romsize) d = *(u16 *)(Pico.rom+(a&~1));
+  else d = (u16) lastread_d[lrp_mus++&15];
+#ifdef __debug_io
+  dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);
+#endif
+  return d;
+}
+unsigned int m68k_read_memory_32(unsigned int a)
+{
+  u32 d;
+  if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1];}
+  else d = lastread_d[lrp_mus++&15];
+#ifdef __debug_io
+  dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);
+#endif
+  return d;
+}
 
 // ignore writes, Cyclone already done that
 void m68k_write_memory_8(unsigned int address, unsigned int value)  { lastwrite_mus_d[lwp_mus++&15] = value; }
@@ -760,7 +672,7 @@ void m68k_write_memory_32(unsigned int address, unsigned int value)
 // -----------------------------------------------------------------
 //                        z80 memhandlers
 
-unsigned char z80_read(unsigned short a)
+PICO_INTERNAL unsigned char z80_read(unsigned short a)
 {
   u8 ret = 0;
 
@@ -788,14 +700,14 @@ end:
   return ret;
 }
 
-unsigned short z80_read16(unsigned short a)
+PICO_INTERNAL unsigned short z80_read16(unsigned short a)
 {
   //dprintf("z80_read16");
 
   return (u16) ( (u16)z80_read(a) | ((u16)z80_read((u16)(a+1))<<8) );
 }
 
-void z80_write(unsigned char data, unsigned short a)
+PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)
 {
   //if (a<0x4000)
   //  dprintf("z80 w8 : %06x,   %02x @%04x", a, data, mz80GetRegisterValue(NULL, 0));
@@ -834,7 +746,7 @@ void z80_write(unsigned char data, unsigned short a)
   if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }
 }
 
-void z80_write16(unsigned short data, unsigned short a)
+PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a)
 {
   //dprintf("z80_write16");