eliminate texrels (wip)

[picodrive.git] / pico / pico_cmn.c

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index af696e5..70d7807 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -39,7 +39,7 @@ static void SekSyncM68k(void)
 #elif defined(EMU_M68K)
     SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
 #elif defined(EMU_F68K)
-    SekCycleCnt += fm68k_emulate(cyc_do, 0, 0) - cyc_do;
+    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
 #endif
   }
 
@@ -50,7 +50,7 @@ static void SekSyncM68k(void)
   pprof_end(m68k);
 }
 
-static inline void SekRunM68k(int cyc)
+static INLINE void SekRunM68k(int cyc)
 {
   SekCycleAim += cyc;
   SekSyncM68k();
@@ -148,7 +148,8 @@ static int PicoFrameHints(void)
       if (ym2612.dacen && PsndDacLine <= y)
         PsndDoDAC(y);
 #ifdef PICO_CD
-      pcd_sync_s68k(cycles, 0);
+      if (PicoAHW & PAHW_MCD)
+        pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
       p32x_sync_sh2s(cycles);
@@ -157,6 +158,7 @@ static int PicoFrameHints(void)
     }
 
     // Run scanline:
+    line_base_cycles = SekCyclesDone();
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
     CPUS_RUN(CYCLES_M68K_LINE);
 
@@ -166,7 +168,7 @@ static int PicoFrameHints(void)
 
   if (!skip)
   {
-    if (DrawScanline < y)
+    if (Pico.est.DrawScanline < y)
       PicoDrawSync(y - 1, 0);
 #ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();
@@ -201,6 +203,8 @@ static int PicoFrameHints(void)
   // 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)
   // also delay between last H-int and V-int (Golden Axe 3)
+  line_base_cycles = SekCyclesDone();
+  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
   CPUS_RUN(CYCLES_M68K_VINT_LAG);
 
   if (pv->reg[1]&0x20) {
@@ -216,7 +220,8 @@ static int PicoFrameHints(void)
   }
 
 #ifdef PICO_CD
-  pcd_sync_s68k(cycles, 0);
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
   p32x_sync_sh2s(cycles);
@@ -232,7 +237,6 @@ static int PicoFrameHints(void)
   }
 
   // Run scanline:
-  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
   CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD);
 
   if (PicoLineHook) PicoLineHook();
@@ -253,6 +257,7 @@ static int PicoFrameHints(void)
     PAD_DELAY();
 
     // Run scanline:
+    line_base_cycles = SekCyclesDone();
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
     CPUS_RUN(CYCLES_M68K_LINE);
 
@@ -268,7 +273,8 @@ static int PicoFrameHints(void)
     PsndDoDAC(lines-1);
 
 #ifdef PICO_CD
-  pcd_sync_s68k(cycles, 0);
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
   p32x_sync_sh2s(cycles);