X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=95b6b10376bec92551b2f45e06686ef6cb04e417;hb=6311a3baf533d4a034e51dfe38e8cb213a1bf442;hp=341255a8139fd7c7018b82d2b3cf0f797f22e12f;hpb=99ade2ee2f76fa8170fb4e1abacc24f39a150c44;p=picodrive.git

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index 341255a..95b6b10 100644
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -7,8 +7,7 @@
  */
 
 #define CYCLES_M68K_LINE     488 // suitable for both PAL/NTSC
-#define CYCLES_M68K_VINT_LAG  68
-#define CYCLES_M68K_ASD      148
+#define CYCLES_M68K_VINT_LAG 112
 
 // pad delay (for 6 button pads)
 #define PAD_DELAY() { \
@@ -22,24 +21,24 @@
   SekRunM68k(m68k_cycles)
 #endif
 
-// sync m68k to SekCycleAim
+// sync m68k to Pico.t.m68c_aim
 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;
+  while ((cyc_do = Pico.t.m68c_aim - Pico.t.m68c_cnt) > 0) {
+    Pico.t.m68c_cnt += cyc_do;
 
 #if defined(EMU_C68K)
     PicoCpuCM68k.cycles = cyc_do;
     CycloneRun(&PicoCpuCM68k);
-    SekCycleCnt -= PicoCpuCM68k.cycles;
+    Pico.t.m68c_cnt -= PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-    SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
+    Pico.t.m68c_cnt += m68k_execute(cyc_do) - cyc_do;
 #elif defined(EMU_F68K)
-    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
+    Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, cyc_do, 0) - cyc_do;
 #endif
   }
 
@@ -50,23 +49,55 @@ static void SekSyncM68k(void)
   pprof_end(m68k);
 }
 
-static inline void SekRunM68k(int cyc)
+static __inline void SekRunM68k(int cyc)
 {
-  SekCycleAim += cyc;
+  Pico.t.m68c_aim += cyc;
+  cyc = Pico.t.m68c_aim - Pico.t.m68c_cnt;
+  if (cyc <= 0)
+    return;
+  Pico.t.m68c_cnt += cyc >> 6; // refresh slowdowns
   SekSyncM68k();
 }
 
+static void do_hint(struct PicoVideo *pv)
+{
+  pv->pending_ints |= 0x10;
+  if (pv->reg[0] & 0x10) {
+    elprintf(EL_INTS, "hint: @ %06x [%u]", SekPc, SekCyclesDone());
+    SekInterrupt(4);
+  }
+}
+
+static void do_timing_hacks_as(struct PicoVideo *pv, int vdp_slots)
+{
+  pv->lwrite_cnt += vdp_slots - Pico.m.dma_xfers * 2; // wrong *2
+  if (pv->lwrite_cnt > vdp_slots)
+    pv->lwrite_cnt = vdp_slots;
+  else if (pv->lwrite_cnt < 0)
+    pv->lwrite_cnt = 0;
+  if (Pico.m.dma_xfers)
+    SekCyclesBurn(CheckDMA());
+}
+
+static void do_timing_hacks_vb(void)
+{
+  if (unlikely(Pico.m.dma_xfers))
+    SekCyclesBurn(CheckDMA());
+}
+
 static int PicoFrameHints(void)
 {
-  struct PicoVideo *pv=&Pico.video;
-  int lines, y, lines_vis = 224, line_sample, skip, vcnt_wrap;
+  struct PicoVideo *pv = &Pico.video;
+  int line_sample = Pico.m.pal ? 68 : 93;
+  int vdp_slots = (Pico.video.reg[12] & 1) ? 18 : 16;
+  int lines, y, lines_vis, skip;
+  int vcnt_wrap, vcnt_adj;
   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
+  if ((PicoIn.opt&POPT_ALT_RENDERER) && !PicoIn.skipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled
     // draw a frame just after vblank in alternative render mode
     // yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
     PicoFrameFull();
@@ -75,28 +106,19 @@ static int PicoFrameHints(void)
 #endif
     skip = 1;
   }
-  else skip=PicoSkipFrame;
-
-  if (Pico.m.pal) {
-    line_sample = 68;
-    if (pv->reg[1]&8) lines_vis = 240;
-  } else {
-    line_sample = 93;
-  }
+  else skip=PicoIn.skipFrame;
 
+  Pico.t.m68c_frame_start = Pico.t.m68c_aim;
+  pv->v_counter = Pico.m.scanline = 0;
   z80_resetCycles();
-  PsndDacLine = 0;
-  emustatus &= ~1;
+  PsndStartFrame();
 
-  pv->status&=~0x88; // clear V-Int, come out of vblank
+  // Load H-Int counter
+  hint = (pv->status & PVS_ACTIVE) ? pv->hint_cnt : pv->reg[10];
 
-  hint=pv->reg[10]; // Load H-Int counter
-  //dprintf("-hint: %i", hint);
+  pv->status |= PVS_ACTIVE;
 
-  // This is to make active scan longer (needed for Double Dragon 2, mainly)
-  CPUS_RUN(CYCLES_M68K_ASD);
-
-  for (y = 0; y < lines_vis; y++)
+  for (y = 0; ; y++)
   {
     pv->v_counter = Pico.m.scanline = y;
     if ((pv->reg[12]&6) == 6) { // interlace mode 2
@@ -105,28 +127,20 @@ static int PicoFrameHints(void)
       pv->v_counter &= 0xff;
     }
 
-    // VDP FIFO
-    pv->lwrite_cnt -= 12;
-    if (pv->lwrite_cnt <= 0) {
-      pv->lwrite_cnt=0;
-      Pico.video.status|=0x200;
-    }
+    if ((y == 224 && !(pv->reg[1] & 8)) || y == 240)
+      break;
 
     PAD_DELAY();
 
     // H-Interrupts:
-    if (--hint < 0) // y <= lines_vis: Comix Zone, Golden Axe
+    if (--hint < 0)
     {
-      hint=pv->reg[10]; // Reload H-Int counter
-      pv->pending_ints|=0x10;
-      if (pv->reg[0]&0x10) {
-        elprintf(EL_INTS, "hint: @ %06x [%i]", SekPc, SekCyclesDone());
-        SekInterrupt(4);
-      }
+      hint = pv->reg[10]; // Reload H-Int counter
+      do_hint(pv);
     }
 
     // decide if we draw this line
-    if (!skip && (PicoOpt & POPT_ALT_RENDERER))
+    if (!skip && (PicoIn.opt & POPT_ALT_RENDERER))
     {
       // find the right moment for frame renderer, when display is no longer blanked
       if ((pv->reg[1]&0x40) || y > 100) {
@@ -139,16 +153,14 @@ static int PicoFrameHints(void)
     }
 
     // get samples from sound chips
-    if ((y == 224 || y == line_sample) && PsndOut)
+    if ((y == 224 || y == line_sample) && PicoIn.sndOut)
     {
       cycles = SekCyclesDone();
 
-      if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80))
+      if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80))
         PicoSyncZ80(cycles);
-      if (ym2612.dacen && PsndDacLine <= y)
-        PsndDoDAC(y);
 #ifdef PICO_CD
-      if (PicoAHW & PAHW_MCD)
+      if (PicoIn.AHW & PAHW_MCD)
         pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
@@ -158,69 +170,69 @@ static int PicoFrameHints(void)
     }
 
     // Run scanline:
-    line_base_cycles = SekCyclesDone();
-    if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
+    Pico.t.m68c_line_start = Pico.t.m68c_aim;
+    do_timing_hacks_as(pv, vdp_slots);
     CPUS_RUN(CYCLES_M68K_LINE);
 
     if (PicoLineHook) PicoLineHook();
     pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
+  lines_vis = (pv->reg[1] & 8) ? 240 : 224;
+  if (y == lines_vis)
+    pv->status &= ~PVS_ACTIVE;
+
   if (!skip)
   {
-    if (DrawScanline < y)
+    if (Pico.est.DrawScanline < y)
       PicoDrawSync(y - 1, 0);
 #ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();
 #endif
   }
 
-  // V-int line (224 or 240)
-  Pico.m.scanline = y;
-  pv->v_counter = 0xe0; // bad for 240 mode
-  if ((pv->reg[12]&6) == 6) pv->v_counter = 0xc1;
-
   // VDP FIFO
-  pv->lwrite_cnt=0;
-  Pico.video.status|=0x200;
+  pv->lwrite_cnt = 0;
+  Pico.video.status |= SR_EMPT;
 
-  memcpy(PicoPadInt, PicoPad, sizeof(PicoPadInt));
+  memcpy(PicoIn.padInt, PicoIn.pad, sizeof(PicoIn.padInt));
   PAD_DELAY();
 
-  // Last H-Int:
+  // Last H-Int (normally):
   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, SekCyclesDone());
-    if (pv->reg[0]&0x10) SekInterrupt(4);
+    hint = pv->reg[10]; // Reload H-Int counter
+    do_hint(pv);
   }
 
-  pv->status|=0x08; // go into vblank
-  pv->pending_ints|=0x20;
+  pv->status |= SR_VB | PVS_VB2; // go into vblank
 
   // 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)
   // also delay between last H-int and V-int (Golden Axe 3)
-  line_base_cycles = SekCyclesDone();
-  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
+  Pico.t.m68c_line_start = Pico.t.m68c_aim;
+  do_timing_hacks_vb();
   CPUS_RUN(CYCLES_M68K_VINT_LAG);
 
-  if (pv->reg[1]&0x20) {
-    elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCyclesDone());
+  pv->status |= SR_F;
+  pv->pending_ints |= 0x20;
+  if (pv->reg[1] & 0x20) {
+    Pico.t.m68c_aim = Pico.t.m68c_cnt + 11; // HACK
+    SekSyncM68k();
+    elprintf(EL_INTS, "vint: @ %06x [%u]", SekPc, SekCyclesDone());
     SekInterrupt(6);
   }
 
   cycles = SekCyclesDone();
-  if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80)) {
+  if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80)) {
     PicoSyncZ80(cycles);
     elprintf(EL_INTS, "zint");
     z80_int();
   }
 
 #ifdef PICO_CD
-  if (PicoAHW & PAHW_MCD)
+  if (PicoIn.AHW & PAHW_MCD)
     pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
@@ -229,51 +241,96 @@ static int PicoFrameHints(void)
 #endif
 
   // get samples from sound chips
-  if (y == 224 && PsndOut)
-  {
-    if (ym2612.dacen && PsndDacLine <= y)
-      PsndDoDAC(y);
+  if (y == 224 && PicoIn.sndOut)
     PsndGetSamples(y);
-  }
 
   // Run scanline:
-  CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD);
+  CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG);
 
   if (PicoLineHook) PicoLineHook();
   pevt_log_m68k_o(EVT_NEXT_LINE);
 
-  lines = scanlines_total;
-  vcnt_wrap = Pico.m.pal ? 0x103 : 0xEB; // based on Gens, TODO: verify
+  if (Pico.m.pal) {
+    lines = 313;
+    vcnt_wrap = 0x103;
+    vcnt_adj = 57;
+  }
+  else {
+    lines = 262;
+    vcnt_wrap = 0xEB;
+    vcnt_adj = 6;
+  }
 
-  for (y++; y < lines; y++)
+  for (y++; y < lines - 1; y++)
   {
     pv->v_counter = Pico.m.scanline = y;
     if (y >= vcnt_wrap)
-      pv->v_counter -= Pico.m.pal ? 56 : 6;
+      pv->v_counter -= vcnt_adj;
     if ((pv->reg[12]&6) == 6)
       pv->v_counter = (pv->v_counter << 1) | 1;
     pv->v_counter &= 0xff;
 
     PAD_DELAY();
 
+    if (unlikely(pv->status & PVS_ACTIVE) && --hint < 0)
+    {
+      hint = pv->reg[10]; // Reload H-Int counter
+      do_hint(pv);
+    }
+
     // Run scanline:
-    line_base_cycles = SekCyclesDone();
-    if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
+    Pico.t.m68c_line_start = Pico.t.m68c_aim;
+    do_timing_hacks_vb();
     CPUS_RUN(CYCLES_M68K_LINE);
 
     if (PicoLineHook) PicoLineHook();
     pevt_log_m68k_o(EVT_NEXT_LINE);
   }
 
+  if (unlikely(PicoIn.overclockM68k)) {
+    unsigned int l = PicoIn.overclockM68k * lines / 100;
+    while (l-- > 0) {
+      Pico.t.m68c_cnt -= CYCLES_M68K_LINE;
+      do_timing_hacks_vb();
+      SekSyncM68k();
+    }
+  }
+
+  pv->status &= ~(SR_VB | PVS_VB2);
+  pv->status |= ((pv->reg[1] >> 3) ^ SR_VB) & SR_VB; // forced blanking
+
+  // last scanline
+  Pico.m.scanline = y;
+  pv->v_counter = 0xff;
+  pv->lwrite_cnt = 0;
+
+  PAD_DELAY();
+
+  if ((pv->status & PVS_ACTIVE) && --hint < 0)
+  {
+    hint = pv->reg[10]; // Reload H-Int counter
+    do_hint(pv);
+  }
+
+  // Run scanline:
+  Pico.t.m68c_line_start = Pico.t.m68c_aim;
+  do_timing_hacks_as(pv, vdp_slots);
+  CPUS_RUN(CYCLES_M68K_LINE);
+
+  if (PicoLineHook) PicoLineHook();
+  pevt_log_m68k_o(EVT_NEXT_LINE);
+
   // sync cpus
   cycles = SekCyclesDone();
-  if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoOpt&POPT_EN_Z80))
+  if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80))
     PicoSyncZ80(cycles);
-  if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1)
-    PsndDoDAC(lines-1);
+  if (PicoIn.sndOut && ym2612.dacen && Pico.snd.dac_line < lines)
+    PsndDoDAC(lines - 1);
+  if (PicoIn.sndOut && Pico.snd.psg_line < lines)
+    PsndDoPSG(lines - 1);
 
 #ifdef PICO_CD
-  if (PicoAHW & PAHW_MCD)
+  if (PicoIn.AHW & PAHW_MCD)
     pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
@@ -281,6 +338,8 @@ static int PicoFrameHints(void)
 #endif
   timers_cycle();
 
+  pv->hint_cnt = hint;
+
   return 0;
 }