cue support wip

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index ecc34c2..b4e473b 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -1,14 +1,12 @@
 // This is part of Pico Library\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-//#define __debug_io\r
-\r
 #include "PicoInt.h"\r
 \r
 #include "sound/ym2612.h"\r
@@ -39,6 +37,8 @@ extern unsigned int ppop;
 \r
 #ifdef IO_STATS\r
 void log_io(unsigned int addr, int bits, int rw);\r
+#elif defined(_MSC_VER)\r
+#define log_io\r
 #else\r
 #define log_io(...)\r
 #endif\r
@@ -112,7 +112,8 @@ int PadRead(int i)
   // orr the bits, which are set as output\r
   value = data_reg&(Pico.ioports[i+4]|0x80);\r
 \r
-  if(PicoOpt & 0x20) { // 6 button gamepad enabled\r
+  if (PicoOpt & POPT_6BTN_PAD)\r
+  {\r
     int phase = Pico.m.padTHPhase[i];\r
 \r
     if(phase == 2 && !(data_reg&0x40)) { // TH\r
@@ -205,10 +206,7 @@ static void SRAMWrite(u32 a, u32 d)
 }\r
 \r
 // for nonstandard reads\r
-#ifndef _ASM_MEMORY_C\r
-static\r
-#endif\r
-u32 OtherRead16End(u32 a, int realsize)\r
+static u32 OtherRead16End(u32 a, int realsize)\r
 {\r
   u32 d=0;\r
 \r
@@ -306,23 +304,11 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 #endif\r
   elprintf(EL_UIO, "strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
 \r
-  if(a >= 0xA13004 && a < 0xA13040) {\r
-    // dumb 12-in-1 or 4-in-1 banking support\r
-    int len;\r
-    a &= 0x3f; a <<= 16;\r
-    len = Pico.romsize - a;\r
-    if (len <= 0) return; // invalid/missing bank\r
-    if (len > 0x200000) len = 0x200000; // 2 megs\r
-    memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.\r
-    return;\r
-  }\r
-\r
   // for games with simple protection devices, discovered by Haze\r
-  else if ((a>>22) == 1)\r
+  if ((a>>22) == 1)\r
     Pico.m.prot_bytes[(a>>2)&1] = (u8)d;\r
 }\r
 \r
-\r
 #include "MemoryCmn.c"\r
 \r
 \r
@@ -357,9 +343,7 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   if ((a&1)==0) d>>=8;\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -394,9 +378,7 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
   else d = OtherRead16(a, 16);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -429,9 +411,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
   else d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -448,9 +428,7 @@ end:
 #if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)\r
 PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -465,9 +443,7 @@ PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)
 \r
 void PicoWrite16(u32 a,u16 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w16: %06x, %04x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -482,9 +458,7 @@ void PicoWrite16(u32 a,u16 d)
 \r
 static void PicoWrite32(u32 a,u32 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w32: %06x, %08x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -513,6 +487,26 @@ static void PicoWrite32(u32 a,u32 d)
 \r
 \r
 // -----------------------------------------------------------------\r
+\r
+// TODO: asm code\r
+static void OtherWrite16End(u32 a,u32 d,int realsize)\r
+{\r
+  PicoWrite8Hook(a,  d>>8, realsize);\r
+  PicoWrite8Hook(a+1,d&0xff, realsize);\r
+}\r
+\r
+u32  (*PicoRead16Hook) (u32 a, int realsize) = OtherRead16End;\r
+void (*PicoWrite8Hook) (u32 a, u32 d, int realsize) = OtherWrite8End;\r
+void (*PicoWrite16Hook)(u32 a, u32 d, int realsize) = OtherWrite16End;\r
+\r
+PICO_INTERNAL void PicoMemResetHooks(void)\r
+{\r
+  // default unmapped/cart specific handlers\r
+  PicoRead16Hook = OtherRead16End;\r
+  PicoWrite8Hook = OtherWrite8End;\r
+  PicoWrite16Hook = OtherWrite16End;\r
+}\r
+\r
 PICO_INTERNAL void PicoMemSetup(void)\r
 {\r
   // Setup memory callbacks:\r
@@ -563,7 +557,7 @@ static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD8(a);\r
   if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram\r
   return 0;\r
 }\r
@@ -574,7 +568,7 @@ static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD16(a);\r
   if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram\r
   return 0;\r
 }\r
@@ -585,7 +579,7 @@ static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG\r
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
 #endif\r
-  if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);\r
+  if(PicoAHW&1) return m68k_read_pcrelative_CD32(a);\r
   if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram\r
   return 0;\r
 }\r
@@ -607,9 +601,7 @@ unsigned int m68k_read_memory_8(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        d = *(u8 *) (Pico.rom+(a^1));\r
   else d = (u8) lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_16(unsigned int a)\r
@@ -618,9 +610,7 @@ unsigned int m68k_read_memory_16(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        d = *(u16 *)(Pico.rom+(a&~1));\r
   else d = (u16) lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_32(unsigned int a)\r
@@ -630,9 +620,7 @@ unsigned int m68k_read_memory_32(unsigned int a)
        { u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1]; }\r
   else if (a <= 0x78) d = m68k_read_32(a, 0);\r
   else d = lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 \r
@@ -651,34 +639,34 @@ void PicoWriteCD32w(unsigned int a, unsigned int d);
 /* it appears that Musashi doesn't always mask the unused bits */\r
 unsigned int  m68k_read_memory_8(unsigned int address)\r
 {\r
-    unsigned int d = (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
+    unsigned int d = (PicoAHW&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
     return d&0xff;\r
 }\r
 \r
 unsigned int  m68k_read_memory_16(unsigned int address)\r
 {\r
-    unsigned int d = (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
+    unsigned int d = (PicoAHW&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
     return d&0xffff;\r
 }\r
 \r
 unsigned int  m68k_read_memory_32(unsigned int address)\r
 {\r
-    return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
+    return (PicoAHW&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
 }\r
 \r
 void m68k_write_memory_8(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
+    if (PicoAHW&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
 }\r
 \r
 void m68k_write_memory_16(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
+    if (PicoAHW&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
 }\r
 \r
 void m68k_write_memory_32(unsigned int address, unsigned int value)\r
 {\r
-    if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
+    if (PicoAHW&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
 }\r
 #endif\r
 #endif // EMU_M68K\r
@@ -693,7 +681,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 \r
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
   {\r
-    if (PicoOpt&1) ret = (u8) YM2612Read();\r
+    if (PicoOpt&POPT_EN_FM) ret = (u8) YM2612Read();\r
     return ret;\r
   }\r
 \r
@@ -704,7 +692,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
     addr68k=Pico.m.z80_bank68k<<15;\r
     addr68k+=a&0x7fff;\r
 \r
-    if (PicoMCD & 1)\r
+    if (PicoAHW & PAHW_MCD)\r
          ret = PicoReadM68k8(addr68k);\r
     else ret = PicoRead8(addr68k);\r
     elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);\r
@@ -726,13 +714,13 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 {\r
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
   {\r
-    if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;\r
+    if(PicoOpt&POPT_EN_FM) emustatus|=YM2612Write(a, data) & 1;\r
     return;\r
   }\r
 \r
   if ((a&0xfff9)==0x7f11) // 7f11 7f13 7f15 7f17\r
   {\r
-    if(PicoOpt&2) SN76496Write(data);\r
+    if(PicoOpt&POPT_EN_PSG) SN76496Write(data);\r
     return;\r
   }\r
 \r
@@ -751,7 +739,7 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
     addr68k=Pico.m.z80_bank68k<<15;\r
     addr68k+=a&0x7fff;\r
     elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);\r
-    if (PicoMCD & 1)\r
+    if (PicoAHW & PAHW_MCD)\r
          PicoWriteM68k8(addr68k, data);\r
     else PicoWrite8(addr68k, data);\r
     return;\r