X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=0304e276814ad8196d8a9d05a2cc44ffe2d2b666;hb=170435846c8e2309dc4011f954287f9ea861a6b6;hp=48c32a6581b6224cdb7ed89fc5ec077cd7a6919e;hpb=f8ef8ff7100baa0ac0ecfcacb47aea3a9e24bc38;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 48c32a6..0304e27 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -37,6 +37,8 @@ extern unsigned int ppop;
 
 #ifdef IO_STATS
 void log_io(unsigned int addr, int bits, int rw);
+#elif defined(_MSC_VER)
+#define log_io
 #else
 #define log_io(...)
 #endif
@@ -65,7 +67,7 @@ static __inline int PicoMemBase(u32 pc)
 #endif
 
 
-static u32 PicoCheckPc(u32 pc)
+PICO_INTERNAL u32 PicoCheckPc(u32 pc)
 {
   u32 ret=0;
 #if defined(EMU_C68K)
@@ -110,7 +112,8 @@ int PadRead(int i)
   // orr the bits, which are set as output
   value = data_reg&(Pico.ioports[i+4]|0x80);
 
-  if(PicoOpt & 0x20) { // 6 button gamepad enabled
+  if (PicoOpt & POPT_6BTN_PAD)
+  {
     int phase = Pico.m.padTHPhase[i];
 
     if(phase == 2 && !(data_reg&0x40)) { // TH
@@ -207,6 +210,14 @@ static u32 OtherRead16End(u32 a, int realsize)
 {
   u32 d=0;
 
+  // 32x test
+/*
+  if      (a == 0xa130ec) { d = 0x4d41; goto end; } // MA
+  else if (a == 0xa130ee) { d = 0x5253; goto end; } // RS
+  else if (a == 0xa15100) { d = 0x0080; goto end; }
+  else
+*/
+
   // for games with simple protection devices, discovered by Haze
   // some dumb detection is used, but that should be enough to make things work
   if ((a>>22) == 1 && Pico.romsize >= 512*1024) {
@@ -301,19 +312,8 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 #endif
   elprintf(EL_UIO, "strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);
 
-  if(a >= 0xA13004 && a < 0xA13040) {
-    // dumb 12-in-1 or 4-in-1 banking support
-    int len;
-    a &= 0x3f; a <<= 16;
-    len = Pico.romsize - a;
-    if (len <= 0) return; // invalid/missing bank
-    if (len > 0x200000) len = 0x200000; // 2 megs
-    memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.
-    return;
-  }
-
   // for games with simple protection devices, discovered by Haze
-  else if ((a>>22) == 1)
+  if ((a>>22) == 1)
     Pico.m.prot_bytes[(a>>2)&1] = (u8)d;
 }
 
@@ -496,7 +496,6 @@ static void PicoWrite32(u32 a,u32 d)
 
 // -----------------------------------------------------------------
 
-// TODO: asm code
 static void OtherWrite16End(u32 a,u32 d,int realsize)
 {
   PicoWrite8Hook(a,  d>>8, realsize);
@@ -515,6 +514,10 @@ PICO_INTERNAL void PicoMemResetHooks(void)
   PicoWrite16Hook = OtherWrite16End;
 }
 
+#ifdef EMU_M68K
+static void m68k_mem_setup(void);
+#endif
+
 PICO_INTERNAL void PicoMemSetup(void)
 {
   // Setup memory callbacks:
@@ -538,7 +541,7 @@ PICO_INTERNAL void PicoMemSetup(void)
   // setup FAME fetchmap
   {
     int i;
-    // by default, point everything to fitst 64k of ROM
+    // by default, point everything to first 64k of ROM
     for (i = 0; i < M68K_FETCHBANK1; i++)
       PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
     // now real ROM
@@ -549,15 +552,24 @@ PICO_INTERNAL void PicoMemSetup(void)
       PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
   }
 #endif
+#ifdef EMU_M68K
+  m68k_mem_setup();
+#endif
 }
 
-
+/* some nasty things below :( */
 #ifdef EMU_M68K
-unsigned int  m68k_read_pcrelative_CD8 (unsigned int a);
-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 (*pm68k_read_memory_8) (unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_16)(unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_32)(unsigned int address) = NULL;
+void (*pm68k_write_memory_8) (unsigned int address, unsigned char  value) = NULL;
+void (*pm68k_write_memory_16)(unsigned int address, unsigned short value) = NULL;
+void (*pm68k_write_memory_32)(unsigned int address, unsigned int   value) = NULL;
+unsigned int (*pm68k_read_memory_pcr_8) (unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_pcr_16)(unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_pcr_32)(unsigned int address) = NULL;
+
+// these are here for core debugging mode
 static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 {
   a&=0xffffff;
@@ -565,9 +577,7 @@ static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
-  if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
-  if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
-  return 0;
+  return pm68k_read_memory_pcr_8(a);
 }
 static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 {
@@ -576,9 +586,7 @@ static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
-  if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
-  if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
-  return 0;
+  return pm68k_read_memory_pcr_16(a);
 }
 static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 {
@@ -587,9 +595,7 @@ static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 #ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
-  if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
-  if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
-  return 0;
+  return pm68k_read_memory_pcr_32(a);
 }
 
 unsigned int m68k_read_pcrelative_8 (unsigned int a)   { return m68k_read_8 (a, 1); }
@@ -601,6 +607,24 @@ unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_8 (a,
 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); }
 
+static unsigned int m68k_read_memory_pcr_8(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
+  return 0;
+}
+
+static unsigned int m68k_read_memory_pcr_16(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
+  return 0;
+}
+
+static unsigned int m68k_read_memory_pcr_32(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
+  return 0;
+}
+
 #ifdef EMU_CORE_DEBUG
 // ROM only
 unsigned int m68k_read_memory_8(unsigned int a)
@@ -636,47 +660,30 @@ unsigned int m68k_read_memory_32(unsigned int a)
 void m68k_write_memory_8(unsigned int address, unsigned int value)  { lastwrite_mus_d[lwp_mus++&15] = value; }
 void m68k_write_memory_16(unsigned int address, unsigned int value) { lastwrite_mus_d[lwp_mus++&15] = value; }
 void m68k_write_memory_32(unsigned int address, unsigned int value) { lastwrite_mus_d[lwp_mus++&15] = value; }
-#else
-unsigned char  PicoReadCD8w (unsigned int a);
-unsigned short PicoReadCD16w(unsigned int a);
-unsigned int   PicoReadCD32w(unsigned int a);
-void PicoWriteCD8w (unsigned int a, unsigned char d);
-void PicoWriteCD16w(unsigned int a, unsigned short d);
-void PicoWriteCD32w(unsigned int a, unsigned int d);
-
-/* it appears that Musashi doesn't always mask the unused bits */
-unsigned int  m68k_read_memory_8(unsigned int address)
-{
-    unsigned int d = (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);
-    return d&0xff;
-}
-
-unsigned int  m68k_read_memory_16(unsigned int address)
-{
-    unsigned int d = (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);
-    return d&0xffff;
-}
 
-unsigned int  m68k_read_memory_32(unsigned int address)
-{
-    return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);
-}
-
-void m68k_write_memory_8(unsigned int address, unsigned int value)
-{
-    if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);
-}
+#else // if !EMU_CORE_DEBUG
 
-void m68k_write_memory_16(unsigned int address, unsigned int value)
-{
-    if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);
-}
-
-void m68k_write_memory_32(unsigned int address, unsigned int value)
-{
-    if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);
+/* it appears that Musashi doesn't always mask the unused bits */
+unsigned int m68k_read_memory_8 (unsigned int address) { return pm68k_read_memory_8 (address) & 0xff; }
+unsigned int m68k_read_memory_16(unsigned int address) { return pm68k_read_memory_16(address) & 0xffff; }
+unsigned int m68k_read_memory_32(unsigned int address) { return pm68k_read_memory_32(address); }
+void m68k_write_memory_8 (unsigned int address, unsigned int value) { pm68k_write_memory_8 (address, (u8)value); }
+void m68k_write_memory_16(unsigned int address, unsigned int value) { pm68k_write_memory_16(address,(u16)value); }
+void m68k_write_memory_32(unsigned int address, unsigned int value) { pm68k_write_memory_32(address, value); }
+#endif // !EMU_CORE_DEBUG
+
+static void m68k_mem_setup(void)
+{
+  pm68k_read_memory_8  = PicoRead8;
+  pm68k_read_memory_16 = PicoRead16;
+  pm68k_read_memory_32 = PicoRead32;
+  pm68k_write_memory_8  = PicoWrite8;
+  pm68k_write_memory_16 = PicoWrite16;
+  pm68k_write_memory_32 = PicoWrite32;
+  pm68k_read_memory_pcr_8  = m68k_read_memory_pcr_8;
+  pm68k_read_memory_pcr_16 = m68k_read_memory_pcr_16;
+  pm68k_read_memory_pcr_32 = m68k_read_memory_pcr_32;
 }
-#endif
 #endif // EMU_M68K
 
 
@@ -689,7 +696,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if (PicoOpt&1) ret = (u8) YM2612Read();
+    if (PicoOpt&POPT_EN_FM) ret = (u8) YM2612Read();
     return ret;
   }
 
@@ -700,7 +707,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
 
-    if (PicoMCD & 1)
+    if (PicoAHW & PAHW_MCD)
          ret = PicoReadM68k8(addr68k);
     else ret = PicoRead8(addr68k);
     elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);
@@ -722,13 +729,13 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 {
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;
+    if(PicoOpt&POPT_EN_FM) emustatus|=YM2612Write(a, data) & 1;
     return;
   }
 
   if ((a&0xfff9)==0x7f11) // 7f11 7f13 7f15 7f17
   {
-    if(PicoOpt&2) SN76496Write(data);
+    if(PicoOpt&POPT_EN_PSG) SN76496Write(data);
     return;
   }
 
@@ -747,7 +754,7 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
     elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);
-    if (PicoMCD & 1)
+    if (PicoAHW & PAHW_MCD)
          PicoWriteM68k8(addr68k, data);
     else PicoWrite8(addr68k, data);
     return;