X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=436f545325edf24c967005639ce32a71e0a7e9b3;hb=3162a7104cbb9c1046a3d780dfc74bbc684bdc5b;hp=0907696af541f2e1a96515dc0252f7d05f790a05;hpb=5d638db094e6677240fb4766f2168c7b0791b677;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index 0907696..436f545 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -331,22 +331,21 @@ NOINLINE void io_ports_write(u32 a, u32 d)
   Pico.ioports[a] = d;
 }
 
-// lame..
 static int z80_cycles_from_68k(void)
 {
-  return z80_cycle_aim
-    + cycles_68k_to_z80(SekCyclesDone() - last_z80_sync);
+  int m68k_cnt = SekCyclesDone() - timing.m68c_frame_start;
+  return cycles_68k_to_z80(m68k_cnt);
 }
 
 void NOINLINE ctl_write_z80busreq(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%u] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80Run)
   {
     if (d)
     {
-      z80_cycle_cnt = z80_cycles_from_68k();
+      timing.z80c_cnt = z80_cycles_from_68k() + 2;
     }
     else
     {
@@ -363,7 +362,7 @@ void NOINLINE ctl_write_z80busreq(u32 d)
 void NOINLINE ctl_write_z80reset(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%u] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80_reset)
   {
     if (d)
@@ -378,7 +377,7 @@ void NOINLINE ctl_write_z80reset(u32 d)
     }
     else
     {
-      z80_cycle_cnt = z80_cycles_from_68k();
+      timing.z80c_cnt = z80_cycles_from_68k() + 2;
       z80_reset();
     }
     Pico.m.z80_reset = d;
@@ -539,7 +538,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
 
   if ((a & 0x4000) == 0x0000) { // z80 RAM
-    SekCyclesBurnRun(2); // FIXME hack
     Pico.zram[a & 0x1fff] = (u8)d;
     return;
   }
@@ -594,7 +592,7 @@ u32 PicoRead8_io(u32 a)
 
     if ((a & 0xff01) == 0x1100) { // z80 busreq (verified)
       d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1;
-      elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
@@ -629,7 +627,7 @@ u32 PicoRead16_io(u32 a)
 
     if ((a & 0xff00) == 0x1100) { // z80 busreq
       d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8;
-      elprintf(EL_BUSREQ, "get_zrun: %04x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
@@ -703,10 +701,21 @@ void PicoWrite16_io(u32 a, u32 d)
 
 // VDP area (0xc00000 - 0xdfffff)
 // TODO: verify if lower byte goes to PSG on word writes
-static u32 PicoRead8_vdp(u32 a)
+u32 PicoRead8_vdp(u32 a)
 {
-  if ((a & 0x00e0) == 0x0000)
-    return PicoVideoRead8(a);
+  if ((a & 0x00f0) == 0x0000) {
+    switch (a & 0x0d)
+    {
+      case 0x00: return PicoVideoRead8DataH();
+      case 0x01: return PicoVideoRead8DataL();
+      case 0x04: return PicoVideoRead8CtlH();
+      case 0x05: return PicoVideoRead8CtlL();
+      case 0x08:
+      case 0x0c: return PicoVideoRead8HV_H();
+      case 0x09:
+      case 0x0d: return PicoVideoRead8HV_L();
+    }
+  }
 
   elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc);
   return 0;
@@ -886,10 +895,11 @@ static void m68k_mem_setup(void)
 static int get_scanline(int is_from_z80)
 {
   if (is_from_z80) {
-    int cycles = z80_cyclesDone();
-    while (cycles - z80_scanline_cycles >= 228)
-      z80_scanline++, z80_scanline_cycles += 228;
-    return z80_scanline;
+    int mclk_z80 = z80_cyclesDone() * 15;
+    int mclk_line = timing.z80_scanline * 488 * 7;
+    while (mclk_z80 - mclk_line >= 488 * 7)
+      timing.z80_scanline++, mclk_line += 488 * 7;
+    return timing.z80_scanline;
   }
 
   return Pico.m.scanline;
@@ -1184,8 +1194,21 @@ void PicoWrite16_32x(u32 a, u32 d) {}
 
 static unsigned char z80_md_vdp_read(unsigned short a)
 {
-  if ((a & 0x00e0) == 0x0000)
-    return PicoVideoRead8(a); // FIXME: depends on 68k cycles
+  z80_subCLeft(2);
+
+  if ((a & 0x00f0) == 0x0000) {
+    switch (a & 0x0d)
+    {
+      case 0x00: return PicoVideoRead8DataH();
+      case 0x01: return PicoVideoRead8DataL();
+      case 0x04: return PicoVideoRead8CtlH();
+      case 0x05: return PicoVideoRead8CtlL();
+      case 0x08:
+      case 0x0c: return get_scanline(1); // FIXME: make it proper
+      case 0x09:
+      case 0x0d: return Pico.m.rotate++;
+    }
+  }
 
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
   return 0xff;
@@ -1196,8 +1219,10 @@ static unsigned char z80_md_bank_read(unsigned short a)
   unsigned int addr68k;
   unsigned char ret;
 
-  addr68k = Pico.m.z80_bank68k<<15;
-  addr68k += a & 0x7fff;
+  z80_subCLeft(3);
+
+  addr68k = Pico.m.z80_bank68k << 15;
+  addr68k |= a & 0x7fff;
 
   ret = m68k_read8(addr68k);