X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemoryCmn.c;h=dee031d5de806d1c66273ddb694ef9e8d54a4b02;hb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;hp=02d45d85dc2c7add42ca61b845c6bdb1c858e5e0;hpb=4ff2d52753e46bce5622a5935f3d3750b5848f8f;p=picodrive.git

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index 02d45d8..dee031d 100644
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -1,36 +1,12 @@
-/* common code for Memory.c and cd/Memory.c */
-
-static int PadRead(int i)
-{
-  int pad=0,value=0,TH;
-  pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU
-  TH=Pico.ioports[i+1]&0x40;
-
-  if(PicoOpt & 0x20) { // 6 button gamepad enabled
-    int phase = Pico.m.padTHPhase[i];
-
-    if(phase == 2 && !TH) {
-      value=(pad&0xc0)>>2;              // ?0SA 0000
-      goto end;
-    } else if(phase == 3 && TH) {
-      value=(pad&0x30)|((pad>>8)&0xf);  // ?1CB MXYZ
-      goto end;
-    } else if(phase == 3 && !TH) {
-      value=((pad&0xc0)>>2)|0x0f;       // ?0SA 1111
-      goto end;
-    }
-  }
-
-  if(TH) value=(pad&0x3f);              // ?1CB RLDU
-  else   value=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
-
-  end:
-
-  // orr the bits, which are set as output
-  value |= Pico.ioports[i+1]&Pico.ioports[i+4];
-
-  return value; // will mirror later
-}
+// common code for Memory.c and cd/Memory.c
+// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
+
+#ifndef UTYPES_DEFINED
+typedef unsigned char  u8;
+typedef unsigned short u16;
+typedef unsigned int   u32;
+#define UTYPES_DEFINED
+#endif
 
 
 #ifndef _ASM_MEMORY_C
@@ -42,7 +18,8 @@ u8 z80Read8(u32 a)
 
   a&=0x1fff;
 
-  if(!(PicoOpt&4)) {
+  if (!(PicoOpt&POPT_EN_Z80))
+  {
     // Z80 disabled, do some faking
     static u8 zerosent = 0;
     if(a == Pico.m.z80_lastaddr) { // probably polling something
@@ -63,130 +40,158 @@ u8 z80Read8(u32 a)
   return Pico.zram[a];
 }
 
-
 #ifndef _ASM_MEMORY_C
 static
 #endif
-u32 OtherRead16(u32 a, int realsize)
+u32 z80ReadBusReq(void)
 {
-  u32 d=0;
+  u32 d=Pico.m.z80Run&1;
+  if (!d) {
+    // needed by buggy Terminator (Sega CD)
+    int stop_before = SekCyclesDone() - z80stopCycle;
+    //elprintf(EL_BUSREQ, "get_zrun: stop before: %i", stop_before);
+    // note: if we use 20 or more here, Barkley Shut Up and Jam! will purposedly crash itself.
+    // but CD Terminator needs at least 32, so it only works because next frame cycle wrap.
+    if (stop_before > 0 && stop_before < 20) // Gens uses 16 here
+      d = 1; // bus not yet available
+  }
 
-  if ((a&0xff0000)==0xa00000) {
-    if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
-    if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
-      if(PicoOpt&1) d=YM2612Read();
-      else d=Pico.m.rotate++&3;
-      dprintf("read ym2612: %04x", d);
-      goto end;
+  elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d|0x80, SekCyclesDone(), SekPc);
+  return d|0x80;
+}
+
+#ifndef _ASM_MEMORY_C
+static
+#endif
+void z80WriteBusReq(u32 d)
+{
+  d&=1; d^=1;
+  {
+    if (!d)
+    {
+      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run)
+      {
+        z80stopCycle = SekCyclesDone();
+	PicoSyncZ80(z80stopCycle);
+      }
+    } else {
+      if (!Pico.m.z80Run)
+        z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
     }
-    d=0xffff;
-    goto end;
   }
+  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
+  Pico.m.z80Run=(u8)d;
+}
+
+#ifndef _ASM_MEMORY_C
+static
+#endif
+u32 OtherRead16(u32 a, int realsize)
+{
+  u32 d=0;
 
   if ((a&0xffffe0)==0xa10000) { // I/O ports
     a=(a>>1)&0xf;
     switch(a) {
       case 0:  d=Pico.m.hardware; break; // Hardware value (Version register)
-      case 1:  d=PadRead(0); d|=Pico.ioports[1]&0x80; break;
-      case 2:  d=PadRead(1); d|=Pico.ioports[2]&0x80; break;
+      case 1:  d=PadRead(0); break;
+      case 2:  d=PadRead(1); break;
       default: d=Pico.ioports[a]; break; // IO ports can be used as RAM
     }
     d|=d<<8;
     goto end;
   }
 
-  // |=0x80 for Shadow of the Beast & Super Offroad; rotate fakes next fetched instruction for Time Killers
+  // rotate fakes next fetched instruction for Time Killers
   if (a==0xa11100) { // z80 busreq
-    d=Pico.m.z80Run&1;
-    if (!d) {
-      // needed by buggy Terminator (Sega CD)
-      extern int z80stopCycle;
-      int stop_before = SekCyclesDone() - z80stopCycle;
-      dprintf("stop before: %i", stop_before);
-      if (stop_before > 0 && stop_before <= 32) // Gens uses 16 here
-        d = 1; // bus not yet available
-    }
-    d=(d<<8)|0x8000|Pico.m.rotate++;
-    dprintf("get_zrun: %04x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), SekPc);
+    d=(z80ReadBusReq()<<8)|Pico.m.rotate++;
     goto end;
   }
 
-#ifndef _ASM_MEMORY_C
-  if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
-#endif
+  if ((a&0xff0000)==0xa00000)
+  {
+    if (Pico.m.z80Run&1)
+      elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc);
+    if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
+    if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
+      if (PicoOpt&POPT_EN_FM) d=ym2612_read_local_68k();
+      else d=Pico.m.rotate++&3;
+      goto end;
+    }
+    elprintf(EL_ANOMALY, "68k bad read [%06x]", a);
+    d=0xffff;
+    goto end;
+  }
 
-  d = OtherRead16End(a, realsize);
+  d = PicoRead16Hook(a, realsize);
 
 end:
   return d;
 }
 
-
-//extern UINT32 mz80GetRegisterValue(void *, UINT32);
+static void IoWrite8(u32 a, u32 d)
+{
+  a=(a>>1)&0xf;
+  // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
+  if (PicoOpt&POPT_6BTN_PAD)
+  {
+    if (a==1) {
+      Pico.m.padDelay[0] = 0;
+      if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
+    }
+    else if (a==2) {
+      Pico.m.padDelay[1] = 0;
+      if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
+    }
+  }
+  Pico.ioports[a]=(u8)d; // IO ports can be used as RAM
+}
 
 #ifndef _ASM_CD_MEMORY_C
 static
 #endif
-void OtherWrite8(u32 a,u32 d,int realsize)
+void OtherWrite8(u32 a,u32 d)
 {
+#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
   if ((a&0xe700f9)==0xc00011||(a&0xff7ff9)==0xa07f11) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
-  if ((a&0xff4000)==0xa00000)  { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)d; return; } // Z80 ram
-  if ((a&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d); return; } // FM Sound
-  if ((a&0xffffe0)==0xa10000)  { // I/O ports
-    a=(a>>1)&0xf;
-    // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-    if(PicoOpt&0x20) {
-      if(a==1) {
-        Pico.m.padDelay[0] = 0;
-        if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
-      }
-      else if(a==2) {
-        Pico.m.padDelay[1] = 0;
-        if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
-      }
-    }
-    Pico.ioports[a]=(u8)d; // IO ports can be used as RAM
+  if ((a&0xff4000)==0xa00000) { // z80 RAM
+    SekCyclesBurn(2); // hack
+    if (!(Pico.m.z80Run&1) && !Pico.m.z80_reset) Pico.zram[a&0x1fff]=(u8)d;
+    else elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %02x @ %06x", a, d&0xff, SekPc);
     return;
   }
-  if (a==0xa11100) {
-    extern int z80startCycle, z80stopCycle;
-    //int lineCycles=(488-SekCyclesLeft)&0x1ff;
-    d&=1; d^=1;
-    if(!d) {
-      // this is for a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)
-      if (Pico.m.z80Run) {
-        int lineCycles=(488-SekCyclesLeft)&0x1ff;
-        z80stopCycle = SekCyclesDone();
-        lineCycles=(lineCycles>>1)-(lineCycles>>5);
-        z80_run(lineCycles);
-      }
-    } else {
-      z80startCycle = SekCyclesDone();
-      //if(Pico.m.scanline != -1)
-    }
-    dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);
-    Pico.m.z80Run=(u8)d; return;
-  }
+  if ((a&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=ym2612_write_local(a&3, d&0xff, 0)&1; return; } // FM Sound
+  if ((a&0xffffe0)==0xa10000)  { IoWrite8(a, d); return; } // I/O ports
+#endif
+  if (a==0xa11100)             { z80WriteBusReq(d); return; }
   if (a==0xa11200) {
-    dprintf("write z80Reset: %02x", d);
-    if(!(d&1)) z80_reset();
+    elprintf(EL_BUSREQ, "write z80Reset: %02x", d);
+    if (!(d&0x1)) { Pico.m.z80_reset = 1; Pico.m.z80Run = 0; YM2612ResetChip(); }
+    else if (Pico.m.z80_reset) {
+      Pico.m.z80_reset = 0;
+      YM2612ResetChip();
+      z80_reset();
+      timers_reset();
+    }
     return;
   }
-
+#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
   if ((a&0xff7f00)==0xa06000) // Z80 BANK register
   {
     Pico.m.z80_bank68k>>=1;
     Pico.m.z80_bank68k|=(d&1)<<8;
     Pico.m.z80_bank68k&=0x1ff; // 9 bits and filled in the new top one
+    elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k<<15);
     return;
   }
-
+#endif
   if ((a&0xe700e0)==0xc00000) {
+    d&=0xff;
     PicoVideoWrite(a,(u16)(d|(d<<8))); // Byte access gets mirrored
     return;
   }
 
-  OtherWrite8End(a, d, realsize);
+  PicoWrite8Hook(a, d&0xff, 8);
 }
 
 
@@ -195,30 +200,50 @@ static
 #endif
 void OtherWrite16(u32 a,u32 d)
 {
-  if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; }
-  if ((a&0xff4000)==0xa00000) { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); return; } // Z80 ram (MSB only)
+  if (a==0xa11100)            { z80WriteBusReq(d>>8); return; }
+  if ((a&0xffffe0)==0xa10000) { IoWrite8(a, d); return; } // I/O ports
+  if ((a&0xe700f8)==0xc00010||(a&0xff7ff8)==0xa07f10) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
+  if ((a&0xff6000)==0xa04000) { if(PicoOpt&1) emustatus|=ym2612_write_local(a&3, d&0xff, 0)&1; return; } // FM Sound
+  if ((a&0xff4000)==0xa00000) { // Z80 ram (MSB only)
+    if (!(Pico.m.z80Run&1) && !Pico.m.z80_reset) Pico.zram[a&0x1fff]=(u8)(d>>8);
+    else elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %04x @ %06x", a, d&0xffff, SekPc);
+    return;
+  }
+  if (a==0xa11200) {
+    elprintf(EL_BUSREQ, "write z80reset: %04x", d);
+    if (!(d&0x100)) { Pico.m.z80_reset = 1; Pico.m.z80Run = 0; YM2612ResetChip(); }
+    else if (Pico.m.z80_reset) {
+      Pico.m.z80_reset = 0;
+      YM2612ResetChip();
+      z80_reset();
+      timers_reset();
+    }
+    return;
+  }
+  if ((a&0xff7f00)==0xa06000) // Z80 BANK register
+  {
+    Pico.m.z80_bank68k>>=1;
+    Pico.m.z80_bank68k|=(d&1)<<8;
+    Pico.m.z80_bank68k&=0x1ff; // 9 bits and filled in the new top one
+    elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k<<15);
+    return;
+  }
 
-  if ((a&0xffffe0)==0xa10000) { // I/O ports
-    a=(a>>1)&0xf;
-    // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-    if(PicoOpt&0x20) {
-      if(a==1) {
-        Pico.m.padDelay[0] = 0;
-        if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
-      }
-      else if(a==2) {
-        Pico.m.padDelay[1] = 0;
-        if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
-      }
+#ifndef _CD_MEMORY_C
+  if (a >= SRam.start && a <= SRam.end) {
+    elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d, SekPc);
+    if ((Pico.m.sram_reg&0x16)==0x10) { // detected, not EEPROM, write not disabled
+      u8 *pm=(u8 *)(SRam.data-SRam.start+a);
+      *pm++=d>>8;
+      *pm++=d;
+      SRam.changed = 1;
     }
-    Pico.ioports[a]=(u8)d; // IO ports can be used as RAM
+    else
+      SRAMWrite(a, d);
     return;
   }
-  if (a==0xa11100) { OtherWrite8(a, d>>8, 16); return; }
-  if (a==0xa11200) { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
+#endif
 
-  OtherWrite8(a,  d>>8, 16);
-  OtherWrite8(a+1,d&0xff, 16);
+  PicoWrite16Hook(a, d&0xffff, 16);
 }
 
-