X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoFrameHints.c;h=b5cef7d1b1c96dd25c11ca860a22672b1e0831b3;hb=9d917eea21607c7c239d4b0cd850d660c0c8e4c5;hp=e27484d4fb2ac461b3f467a188432b4c4b3675eb;hpb=69996cb7c62468cd97842e35bdd2b74006a28dba;p=picodrive.git

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index e27484d..b5cef7d 100644
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -3,6 +3,8 @@
 #define CYCLES_M68K_ASD      148
 #define CYCLES_Z80_LINE      228
 #define CYCLES_Z80_ASD        69
+#define CYCLES_S68K_LINE     795
+#define CYCLES_S68K_ASD      241
 
 // pad delay (for 6 button pads)
 #define PAD_DELAY \
@@ -15,26 +17,57 @@
 { \
   if ((PicoOpt&4) && Pico.m.z80Run) \
   { \
+    int cnt; \
     if (Pico.m.z80Run & 2) z80CycleAim += z80_cycles; \
     else { \
-      int cnt = SekCyclesDone() - z80startCycle; \
+      cnt = SekCyclesDone() - z80startCycle; \
       cnt = (cnt>>1)-(cnt>>5); \
-      if (cnt > (z80_cycles)) cnt = z80_cycles; \
+      if (cnt < 0 || cnt > (z80_cycles)) cnt = z80_cycles; \
       Pico.m.z80Run |= 2; \
       z80CycleAim+=cnt; \
     } \
-    total_z80+=z80_run(z80CycleAim-total_z80); \
+    cnt=z80CycleAim-total_z80; \
+    if (cnt > 0) total_z80+=z80_run(cnt); \
   } \
 }
 
+// CPUS_RUN
+#ifndef PICO_CD
+#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \
+    SekRunM68k(m68k_cycles); \
+    Z80_RUN(z80_cycles);
+#else
+#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \
+{ \
+    if ((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) { \
+      SekRunPS(m68k_cycles, s68k_cycles); /* "better/perfect sync" */ \
+    } else { \
+      SekRunM68k(m68k_cycles); \
+      if ((Pico_mcd->m.busreq&3) == 1) /* no busreq/no reset */ \
+        SekRunS68k(s68k_cycles); \
+    } \
+    Z80_RUN(z80_cycles); \
+}
+#endif
+
 // Accurate but slower frame which does hints
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
-  int total_z80=0,lines,y,lines_vis = 224,z80CycleAim = 0,line_sample;
-  int skip=PicoSkipFrame || (PicoOpt&0x10);
+  int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip;
   int hint; // Hint counter
 
+  if ((PicoOpt&0x10) && !PicoSkipFrame) {
+    // draw a frame just after vblank in alternative render mode
+    // yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
+    PicoFrameFull();
+#ifdef DRAW_FINISH_FUNC
+    DRAW_FINISH_FUNC();
+#endif
+    skip = 1;
+  }
+  else skip=PicoSkipFrame;
+
   if (Pico.m.pal) {
     //cycles_68k = (int) ((double) OSC_PAL  /  7 / 50 / 312 + 0.4); // should compile to a constant (488)
     //cycles_z80 = (int) ((double) OSC_PAL  / 15 / 50 / 312 + 0.4); // 228
@@ -47,6 +80,9 @@ static int PicoFrameHints(void)
   }
 
   SekCyclesReset();
+#ifdef PICO_CD
+  SekCyclesResetS68k();
+#endif
 
   pv->status&=~0x88; // clear V-Int, come out of vblank
 
@@ -54,8 +90,9 @@ static int PicoFrameHints(void)
   //dprintf("-hint: %i", hint);
 
   // This is to make active scan longer (needed for Double Dragon 2, mainly)
-  SekRun(CYCLES_M68K_ASD);
-  Z80_RUN(CYCLES_Z80_ASD);
+  // also trying to adjust for z80 overclock here (due to int line cycle counts)
+  z80CycleAim = Pico.m.pal ? -40 : 7;
+  CPUS_RUN(CYCLES_M68K_ASD, 0, CYCLES_S68K_ASD);
 
   for (y=0;y<lines_vis;y++)
   {
@@ -69,6 +106,9 @@ static int PicoFrameHints(void)
     }
 
     PAD_DELAY
+#ifdef PICO_CD
+    check_cd_dma();
+#endif
 
     // H-Interrupts:
     if (--hint < 0) // y <= lines_vis: Comix Zone, Golden Axe
@@ -90,20 +130,30 @@ static int PicoFrameHints(void)
       PicoLine(y);
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
+#ifndef PICO_CD
     // get samples from sound chips
     if(y == 32 && PsndOut)
       emustatus &= ~1;
     else if((y == 224 || y == line_sample) && PsndOut)
       getSamples(y);
+#endif
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
-    SekRun(CYCLES_M68K_LINE);
-    Z80_RUN(CYCLES_Z80_LINE);
+    CPUS_RUN(CYCLES_M68K_LINE, CYCLES_Z80_LINE, CYCLES_S68K_LINE);
+
+#ifdef PICO_CD
+    update_chips();
+#endif
   }
 
+#ifdef DRAW_FINISH_FUNC
+  if (!skip)
+    DRAW_FINISH_FUNC();
+#endif
+
   // V-int line (224 or 240)
   Pico.m.scanline=(short)y;
 
@@ -112,6 +162,9 @@ static int PicoFrameHints(void)
   Pico.video.status|=0x200;
 
   PAD_DELAY
+#ifdef PICO_CD
+  check_cd_dma();
+#endif
 
   // Last H-Int:
   if (--hint < 0)
@@ -130,7 +183,7 @@ 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)
-  SekRun(CYCLES_M68K_VINT_LAG);
+  SekRunM68k(CYCLES_M68K_VINT_LAG);
   if (pv->reg[1]&0x20) {
     elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
     SekInterrupt(6);
@@ -139,16 +192,23 @@ static int PicoFrameHints(void)
     z80_int();
 
   if (PicoOpt&1)
-    sound_timers_and_dac(y);
+    Psnd_timers_and_dac(y);
 
   // get samples from sound chips
-  if ((y == 224) && PsndOut)
-    getSamples(y);
+#ifndef PICO_CD
+  if (y == 224)
+#endif
+    if (PsndOut)
+      getSamples(y);
 
   // Run scanline:
   if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
-  SekRun(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD);
-  Z80_RUN(CYCLES_Z80_LINE - CYCLES_Z80_ASD);
+  CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD,
+    CYCLES_Z80_LINE - CYCLES_Z80_ASD, CYCLES_S68K_LINE - CYCLES_S68K_ASD);
+
+#ifdef PICO_CD
+    update_chips();
+#endif
 
   // PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
   lines = Pico.m.pal ? 312 : 262;
@@ -158,23 +218,26 @@ static int PicoFrameHints(void)
     Pico.m.scanline=(short)y;
 
     PAD_DELAY
+#ifdef PICO_CD
+    check_cd_dma();
+#endif
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
-    SekRun(CYCLES_M68K_LINE);
-    Z80_RUN(CYCLES_Z80_LINE);
-  }
+    CPUS_RUN(CYCLES_M68K_LINE, CYCLES_Z80_LINE, CYCLES_S68K_LINE);
 
-  // draw a frame just after vblank in alternative render mode
-  if (!PicoSkipFrame && (PicoOpt&0x10))
-    PicoFrameFull();
+#ifdef PICO_CD
+    update_chips();
+#endif
+  }
 
   return 0;
 }
 
 #undef PAD_DELAY
 #undef Z80_RUN
+#undef CPUS_RUN