X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=f4e20d21f8f43077a5349b9df38c78d2d394d00d;hb=75a30842c4f9e7e95a199361b9348c9f9dede0e6;hp=368b4c8a66a6c00c6608ed9a66442492a1bb0d29;hpb=7b3f44c6b677a60b63b092f825a2b6c58166b70c;p=picodrive.git

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index 368b4c8..f4e20d2 100644
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -1,43 +1,66 @@
-// common code for Pico.c and cd/Pico.c
-// (c) Copyright 2007,2008 Grazvydas "notaz" Ignotas
+/*
+ * common code for pico.c and cd/pico.c
+ * (C) notaz, 2007-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #define CYCLES_M68K_LINE     488 // suitable for both PAL/NTSC
 #define CYCLES_M68K_VINT_LAG  68
 #define CYCLES_M68K_ASD      148
 #define CYCLES_S68K_LINE     795
+#define CYCLES_S68K_VINT_LAG 111
 #define CYCLES_S68K_ASD      241
 
 // pad delay (for 6 button pads)
-#define PAD_DELAY \
-  if (PicoOpt&POPT_6BTN_PAD) { \
-    if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0; \
-    if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \
-  }
+#define PAD_DELAY() { \
+  if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0; \
+  if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \
+}
 
 // CPUS_RUN
-#ifndef PICO_CD
-#define CPUS_RUN(m68k_cycles,s68k_cycles) \
-    SekRunM68k(m68k_cycles);
-#else
+#ifndef CPUS_RUN
 #define CPUS_RUN(m68k_cycles,s68k_cycles) \
-{ \
-    if ((PicoOpt&POPT_EN_MCD_PSYNC) && (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); \
-    } \
-}
+  SekRunM68k(m68k_cycles)
+#endif
+
+static __inline void SekRunM68k(int cyc)
+{
+  int cyc_do;
+  pprof_start(m68k);
+  pevt_log_m68k_o(EVT_RUN_START);
+
+  SekCycleAim+=cyc;
+  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0)
+    goto out;
+
+#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, 0, 0);
 #endif
 
-// Accurate but slower frame which does hints
+out:
+  SekTrace(0);
+  pevt_log_m68k_o(EVT_RUN_END);
+  pprof_end(m68k);
+}
+
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
   int lines, y, lines_vis = 224, line_sample, skip, vcnt_wrap;
   int hint; // Hint counter
 
+  pevt_log_m68k_o(EVT_FRAME_START);
   pv->v_counter = Pico.m.scanline = 0;
 
   if ((PicoOpt&POPT_ALT_RENDERER) && !PicoSkipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled
@@ -90,7 +113,7 @@ static int PicoFrameHints(void)
       Pico.video.status|=0x200;
     }
 
-    PAD_DELAY
+    PAD_DELAY();
 #ifdef PICO_CD
     check_cd_dma();
 #endif
@@ -126,6 +149,9 @@ static int PicoFrameHints(void)
         PicoSyncZ80(SekCycleCnt);
       if (ym2612.dacen && PsndDacLine <= y)
         PsndDoDAC(y);
+#ifdef PICO_32X
+      p32x_sync_sh2s(SekCyclesDoneT2());
+#endif
       PsndGetSamples(y);
     }
 
@@ -138,6 +164,7 @@ static int PicoFrameHints(void)
 #else
     if (PicoLineHook) PicoLineHook();
 #endif
+    pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
   if (!skip)
@@ -159,7 +186,7 @@ static int PicoFrameHints(void)
   Pico.video.status|=0x200;
 
   memcpy(PicoPadInt, PicoPad, sizeof(PicoPadInt));
-  PAD_DELAY
+  PAD_DELAY();
 #ifdef PICO_CD
   check_cd_dma();
 #endif
@@ -180,7 +207,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)
-  SekRunM68k(CYCLES_M68K_VINT_LAG);
+  CPUS_RUN(CYCLES_M68K_VINT_LAG, CYCLES_S68K_VINT_LAG);
 
   if (pv->reg[1]&0x20) {
     elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
@@ -192,6 +219,11 @@ static int PicoFrameHints(void)
     z80_int();
   }
 
+#ifdef PICO_32X
+  p32x_sync_sh2s(SekCyclesDoneT2());
+  p32x_start_blank();
+#endif
+
   // get samples from sound chips
   if (y == 224 && PsndOut)
   {
@@ -203,17 +235,17 @@ 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,
-    CYCLES_S68K_LINE - CYCLES_S68K_ASD);
+    CYCLES_S68K_LINE - CYCLES_S68K_VINT_LAG - CYCLES_S68K_ASD);
 
 #ifdef PICO_CD
   update_chips();
 #else
   if (PicoLineHook) PicoLineHook();
 #endif
+  pevt_log_m68k_o(EVT_NEXT_LINE);
 
-  // PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
-  lines = Pico.m.pal ? 312 : 262;
-  vcnt_wrap = Pico.m.pal ? 0x103 : 0xEB; // based on Gens
+  lines = scanlines_total;
+  vcnt_wrap = Pico.m.pal ? 0x103 : 0xEB; // based on Gens, TODO: verify
 
   for (y++; y < lines; y++)
   {
@@ -224,7 +256,7 @@ static int PicoFrameHints(void)
       pv->v_counter = (pv->v_counter << 1) | 1;
     pv->v_counter &= 0xff;
 
-    PAD_DELAY
+    PAD_DELAY();
 #ifdef PICO_CD
     check_cd_dma();
 #endif
@@ -238,6 +270,7 @@ static int PicoFrameHints(void)
 #else
     if (PicoLineHook) PicoLineHook();
 #endif
+    pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
   // sync z80
@@ -246,6 +279,9 @@ static int PicoFrameHints(void)
   if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1)
     PsndDoDAC(lines-1);
 
+#ifdef PICO_32X
+  p32x_sync_sh2s(SekCyclesDoneT2());
+#endif
   timers_cycle();
 
   return 0;