X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmcd.c;h=6d23604cdef4e9eda56646f8f59e7fcf456286d8;hb=e42a47e2086e6512519dd86af420363498302f49;hp=a20b01dc4aa2656464eece9c1588540f4f99ba12;hpb=7b3ddc11dc21025f2a64116d664c745c07c54984;p=picodrive.git

diff --git a/pico/cd/mcd.c b/pico/cd/mcd.c
index a20b01d..6d23604 100644
--- a/pico/cd/mcd.c
+++ b/pico/cd/mcd.c
@@ -90,7 +90,32 @@ PICO_INTERNAL int PicoResetMCD(void)
   return 0;
 }
 
-static __inline void SekRunS68k(unsigned int to)
+static void SekRunM68kOnce(void)
+{
+  int cyc_do;
+  pevt_log_m68k_o(EVT_RUN_START);
+
+  if ((cyc_do = SekCycleAim - SekCycleCnt) > 0) {
+    SekCycleCnt += cyc_do;
+
+#if defined(EMU_C68K)
+    PicoCpuCM68k.cycles = cyc_do;
+    CycloneRun(&PicoCpuCM68k);
+    SekCycleCnt -= PicoCpuCM68k.cycles;
+#elif defined(EMU_M68K)
+    SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
+#elif defined(EMU_F68K)
+    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
+#endif
+  }
+
+  SekCyclesLeft = 0;
+
+  SekTrace(0);
+  pevt_log_m68k_o(EVT_RUN_END);
+}
+
+static void SekRunS68k(unsigned int to)
 {
   int cyc_do;
 
@@ -121,7 +146,7 @@ static void pcd_set_cycle_mult(void)
 {
   // ~1.63 for NTSC, ~1.645 for PAL
   if (Pico.m.pal)
-    mcd_m68k_cycle_mult = ((12500000ull << 16) / (50*312*488));
+    mcd_m68k_cycle_mult = ((12500000ull << 16) / (50*313*488));
   else
     mcd_m68k_cycle_mult = ((12500000ull << 16) / (60*262*488)) + 1;
 }
@@ -305,7 +330,13 @@ void pcd_run_cpus_normal(int m68k_cycles)
     SekCycleCnt = SekCycleAim - (s68k_left * 40220 >> 16);
   }
 
-  SekSyncM68k();
+  while (CYCLES_GT(SekCycleAim, SekCycleCnt)) {
+    SekRunM68kOnce();
+    if (Pico_mcd->m.need_sync) {
+      Pico_mcd->m.need_sync = 0;
+      pcd_sync_s68k(SekCycleCnt, 0);
+    }
+  }
 }
 
 void pcd_run_cpus_lockstep(int m68k_cycles)