handle dbra wait loops, update cyclone

[picodrive.git] / pico / cd / memory.c

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 4b4c18f..47553f5 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -70,14 +70,15 @@ static void remap_word_ram(u32 r3);
 \r
 // poller detection\r
 #define POLL_LIMIT 16\r
-#define POLL_CYCLES 124\r
+#define POLL_CYCLES 64\r
 \r
 void m68k_comm_check(u32 a)\r
 {\r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
-  if (a != Pico_mcd->m.m68k_poll_a) {\r
+  if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {\r
     Pico_mcd->m.m68k_poll_a = a;\r
     Pico_mcd->m.m68k_poll_cnt = 0;\r
+    SekNotPolling = 0;\r
     return;\r
   }\r
   Pico_mcd->m.m68k_poll_cnt++;\r
@@ -143,9 +144,6 @@ void m68k_reg_write8(u32 a, u32 d)
   u32 dold;\r
   a &= 0x3f;\r
 \r
-  Pico_mcd->m.m68k_poll_a =\r
-  Pico_mcd->m.m68k_poll_cnt = 0;\r
-\r
   switch (a) {\r
     case 0:\r
       d &= 1;\r
@@ -230,18 +228,17 @@ write_comm:
   if (d == Pico_mcd->s68k_regs[a])\r
     return;\r
 \r
-  Pico_mcd->s68k_regs[a] = d;\r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
-  if (Pico_mcd->m.s68k_poll_a == a && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+  Pico_mcd->s68k_regs[a] = d;\r
+  if (Pico_mcd->m.s68k_poll_a == (a & ~1)\r
+      && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)\r
+  {\r
     SekSetStopS68k(0);\r
     Pico_mcd->m.s68k_poll_a = 0;\r
     elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
   }\r
 }\r
 \r
-#ifndef _ASM_CD_MEMORY_C\r
-static\r
-#endif\r
 u32 s68k_poll_detect(u32 a, u32 d)\r
 {\r
 #ifdef USE_POLL_DETECT\r
@@ -250,7 +247,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
     return d;\r
 \r
   cycles = SekCyclesDoneS68k();\r
-  if (a == Pico_mcd->m.s68k_poll_a) {\r
+  if (!SekNotPolling && a == Pico_mcd->m.s68k_poll_a) {\r
     u32 clkdiff = cycles - Pico_mcd->m.s68k_poll_clk;\r
     if (clkdiff <= POLL_CYCLES) {\r
       cnt = Pico_mcd->m.s68k_poll_cnt + 1;\r
@@ -265,6 +262,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
   Pico_mcd->m.s68k_poll_a = a;\r
   Pico_mcd->m.s68k_poll_clk = cycles;\r
   Pico_mcd->m.s68k_poll_cnt = cnt;\r
+  SekNotPollingS68k = 0;\r
 #endif\r
   return d;\r
 }\r
@@ -555,12 +553,14 @@ static void PicoWriteM68k8_ramc(u32 a, u32 d)
     return;\r
   }\r
 \r
-  elprintf(EL_UIO, "m68k unmapped w8  [%06x]   %02x @%06x", a, d & 0xff, SekPc);\r
+  elprintf(EL_UIO, "m68k unmapped w8  [%06x]   %02x @%06x",\r
+    a, d & 0xff, SekPc);\r
 }\r
 \r
 static void PicoWriteM68k16_ramc(u32 a, u32 d)\r
 {\r
-  elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
+  elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x",\r
+    a, d, SekPcS68k);\r
   PicoWriteM68k8_ramc(a + 1, d);\r
 }\r
 \r
@@ -574,7 +574,8 @@ static u32 PicoReadM68k8_io(u32 a)
     if (!(a & 1))\r
       d >>= 8;\r
     d &= 0xff;\r
-    elprintf(EL_CDREGS, "m68k_regs r8:  [%02x]   %02x @%06x", a & 0x3f, d, SekPc);\r
+    elprintf(EL_CDREGS, "m68k_regs r8:  [%02x]   %02x @%06x",\r
+      a & 0x3f, d, SekPc);\r
     return d;\r
   }\r
 \r
@@ -587,7 +588,8 @@ static u32 PicoReadM68k16_io(u32 a)
   u32 d;\r
   if ((a & 0xff00) == 0x2000) {\r
     d = m68k_reg_read16(a);\r
-    elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x", a & 0x3f, d, SekPc);\r
+    elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x",\r
+      a & 0x3f, d, SekPc);\r
     return d;\r
   }\r
 \r
@@ -597,7 +599,8 @@ static u32 PicoReadM68k16_io(u32 a)
 static void PicoWriteM68k8_io(u32 a, u32 d)\r
 {\r
   if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
-    elprintf(EL_CDREGS, "m68k_regs w8:  [%02x]   %02x @%06x", a&0x3f, d, SekPc);\r
+    elprintf(EL_CDREGS, "m68k_regs w8:  [%02x]   %02x @%06x",\r
+      a & 0x3f, d, SekPc);\r
     m68k_reg_write8(a, d);\r
     return;\r
   }\r
@@ -608,7 +611,8 @@ static void PicoWriteM68k8_io(u32 a, u32 d)
 static void PicoWriteM68k16_io(u32 a, u32 d)\r
 {\r
   if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
-    elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
+    elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
+      a & 0x3f, d, SekPc);\r
 \r
     m68k_reg_write8(a,     d >> 8);\r
     if ((a & 0x3e) != 0x0e) // special case\r
@@ -638,12 +642,14 @@ static u32 s68k_unmapped_read16(u32 a)
 \r
 static void s68k_unmapped_write8(u32 a, u32 d)\r
 {\r
-  elprintf(EL_UIO, "s68k unmapped w8  [%06x]   %02x @%06x", a, d & 0xff, SekPc);\r
+  elprintf(EL_UIO, "s68k unmapped w8  [%06x]   %02x @%06x",\r
+    a, d & 0xff, SekPc);\r
 }\r
 \r
 static void s68k_unmapped_write16(u32 a, u32 d)\r
 {\r
-  elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);\r
+  elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x",\r
+    a, d & 0xffff, SekPc);\r
 }\r
 \r
 // PRG RAM protected range (000000 - 01fdff)?\r
@@ -807,7 +813,7 @@ static u32 PicoReadS68k8_pr(u32 a)
     a &= 0x1ff;\r
     if (a >= 0x0e && a < 0x30) {\r
       d = Pico_mcd->s68k_regs[a];\r
-      s68k_poll_detect(a, d);\r
+      s68k_poll_detect(a & ~1, d);\r
       goto regs_done;\r
     }\r
     else if (a >= 0x58 && a < 0x68)\r