X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=b39cfdb2a7ac252c61623a1189a011728a8eb9ef;hb=4f2cdbf551ad1a7f487b65b4754cbf7983e80b8a;hp=12f649f986409dfff290432d273c2959dc5ceb61;hpb=a8fd6e376175c06e2423d0914359c761829d6e93;p=picodrive.git

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index 12f649f..b39cfdb 100644
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -1,6 +1,6 @@
 /*
- * common code for pico.c and cd/pico.c
- * (C) notaz, 2007-2009
+ * common code for base/cd/32x
+ * (C) notaz, 2007-2009,2013
  *
  * This work is licensed under the terms of MAME license.
  * See COPYING file in the top-level directory.
@@ -9,52 +9,61 @@
 #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 CPUS_RUN
-#define CPUS_RUN(m68k_cycles,s68k_cycles) \
+#define CPUS_RUN(m68k_cycles) \
   SekRunM68k(m68k_cycles)
 #endif
 
-static __inline void SekRunM68k(int cyc)
+// sync m68k to SekCycleAim
+static void SekSyncM68k(void)
 {
   int cyc_do;
   pprof_start(m68k);
+  pevt_log_m68k_o(EVT_RUN_START);
+
+  while ((cyc_do = SekCycleAim - SekCycleCnt) > 0) {
+    SekCycleCnt += cyc_do;
 
-  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;
+#if defined(EMU_C68K)
+    PicoCpuCM68k.cycles = cyc_do;
+    CycloneRun(&PicoCpuCM68k);
+    SekCycleCnt -= PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(cyc_do);
+    SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
+    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
 #endif
+  }
+
+  SekCyclesLeft = 0;
 
+  SekTrace(0);
+  pevt_log_m68k_o(EVT_RUN_END);
   pprof_end(m68k);
 }
 
+static inline void SekRunM68k(int cyc)
+{
+  SekCycleAim += cyc;
+  SekSyncM68k();
+}
+
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
   int lines, y, lines_vis = 224, line_sample, skip, vcnt_wrap;
+  unsigned int cycles;
   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
@@ -75,13 +84,8 @@ static int PicoFrameHints(void)
     line_sample = 93;
   }
 
-  SekCyclesReset();
   z80_resetCycles();
-#ifdef PICO_CD
-  SekCyclesResetS68k();
-#endif
-  PsndDacLine = 0;
-  emustatus &= ~1;
+  PsndStartFrame();
 
   pv->status&=~0x88; // clear V-Int, come out of vblank
 
@@ -89,7 +93,7 @@ static int PicoFrameHints(void)
   //dprintf("-hint: %i", hint);
 
   // This is to make active scan longer (needed for Double Dragon 2, mainly)
-  CPUS_RUN(CYCLES_M68K_ASD, CYCLES_S68K_ASD);
+  CPUS_RUN(CYCLES_M68K_ASD);
 
   for (y = 0; y < lines_vis; y++)
   {
@@ -107,10 +111,7 @@ static int PicoFrameHints(void)
       Pico.video.status|=0x200;
     }
 
-    PAD_DELAY
-#ifdef PICO_CD
-    check_cd_dma();
-#endif
+    PAD_DELAY();
 
     // H-Interrupts:
     if (--hint < 0) // y <= lines_vis: Comix Zone, Golden Axe
@@ -118,7 +119,7 @@ static int PicoFrameHints(void)
       hint=pv->reg[10]; // Reload H-Int counter
       pv->pending_ints|=0x10;
       if (pv->reg[0]&0x10) {
-        elprintf(EL_INTS, "hint: @ %06x [%i]", SekPc, SekCycleCnt);
+        elprintf(EL_INTS, "hint: @ %06x [%i]", SekPc, SekCyclesDone());
         SekInterrupt(4);
       }
     }
@@ -139,30 +140,32 @@ static int PicoFrameHints(void)
     // get samples from sound chips
     if ((y == 224 || y == line_sample) && PsndOut)
     {
+      cycles = SekCyclesDone();
+
       if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80))
-        PicoSyncZ80(SekCycleCnt);
-      if (ym2612.dacen && PsndDacLine <= y)
-        PsndDoDAC(y);
+        PicoSyncZ80(cycles);
+#ifdef PICO_CD
+      if (PicoAHW & PAHW_MCD)
+        pcd_sync_s68k(cycles, 0);
+#endif
 #ifdef PICO_32X
-      p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+      p32x_sync_sh2s(cycles);
 #endif
       PsndGetSamples(y);
     }
 
     // Run scanline:
+    line_base_cycles = SekCyclesDone();
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
-    CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE);
+    CPUS_RUN(CYCLES_M68K_LINE);
 
-#ifdef PICO_CD
-    update_chips();
-#else
     if (PicoLineHook) PicoLineHook();
-#endif
+    pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
   if (!skip)
   {
-    if (DrawScanline < y)
+    if (Pico.est.DrawScanline < y)
       PicoDrawSync(y - 1, 0);
 #ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();
@@ -179,17 +182,14 @@ static int PicoFrameHints(void)
   Pico.video.status|=0x200;
 
   memcpy(PicoPadInt, PicoPad, sizeof(PicoPadInt));
-  PAD_DELAY
-#ifdef PICO_CD
-  check_cd_dma();
-#endif
+  PAD_DELAY();
 
   // Last H-Int:
   if (--hint < 0)
   {
     hint=pv->reg[10]; // Reload H-Int counter
     pv->pending_ints|=0x10;
-    //printf("rhint: %i @ %06x [%i|%i]\n", hint, SekPc, y, SekCycleCnt);
+    //printf("rhint: %i @ %06x [%i|%i]\n", hint, SekPc, y, SekCyclesDone());
     if (pv->reg[0]&0x10) SekInterrupt(4);
   }
 
@@ -200,41 +200,40 @@ 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)
-  CPUS_RUN(CYCLES_M68K_VINT_LAG, CYCLES_S68K_VINT_LAG);
+  line_base_cycles = SekCyclesDone();
+  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
+  CPUS_RUN(CYCLES_M68K_VINT_LAG);
 
   if (pv->reg[1]&0x20) {
-    elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
+    elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCyclesDone());
     SekInterrupt(6);
   }
+
+  cycles = SekCyclesDone();
   if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80)) {
-    PicoSyncZ80(SekCycleCnt);
+    PicoSyncZ80(cycles);
     elprintf(EL_INTS, "zint");
     z80_int();
   }
 
+#ifdef PICO_CD
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
+#endif
 #ifdef PICO_32X
-  p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+  p32x_sync_sh2s(cycles);
   p32x_start_blank();
 #endif
 
   // get samples from sound chips
   if (y == 224 && PsndOut)
-  {
-    if (ym2612.dacen && PsndDacLine <= y)
-      PsndDoDAC(y);
     PsndGetSamples(y);
-  }
 
   // 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_VINT_LAG - CYCLES_S68K_ASD);
+  CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD);
 
-#ifdef PICO_CD
-  update_chips();
-#else
   if (PicoLineHook) PicoLineHook();
-#endif
+  pevt_log_m68k_o(EVT_NEXT_LINE);
 
   lines = scanlines_total;
   vcnt_wrap = Pico.m.pal ? 0x103 : 0xEB; // based on Gens, TODO: verify
@@ -248,30 +247,30 @@ static int PicoFrameHints(void)
       pv->v_counter = (pv->v_counter << 1) | 1;
     pv->v_counter &= 0xff;
 
-    PAD_DELAY
-#ifdef PICO_CD
-    check_cd_dma();
-#endif
+    PAD_DELAY();
 
     // Run scanline:
+    line_base_cycles = SekCyclesDone();
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
-    CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE);
+    CPUS_RUN(CYCLES_M68K_LINE);
 
-#ifdef PICO_CD
-    update_chips();
-#else
     if (PicoLineHook) PicoLineHook();
-#endif
+    pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
-  // sync z80
+  // sync cpus
+  cycles = SekCyclesDone();
   if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80))
-    PicoSyncZ80(Pico.m.pal ? 151809 : 127671); // cycles adjusted for converter
-  if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1)
-    PsndDoDAC(lines-1);
+    PicoSyncZ80(cycles);
+  if (PsndOut && ym2612.dacen && PsndDacLine < lines)
+    PsndDoDAC(lines - 1);
 
+#ifdef PICO_CD
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
+#endif
 #ifdef PICO_32X
-  p32x_sync_sh2s(SekCycleCntT + SekCycleCnt);
+  p32x_sync_sh2s(cycles);
 #endif
   timers_cycle();
 
@@ -281,3 +280,4 @@ static int PicoFrameHints(void)
 #undef PAD_DELAY
 #undef CPUS_RUN
 
+// vim:shiftwidth=2:ts=2:expandtab