SVP stubs

[picodrive.git] / Pico / MemoryCmn.c

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index f31a11e..422ae2e 100644 (file)
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -72,9 +72,9 @@ static
 void z80WriteBusReq(u32 d)
 {
   d&=1; d^=1;
-  //if (Pico.m.scanline != -1)
   {
-    if(!d) {
+    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;
@@ -85,7 +85,7 @@ void z80WriteBusReq(u32 d)
         if (lineCycles > 0) { // && lineCycles <= 488) {
           //dprintf("zrun: %i/%i cycles", lineCycles, (lineCycles>>1)-(lineCycles>>5));
           lineCycles=(lineCycles>>1)-(lineCycles>>5);
-          z80_run(lineCycles);
+          z80_run_nr(lineCycles);
         }
       }
     } else {
@@ -136,11 +136,7 @@ u32 OtherRead16(u32 a, int realsize)
     goto end;
   }
 
-#ifndef _ASM_MEMORY_C
-  if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
-#endif
-
-  d = OtherRead16End(a, realsize);
+  d = PicoRead16Hook(a, realsize);
 
 end:
   return d;
@@ -195,7 +191,7 @@ void OtherWrite8(u32 a,u32 d)
     return;
   }
 
-  OtherWrite8End(a, d, 8);
+  PicoWrite8Hook(a, d, 8);
 }
 
 
@@ -204,9 +200,8 @@ 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==0xa11200)            { elprintf(EL_BUSREQ, "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
@@ -222,7 +217,7 @@ void OtherWrite16(u32 a,u32 d)
 #ifndef _CD_MEMORY_C
   if (a >= SRam.start && a <= SRam.end) {
     elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d, SekPc);
-    if ((a&0x16)==0x10) { // detected, not EEPROM, write not disabled
+    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;
@@ -232,10 +227,10 @@ void OtherWrite16(u32 a,u32 d)
       SRAMWrite(a, d);
     return;
   }
-#else
-  OtherWrite8End(a,  d>>8, 16);
-  OtherWrite8End(a+1,d&0xff, 16);
 #endif
+
+  PicoWrite8Hook(a,  d>>8, 16);
+  PicoWrite8Hook(a+1,d&0xff, 16);
 }