32x: rework scheduling/timing

[picodrive.git] / pico / pico_cmn.c

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index 8499f93..12f649f 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -26,6 +26,29 @@
   SekRunM68k(m68k_cycles)
 #endif
 
+static __inline void SekRunM68k(int cyc)
+{
+  int cyc_do;
+  pprof_start(m68k);
+
+  SekCycleAim+=cyc;
+  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+  // this means we do run-compare
+  SekCycleCnt+=CM_compareRun(cyc_do, 0);
+#elif defined(EMU_C68K)
+  PicoCpuCM68k.cycles=cyc_do;
+  CycloneRun(&PicoCpuCM68k);
+  SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
+#elif defined(EMU_M68K)
+  SekCycleCnt+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
+#endif
+
+  pprof_end(m68k);
+}
+
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
@@ -88,9 +111,6 @@ static int PicoFrameHints(void)
 #ifdef PICO_CD
     check_cd_dma();
 #endif
-#ifdef PICO_32X
-    p32x_timers_do(1);
-#endif
 
     // H-Interrupts:
     if (--hint < 0) // y <= lines_vis: Comix Zone, Golden Axe
@@ -123,6 +143,9 @@ static int PicoFrameHints(void)
         PicoSyncZ80(SekCycleCnt);
       if (ym2612.dacen && PsndDacLine <= y)
         PsndDoDAC(y);
+#ifdef PICO_32X
+      p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+#endif
       PsndGetSamples(y);
     }
 
@@ -160,9 +183,6 @@ static int PicoFrameHints(void)
 #ifdef PICO_CD
   check_cd_dma();
 #endif
-#ifdef PICO_32X
-  p32x_timers_do(1);
-#endif
 
   // Last H-Int:
   if (--hint < 0)
@@ -176,10 +196,6 @@ static int PicoFrameHints(void)
   pv->status|=0x08; // go into vblank
   pv->pending_ints|=0x20;
 
-#ifdef PICO_32X
-  p32x_start_blank();
-#endif
-
   // the following SekRun is there for several reasons:
   // there must be a delay after vblank bit is set and irq is asserted (Mazin Saga)
   // also delay between F bit (bit 7) is set in SR and IRQ happens (Ex-Mutants)
@@ -196,6 +212,11 @@ static int PicoFrameHints(void)
     z80_int();
   }
 
+#ifdef PICO_32X
+  p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+  p32x_start_blank();
+#endif
+
   // get samples from sound chips
   if (y == 224 && PsndOut)
   {
@@ -231,9 +252,6 @@ static int PicoFrameHints(void)
 #ifdef PICO_CD
     check_cd_dma();
 #endif
-#ifdef PICO_32X
-    p32x_timers_do(1);
-#endif
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
@@ -252,6 +270,9 @@ static int PicoFrameHints(void)
   if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1)
     PsndDoDAC(lines-1);
 
+#ifdef PICO_32X
+  p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+#endif
   timers_cycle();
 
   return 0;