X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=72c439607836ecc217e5d287d2e65fd12f2c630f;hb=83c093a48ab58670ea82d0ec81658daa9f9b950a;hp=daec623ce3f597b631d4004a565b6e6dda028feb;hpb=2270612aa7ee7d04549e95c2ab4d72f6aa67fa8d;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index daec623..72c4396 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -11,19 +11,22 @@
 
 #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,11 +78,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,29 +97,96 @@ 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)
+int PadRead(int i)
 {
-  u8 *d = SRam.data-SRam.start+a;
-  return (d[0]<<8)|d[1];
+  int pad,value,data_reg;
+  pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU
+  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 && !(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(data_reg&0x40) // TH
+       value|=(pad&0x3f);              // ?1CB RLDU
+  else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
+
+  return value; // will mirror later
 }
+
+
+#ifndef _ASM_MEMORY_C
+static
 #endif
+u32 SRAMRead(u32 a)
+{
+  unsigned int sreg = Pico.m.sram_reg;
+  if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
+    Pico.m.sram_reg|=0x10; // should be normal SRAM
+  }
+  if(sreg & 4) // EEPROM read
+    return SRAMReadEEPROM();
+  else // if(sreg & 1) // (sreg&5) is one of prerequisites
+    return *(u8 *)(SRam.data-SRam.start+a);
+}
 
+static void SRAMWrite(u32 a, u32 d)
+{
+  dprintf("sram_w: %06x, %08x @%06x", a&0xffffff, d, SekPc);
+  unsigned int sreg = Pico.m.sram_reg;
+  if(!(sreg & 0x10)) {
+    // not detected SRAM
+    if((a&~1)==0x200000) {
+      Pico.m.sram_reg|=4; // this should be a game with EEPROM (like NBA Jam)
+      SRam.start=0x200000; SRam.end=SRam.start+1;
+    }
+    Pico.m.sram_reg|=0x10;
+  }
+  if(sreg & 4) { // EEPROM write
+    if(SekCyclesDoneT()-lastSSRamWrite < 46) {
+      // just update pending state
+      SRAMUpdPending(a, d);
+    } else {
+      SRAMWriteEEPROM(sreg>>6); // execute pending
+      SRAMUpdPending(a, d);
+      lastSSRamWrite = SekCyclesDoneT();
+    }
+  } else if(!(sreg & 2)) {
+    u8 *pm=(u8 *)(SRam.data-SRam.start+a);
+    if(*pm != (u8)d) {
+      SRam.changed = 1;
+      *pm=(u8)d;
+    }
+  }
+}
 
 // for nonstandard reads
 #ifndef _ASM_MEMORY_C
@@ -194,32 +272,7 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
   //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
-      if((a&~1)==0x200000) {
-        Pico.m.sram_reg|=4; // this should be a game with EEPROM (like NBA Jam)
-        SRam.start=0x200000; SRam.end=SRam.start+1;
-      }
-      Pico.m.sram_reg|=0x10;
-    }
-    if(sreg & 4) { // EEPROM write
-      if(SekCyclesDoneT()-lastSSRamWrite < 46) {
-        // just update pending state
-        SRAMUpdPending(a, d);
-      } else {
-        SRAMWriteEEPROM(sreg>>6); // execute pending
-        SRAMUpdPending(a, d);
-        lastSSRamWrite = SekCyclesDoneT();
-      }
-    } else if(!(sreg & 2)) {
-      u8 *pm=(u8 *)(SRam.data-SRam.start+a);
-      if(*pm != (u8)d) {
-        SRam.changed = 1;
-        *pm=(u8)d;
-      }
-    }
+    SRAMWrite(a, d);
     return;
   }
 
@@ -264,7 +317,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;
 
@@ -274,22 +327,14 @@ u8 CPU_CALL PicoRead8(u32 a)
 
 #if !(defined(EMU_C68K) && defined(EMU_M68K))
   // sram
-  if(a >= SRam.start && a <= SRam.end) {
-    unsigned int sreg = Pico.m.sram_reg;
-    if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
-      Pico.m.sram_reg|=0x10; // should be normal SRAM
-    }
-    if(sreg & 4) { // EEPROM read
-      d = SRAMReadEEPROM();
-      goto end;
-    } else if(sreg & 1) {
-      d = *(u8 *)(SRam.data-SRam.start+a);
-      goto end;
-    }
+  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
+    d = SRAMRead(a);
+    goto end;
   }
 #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;
@@ -301,7 +346,7 @@ u8 CPU_CALL PicoRead8(u32 a)
   //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
   //  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 
-  //if(a==0x200001) dprintf("r8 : %02x @ %06x [%i]", d, SekPc, SekCyclesDoneT());
+  //if(a==0x200001||a==0x200000) printf("r8 : %02x [%06x] @ %06x [%i]\n", d, a, SekPc, SekCyclesDoneT());
   //dprintf("r8 : %06x,   %02x @%06x [%03i]", a&0xffffff, (u8)d, SekPc, Pico.m.scanline);
 #ifdef __debug_io
   dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
@@ -312,12 +357,12 @@ u8 CPU_CALL PicoRead8(u32 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
 
@@ -325,19 +370,22 @@ 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);
+  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
+    d = SRAMRead(a);
+    d |= d<<8;
     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)
   //  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+  //if(a==0x200000) printf("r16: %04x @ %06x [%i]\n", d, SekPc, SekCyclesDoneT());
 
 #ifdef __debug_io
   dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
@@ -351,7 +399,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;
 
@@ -360,16 +408,19 @@ u32 CPU_CALL PicoRead32(u32 a)
   a&=0xfffffe;
 
   // sram
-  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg & 1)) {
+  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
     d = (SRAMRead(a)<<16)|SRAMRead(a+2);
+    d |= d<<8;
     goto end;
   }
 
   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);
 
   end:
+  //if(a==0x200000) printf("r32: %08x @ %06x [%i]\n", d, SekPc, SekCyclesDoneT());
 #ifdef __debug_io
   dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
 #endif
@@ -386,7 +437,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);
@@ -395,13 +447,16 @@ static void CPU_CALL PicoWrite8(u32 a,u8 d)
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
   //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
+  //if(a==0x200000||a==0x200001) printf("w8 : %02x [%06x] @ %06x [%i]\n", d, a, SekPc, SekCyclesDoneT());
   //  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);
+  OtherWrite8(a,d);
 }
+#endif
 
 void CPU_CALL PicoWrite16(u32 a,u16 d)
 {
@@ -413,8 +468,10 @@ void CPU_CALL PicoWrite16(u32 a,u16 d)
 #endif
   //if ((a&0xe0ffff)==0xe0AF0E+0x69c||(a&0xe0ffff)==0xe0A9A8+0x69c||(a&0xe0ffff)==0xe0A9AA+0x69c||(a&0xe0ffff)==0xe0A9AC+0x69c)
   //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+  //if(a==0x200000) printf("w16: %04x @ %06x [%i]\n", d, SekPc, SekCyclesDoneT());
 
   if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram
+  log_io(a, 16, 1);
 
   a&=0xfffffe;
   OtherWrite16(a,d);
@@ -428,6 +485,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 #if defined(EMU_C68K) && defined(EMU_M68K)
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
+  //if(a==0x200000) printf("w32: %08x @ %06x [%i]\n", d, SekPc, SekCyclesDoneT());
 
   if ((a&0xe00000)==0xe00000)
   {
@@ -436,6 +494,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 +503,7 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 
 
 // -----------------------------------------------------------------
-void PicoMemSetup()
+PICO_INTERNAL void PicoMemSetup(void)
 {
 #ifdef EMU_C68K
   // Setup memory callbacks:
@@ -621,7 +680,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;
 
@@ -649,14 +708,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));
@@ -695,7 +754,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");