musashi Cyclone hack fix

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index daec623..ec31ea2 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -11,19 +11,21 @@
 \r
 #include "PicoInt.h"\r
 \r
-#include "sound/sound.h"\r
 #include "sound/ym2612.h"\r
 #include "sound/sn76496.h"\r
 \r
+#ifndef UTYPES_DEFINED\r
 typedef unsigned char  u8;\r
 typedef unsigned short u16;\r
 typedef unsigned int   u32;\r
+#define UTYPES_DEFINED\r
+#endif\r
 \r
 extern unsigned int lastSSRamWrite; // used by serial SRAM code\r
 \r
 #ifdef _ASM_MEMORY_C\r
-u8   PicoRead8(u32 a);\r
-u16  PicoRead16(u32 a);\r
+u32  PicoRead8(u32 a);\r
+u32  PicoRead16(u32 a);\r
 void PicoWriteRomHW_SSF2(u32 a,u32 d);\r
 void PicoWriteRomHW_in1 (u32 a,u32 d);\r
 #endif\r
@@ -36,6 +38,12 @@ int lrp_cyc=0, lrp_mus=0, lwp_cyc=0, lwp_mus=0;
 extern unsigned int ppop;\r
 #endif\r
 \r
+#ifdef IO_STATS\r
+void log_io(unsigned int addr, int bits, int rw);\r
+#else\r
+#define log_io(...)\r
+#endif\r
+\r
 #if defined(EMU_C68K) || defined(EMU_A68K)\r
 static __inline int PicoMemBase(u32 pc)\r
 {\r
@@ -69,11 +77,13 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
   u32 ret=0;\r
 #if defined(EMU_C68K)\r
   pc-=PicoCpu.membase; // Get real pc\r
-  pc&=0xfffffe;\r
-  if (pc == 0)\r
+//  pc&=0xfffffe;\r
+  pc&=~1;\r
+  if ((pc<<8) == 0)\r
     return (int)Pico.rom + Pico.romsize; // common crash condition, can happen if acc timing is off\r
 \r
-  PicoCpu.membase=PicoMemBase(pc);\r
+  PicoCpu.membase=PicoMemBase(pc&0x00ffffff);\r
+  PicoCpu.membase-=pc&0xff000000;\r
 \r
   ret = PicoCpu.membase+pc;\r
 #elif defined(EMU_A68K)\r
@@ -86,14 +96,14 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
 }\r
 \r
 \r
-int PicoInitPc(u32 pc)\r
+PICO_INTERNAL int PicoInitPc(u32 pc)\r
 {\r
   PicoCheckPc(pc);\r
   return 0;\r
 }\r
 \r
 #ifndef _ASM_MEMORY_C\r
-void PicoMemReset()\r
+PICO_INTERNAL_ASM void PicoMemReset(void)\r
 {\r
 }\r
 #endif\r
@@ -264,7 +274,7 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 //                     Read Rom and read Ram\r
 \r
 #ifndef _ASM_MEMORY_C\r
-u8 CPU_CALL PicoRead8(u32 a)\r
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead8(u32 a)\r
 {\r
   u32 d=0;\r
 \r
@@ -290,6 +300,7 @@ u8 CPU_CALL PicoRead8(u32 a)
 #endif\r
 \r
   if (a<Pico.romsize) { d = *(u8 *)(Pico.rom+(a^1)); goto end; } // Rom\r
+  log_io(a, 8, 0);\r
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
 \r
   d=OtherRead16(a&~1, 8); if ((a&1)==0) d>>=8;\r
@@ -312,12 +323,12 @@ u8 CPU_CALL PicoRead8(u32 a)
     lastread_d[lrp_cyc++&15] = (u8)d;\r
   }\r
 #endif\r
-  return (u8)d;\r
+  return d;\r
 }\r
 \r
-u16 CPU_CALL PicoRead16(u32 a)\r
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead16(u32 a)\r
 {\r
-  u16 d=0;\r
+  u32 d=0;\r
 \r
   if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram\r
 \r
@@ -326,14 +337,15 @@ u16 CPU_CALL PicoRead16(u32 a)
 #if !(defined(EMU_C68K) && defined(EMU_M68K))\r
   // sram\r
   if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg & 1)) {\r
-    d = (u16) SRAMRead(a);\r
+    d = SRAMRead(a);\r
     goto end;\r
   }\r
 #endif\r
 \r
   if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom\r
+  log_io(a, 16, 0);\r
 \r
-  d = (u16)OtherRead16(a, 16);\r
+  d = OtherRead16(a, 16);\r
 \r
   end:\r
   //if ((a&0xe0ffff)==0xe0AF0E+0x69c||(a&0xe0ffff)==0xe0A9A8+0x69c||(a&0xe0ffff)==0xe0A9AA+0x69c||(a&0xe0ffff)==0xe0A9AC+0x69c)\r
@@ -351,7 +363,7 @@ u16 CPU_CALL PicoRead16(u32 a)
   return d;\r
 }\r
 \r
-u32 CPU_CALL PicoRead32(u32 a)\r
+PICO_INTERNAL_ASM u32 CPU_CALL PicoRead32(u32 a)\r
 {\r
   u32 d=0;\r
 \r
@@ -366,6 +378,7 @@ u32 CPU_CALL PicoRead32(u32 a)
   }\r
 \r
   if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom\r
+  log_io(a, 32, 0);\r
 \r
   d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
 \r
@@ -398,6 +411,7 @@ static void CPU_CALL PicoWrite8(u32 a,u8 d)
   //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
 \r
   if ((a&0xe00000)==0xe00000) { *(u8 *)(Pico.ram+((a^1)&0xffff))=d; return; } // Ram\r
+  log_io(a, 8, 1);\r
 \r
   a&=0xffffff;\r
   OtherWrite8(a,d,8);\r
@@ -415,6 +429,7 @@ void CPU_CALL PicoWrite16(u32 a,u16 d)
   //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 \r
   if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram\r
+  log_io(a, 16, 1);\r
 \r
   a&=0xfffffe;\r
   OtherWrite16(a,d);\r
@@ -436,6 +451,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
     pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
     return;\r
   }\r
+  log_io(a, 32, 1);\r
 \r
   a&=0xfffffe;\r
   OtherWrite16(a,  (u16)(d>>16));\r
@@ -444,7 +460,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 \r
 \r
 // -----------------------------------------------------------------\r
-void PicoMemSetup()\r
+PICO_INTERNAL void PicoMemSetup(void)\r
 {\r
 #ifdef EMU_C68K\r
   // Setup memory callbacks:\r
@@ -621,7 +637,7 @@ void m68k_write_memory_32(unsigned int address, unsigned int value)
 // -----------------------------------------------------------------\r
 //                        z80 memhandlers\r
 \r
-unsigned char z80_read(unsigned short a)\r
+PICO_INTERNAL unsigned char z80_read(unsigned short a)\r
 {\r
   u8 ret = 0;\r
 \r
@@ -649,14 +665,14 @@ end:
   return ret;\r
 }\r
 \r
-unsigned short z80_read16(unsigned short a)\r
+PICO_INTERNAL unsigned short z80_read16(unsigned short a)\r
 {\r
   //dprintf("z80_read16");\r
 \r
   return (u16) ( (u16)z80_read(a) | ((u16)z80_read((u16)(a+1))<<8) );\r
 }\r
 \r
-void z80_write(unsigned char data, unsigned short a)\r
+PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)\r
 {\r
   //if (a<0x4000)\r
   //  dprintf("z80 w8 : %06x,   %02x @%04x", a, data, mz80GetRegisterValue(NULL, 0));\r
@@ -695,7 +711,7 @@ void z80_write(unsigned char data, unsigned short a)
   if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }\r
 }\r
 \r
-void z80_write16(unsigned short data, unsigned short a)\r
+PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a)\r
 {\r
   //dprintf("z80_write16");\r
 \r