*/
#define CYCLES_M68K_LINE 488 // suitable for both PAL/NTSC
-#define CYCLES_M68K_VINT_LAG 68
+#define CYCLES_M68K_VINT_LAG 112
// pad delay (for 6 button pads)
#define PAD_DELAY() { \
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
}
pprof_end(m68k);
}
-static inline void SekRunM68k(int cyc)
+static __inline void SekRunM68k(int cyc)
{
- SekCycleAim += cyc;
- cyc = SekCycleAim - SekCycleCnt;
+ Pico.t.m68c_aim += cyc;
+ cyc = Pico.t.m68c_aim - Pico.t.m68c_cnt;
if (cyc <= 0)
return;
- SekCycleCnt += cyc >> 6; // refresh slowdowns
+ Pico.t.m68c_cnt += cyc >> 6; // refresh slowdowns
SekSyncM68k();
}
}
}
+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 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();
#endif
skip = 1;
}
- else skip=PicoSkipFrame;
+ else skip=PicoIn.skipFrame;
+ Pico.t.m68c_frame_start = Pico.t.m68c_aim;
+ pv->v_counter = Pico.m.scanline = 0;
z80_resetCycles();
PsndStartFrame();
if ((y == 224 && !(pv->reg[1] & 8)) || y == 240)
break;
- // VDP FIFO
- pv->lwrite_cnt -= 12;
- if (pv->lwrite_cnt <= 0) {
- pv->lwrite_cnt = 0;
- Pico.video.status |= SR_EMPT;
- }
-
PAD_DELAY();
// H-Interrupts:
}
// 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) {
}
// 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);
#ifdef PICO_CD
- if (PicoAHW & PAHW_MCD)
+ if (PicoIn.AHW & PAHW_MCD)
pcd_sync_s68k(cycles, 0);
#endif
#ifdef PICO_32X
}
// 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();
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 (normally):
do_hint(pv);
}
- pv->status |= SR_VB; // 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);
+ 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
#endif
// get samples from sound chips
- if (y == 224 && PsndOut)
+ if (y == 224 && PicoIn.sndOut)
PsndGetSamples(y);
// Run scanline:
PAD_DELAY();
- if ((pv->status & PVS_ACTIVE) && --hint < 0)
+ 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);
}
- pv->status &= ~SR_VB;
+ 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();
}
// 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();
// 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)
+ if (PicoIn.sndOut && ym2612.dacen && Pico.snd.dac_line < lines)
PsndDoDAC(lines - 1);
- if (PsndOut && PsndPsgLine < lines)
+ 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
notaz.gp2x.de / picodrive.git / blobdiff