X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemoryCmn.c;h=b49eaf2b426af0678e80bb91e98b94e4165c4164;hb=9dc09829192f73f5d0502c8b312a39863bca60d3;hp=b93ac699412231e59034375a266a320f16c31daa;hpb=e5503e2f4fe1c7ccc46c493a1596fb0e416f678e;p=picodrive.git

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index b93ac69..b49eaf2 100644
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -52,14 +52,17 @@ static
 u32 z80ReadBusReq(void)
 {
   u32 d=Pico.m.z80Run&1;
-  if (!d) {
+  if (!d && Pico.m.scanline != -1) {
     // needed by buggy Terminator (Sega CD)
     int stop_before = SekCyclesDone() - z80stopCycle;
-    dprintf("stop before: %i", stop_before);
-    if (stop_before > 0 && stop_before <= 32) // Gens uses 16 here
+    //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
   }
   // |=0x80 for Shadow of the Beast & Super Offroad
+  elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d|0x80, SekCyclesDone(), SekPc);
   return d|0x80;
 }
 
@@ -69,25 +72,30 @@ static
 void z80WriteBusReq(u32 d)
 {
   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;
-      z80stopCycle = SekCyclesDone();
-      if (Pico.m.z80Run&2)
-           lineCycles=(488-SekCyclesLeft)&0x1ff;
-      else lineCycles=z80stopCycle-z80startCycle; // z80 was started at current line
-      if (lineCycles > 0 && lineCycles <= 488) {
-        dprintf("zrun: %i/%i cycles", lineCycles, (lineCycles>>1)-(lineCycles>>5));
-        lineCycles=(lineCycles>>1)-(lineCycles>>5);
-        z80_run(lineCycles);
+  {
+    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;
+        z80stopCycle = SekCyclesDone();
+        if ((Pico.m.z80Run&2) && Pico.m.scanline != -1)
+             lineCycles=(488-SekCyclesLeft)&0x1ff;
+        else lineCycles=z80stopCycle-z80startCycle; // z80 was started at current line
+        if (lineCycles > 0) { // && lineCycles <= 488) {
+          //dprintf("zrun: %i/%i cycles", lineCycles, (lineCycles>>1)-(lineCycles>>5));
+          lineCycles=(lineCycles>>1)-(lineCycles>>5);
+          z80_run_nr(lineCycles);
+        }
       }
+    } else {
+      if (!Pico.m.z80Run)
+        z80startCycle = SekCyclesDone();
+      else
+        d|=Pico.m.z80Run;
     }
-  } else {
-    z80startCycle = SekCyclesDone();
-    //if(Pico.m.scanline != -1)
   }
-  dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);
+  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
   Pico.m.z80Run=(u8)d;
 }
 
@@ -110,10 +118,9 @@ u32 OtherRead16(u32 a, int realsize)
     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=(z80ReadBusReq()<<8)|Pico.m.rotate++;
-    dprintf("get_zrun: %04x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), SekPc);
     goto end;
   }
 
@@ -122,17 +129,13 @@ u32 OtherRead16(u32 a, int realsize)
     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);
+      elprintf(EL_YM2612R, "read ym2612: %02x", d);
       goto end;
     }
     d=0xffff;
     goto end;
   }
 
-#ifndef _ASM_MEMORY_C
-  if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
-#endif
-
   d = OtherRead16End(a, realsize);
 
 end:
@@ -161,19 +164,19 @@ static
 #endif
 void OtherWrite8(u32 a,u32 d)
 {
-#ifndef _ASM_MEMORY_C
+#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&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d)&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);
+    elprintf(EL_BUSREQ, "write z80Reset: %02x", d);
     if(!(d&1)) z80_reset();
     return;
   }
-#ifndef _ASM_MEMORY_C
+#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
   if ((a&0xff7f00)==0xa06000) // Z80 BANK register
   {
     Pico.m.z80_bank68k>>=1;
@@ -183,6 +186,7 @@ void OtherWrite8(u32 a,u32 d)
   }
 #endif
   if ((a&0xe700e0)==0xc00000) {
+    d&=0xff;
     PicoVideoWrite(a,(u16)(d|(d<<8))); // Byte access gets mirrored
     return;
   }
@@ -196,13 +200,12 @@ static
 #endif
 void OtherWrite16(u32 a,u32 d)
 {
-  if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; }
   if (a==0xa11100)            { z80WriteBusReq(d>>8); return; }
   if (a==0xa11200)            { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
   if ((a&0xffffe0)==0xa10000) { IoWrite8(a, d); return; } // I/O ports
   if ((a&0xff4000)==0xa00000) { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); return; } // Z80 ram (MSB only)
   if ((a&0xe700f8)==0xc00010||(a&0xff7ff8)==0xa07f10) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
-  if ((a&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d); return; } // FM Sound (??)
+  if ((a&0xff6000)==0xa04000)  { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d)&1; return; } // FM Sound (??)
   if ((a&0xff7f00)==0xa06000) // Z80 BANK register
   {
     Pico.m.z80_bank68k>>=1;
@@ -211,8 +214,23 @@ void OtherWrite16(u32 a,u32 d)
     return;
   }
 
+#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;
+    }
+    else
+      SRAMWrite(a, d);
+    return;
+  }
+#else
   OtherWrite8End(a,  d>>8, 16);
   OtherWrite8End(a+1,d&0xff, 16);
+#endif
 }