From: notaz <notasas@gmail.com>
Date: Tue, 2 Jul 2013 00:02:53 +0000 (+0300)
Subject: 32x: fix lockstep code
X-Git-Tag: v1.85~66
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d025f8ad02a4b890f3a194f277628e5c4332044;p=picodrive.git

32x: fix lockstep code
---

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 6217d2d6..4e036000 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -254,21 +254,21 @@ p32x_poll_event(3, 0);
 #define STEP_68K 24
 #define CPUS_RUN_LOCKSTEP(m68k_cycles,s68k_cycles) \
 { \
-  int i; \
-  for (i = 0; i <= (m68k_cycles) - STEP_68K; i += STEP_68K) { \
+  int slice; \
+  SekCycleAim += m68k_cycles; \
+  while (SekCycleCnt < SekCycleAim) { \
+    slice = SekCycleCnt; \
     run_m68k(STEP_68K); \
-    if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
-      sh2_execute(&msh2, CYCLES_M68K2SH2(STEP_68K)); \
-    if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
-      sh2_execute(&ssh2, CYCLES_M68K2SH2(STEP_68K)); \
+    if (!(Pico32x.regs[0] & P32XS_nRES)) \
+      continue; /* SH2s reseting */ \
+    slice = SekCycleCnt - slice; /* real count from 68k */ \
+    if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) { \
+      sh2_execute(&ssh2, CYCLES_M68K2SSH2(slice)); \
+    } \
+    if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) { \
+      sh2_execute(&msh2, CYCLES_M68K2MSH2(slice)); \
+    } \
   } \
-  /* last step */ \
-  i = (m68k_cycles) - i; \
-  run_m68k(i); \
-  if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
-    sh2_execute(&msh2, CYCLES_M68K2SH2(i)); \
-  if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
-    sh2_execute(&ssh2, CYCLES_M68K2SH2(i)); \
 }
 
 #define CPUS_RUN CPUS_RUN_SIMPLE