mcd, fix 68k interpreter idle detector for sub cpu

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 2957ca7..0a84f78 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -245,7 +245,7 @@ write_comm:
   }\r
   if (Pico_mcd->m.s68k_poll_a == (a & ~1))\r
   {\r
-    if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+    if (SekIsStoppedS68k()) {\r
       elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
       SekSetStopS68k(0);\r
     }\r

diff --git a/pico/sek.c b/pico/sek.c
index 9c54a03..b5649dc 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -404,7 +404,10 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
     (newop&0x200)?'n':'y', is_main68k?'m':'s', idledet_count);\r
 \r
   // XXX: probably shouldn't patch RAM too\r
-  v = m68k_read16_map[pc >> M68K_MEM_SHIFT];\r
+  if (is_main68k)\r
+    v = m68k_read16_map[pc >> M68K_MEM_SHIFT];\r
+  else\r
+    v = s68k_read16_map[pc >> M68K_MEM_SHIFT];\r
   if (~v & ~((uptr)-1LL >> 1)) // MSB clear?\r
     target = (u16 *)((v << 1) + pc);\r
   else {\r