X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=ec31ea25e65753e7cb336bd1f86f5abdc2aebcce;hb=a5ccbfbaf07e1d91c71b08485a1bd3ee8a06128f;hp=21db15e481bce97052599602f0026d783b831163;hpb=721cd3963fa4ba82ca218345e8f543703dc46c90;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 21db15e..ec31ea2 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -7,23 +7,25 @@
 // 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 PicoWriteRomHW_SSF2(u32 a,u32 d);
 void PicoWriteRomHW_in1 (u32 a,u32 d);
 #endif
@@ -36,6 +38,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,11 +77,13 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
   u32 ret=0;
 #if defined(EMU_C68K)
   pc-=PicoCpu.membase; // Get real pc
-  pc&=0xfffffe;
-  if (pc == 0)
+//  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)
@@ -86,14 +96,14 @@ 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
@@ -264,7 +274,7 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 //                     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;
 
@@ -290,6 +300,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;
@@ -307,17 +318,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
 
@@ -326,14 +337,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)
@@ -343,7 +355,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;
   }
@@ -351,7 +363,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;
 
@@ -366,6 +378,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);
 
@@ -374,7 +387,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;
   }
@@ -398,6 +411,7 @@ static void CPU_CALL PicoWrite8(u32 a,u8 d)
   //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 
   if ((a&0xe00000)==0xe00000) { *(u8 *)(Pico.ram+((a^1)&0xffff))=d; return; } // Ram
+  log_io(a, 8, 1);
 
   a&=0xffffff;
   OtherWrite8(a,d,8);
@@ -415,6 +429,7 @@ 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);
@@ -436,6 +451,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));
@@ -444,7 +460,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 
 
 // -----------------------------------------------------------------
-void PicoMemSetup()
+PICO_INTERNAL void PicoMemSetup(void)
 {
 #ifdef EMU_C68K
   // Setup memory callbacks:
@@ -500,39 +516,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; }
@@ -582,7 +637,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;
 
@@ -610,14 +665,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));
@@ -656,7 +711,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");