+/*
+ * PicoDrive
+ * (C) notaz, 2009,2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
#include "../pico_int.h"
#include "../sound/ym2612.h"
}
}
-void p32x_update_irls(void)
+void p32x_update_irls(int nested_call)
{
int irqs, mlvl = 0, slvl = 0;
slvl *= 2;
elprintf(EL_32X, "update_irls: m %d, s %d", mlvl, slvl);
- sh2_irl_irq(&msh2, mlvl);
- sh2_irl_irq(&ssh2, slvl);
+ sh2_irl_irq(&msh2, mlvl, nested_call);
+ sh2_irl_irq(&ssh2, slvl, nested_call);
mlvl = mlvl ? 1 : 0;
slvl = slvl ? 1 : 0;
p32x_poll_event(mlvl | (slvl << 1), 0);
PREG8(Pico32xMem->sh2_peri_regs[0], 4) =
PREG8(Pico32xMem->sh2_peri_regs[1], 4) = 0x84; // SCI SSR
+ rendstatus_old = -1;
+
emu_32x_startup();
}
sh2_set_vbr(1, vbr);
// program will set S_OK
}
+
+ msh2.m68krcycles_done = ssh2.m68krcycles_done = SekCyclesDoneT();
}
void Pico32xInit(void)
{
+ if (msh2.mult_m68k_to_sh2 == 0 || msh2.mult_sh2_to_m68k == 0)
+ Pico32xSetClocks(PICO_MSH2_HZ, 0);
+ if (ssh2.mult_m68k_to_sh2 == 0 || ssh2.mult_sh2_to_m68k == 0)
+ Pico32xSetClocks(0, PICO_MSH2_HZ);
}
void PicoPower32x(void)
void PicoUnload32x(void)
{
if (Pico32xMem != NULL)
- free(Pico32xMem);
+ plat_munmap(Pico32xMem, sizeof(*Pico32xMem));
Pico32xMem = NULL;
sh2_finish(&msh2);
sh2_finish(&ssh2);
{
if (PicoAHW & PAHW_32X) {
Pico32x.sh2irqs |= P32XI_VRES;
- p32x_update_irls();
+ p32x_update_irls(0);
p32x_poll_event(3, 0);
}
}
static void p32x_start_blank(void)
{
+ if (Pico32xDrawMode != PDM32X_OFF && !PicoSkipFrame) {
+ int offs, lines;
+
+ pprof_start(draw);
+
+ offs = 8; lines = 224;
+ if ((Pico.video.reg[1] & 8) && !(PicoOpt & POPT_ALT_RENDERER)) {
+ offs = 0;
+ lines = 240;
+ }
+
+ // XXX: no proper handling of 32col mode..
+ if ((Pico32x.vdp_regs[0] & P32XV_Mx) != 0 && // 32x not blanking
+ (Pico.video.reg[12] & 1) && // 40col mode
+ (PicoDrawMask & PDRAW_32X_ON))
+ {
+ int md_bg = Pico.video.reg[7] & 0x3f;
+
+ // we draw full layer (not line-by-line)
+ PicoDraw32xLayer(offs, lines, md_bg);
+ }
+ else if (Pico32xDrawMode != PDM32X_32X_ONLY)
+ PicoDraw32xLayerMdOnly(offs, lines);
+
+ pprof_end(draw);
+ }
+
// enter vblank
Pico32x.vdp_regs[0x0a/2] |= P32XV_VBLK|P32XV_PEN;
}
Pico32x.sh2irqs |= P32XI_VINT;
- p32x_update_irls();
+ p32x_update_irls(0);
p32x_poll_event(3, 1);
}
-static __inline void run_m68k(int cyc)
-{
-#if defined(EMU_C68K)
- PicoCpuCM68k.cycles = cyc;
- CycloneRun(&PicoCpuCM68k);
- SekCycleCnt += cyc - PicoCpuCM68k.cycles;
-#elif defined(EMU_M68K)
- SekCycleCnt += m68k_execute(cyc);
-#elif defined(EMU_F68K)
- SekCycleCnt += fm68k_emulate(cyc+1, 0, 0);
-#endif
-}
-
-// ~1463.8, but due to cache misses and slow mem
-// it's much lower than that
-//#define SH2_LINE_CYCLES 735
-#define CYCLES_M68K2SH2(x) ((x) * 6 / 4)
+#define sync_sh2s_normal p32x_sync_sh2s
+//#define sync_sh2s_lockstep p32x_sync_sh2s
-#define PICO_32X
-#define CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \
-{ \
- int slice; \
- SekCycleAim += m68k_cycles; \
- while (SekCycleCnt < SekCycleAim) { \
- slice = SekCycleCnt; \
- run_m68k(SekCycleAim - SekCycleCnt); \
- if (!(Pico32x.regs[0] & P32XS_nRES)) \
- continue; /* SH2s reseting */ \
- slice = SekCycleCnt - slice; /* real count from 68k */ \
- if (SekCycleCnt < SekCycleAim) \
- elprintf(EL_32X, "slice %d", slice); \
- if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
- sh2_execute(&ssh2, CYCLES_M68K2SH2(slice)); \
- if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
- sh2_execute(&msh2, CYCLES_M68K2SH2(slice)); \
- } \
+void sync_sh2s_normal(unsigned int m68k_target)
+{
+ unsigned int target = m68k_target;
+ int msh2_cycles, ssh2_cycles;
+ int done;
+
+ elprintf(EL_32X, "sh2 sync to %u (%u)", m68k_target, SekCycleCnt);
+
+ if (!(Pico32x.regs[0] & P32XS_nRES))
+ return; // rare
+
+ {
+ msh2_cycles = C_M68K_TO_SH2(msh2, target - msh2.m68krcycles_done);
+ ssh2_cycles = C_M68K_TO_SH2(ssh2, target - ssh2.m68krcycles_done);
+
+ while (msh2_cycles > 0 || ssh2_cycles > 0) {
+ elprintf(EL_32X, "sh2 exec %u,%u->%u",
+ msh2.m68krcycles_done, ssh2.m68krcycles_done, target);
+
+ if (Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL)) {
+ ssh2.m68krcycles_done = target;
+ ssh2_cycles = 0;
+ }
+ else if (ssh2_cycles > 0) {
+ done = sh2_execute(&ssh2, ssh2_cycles);
+ ssh2.m68krcycles_done += C_SH2_TO_M68K(ssh2, done);
+
+ ssh2_cycles = C_M68K_TO_SH2(ssh2, target - ssh2.m68krcycles_done);
+ }
+
+ if (Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL)) {
+ msh2.m68krcycles_done = target;
+ msh2_cycles = 0;
+ }
+ else if (msh2_cycles > 0) {
+ done = sh2_execute(&msh2, msh2_cycles);
+ msh2.m68krcycles_done += C_SH2_TO_M68K(msh2, done);
+
+ msh2_cycles = C_M68K_TO_SH2(msh2, target - msh2.m68krcycles_done);
+ }
+ }
+ }
}
#define STEP_68K 24
-#define CPUS_RUN_LOCKSTEP(m68k_cycles,s68k_cycles) \
-{ \
- int i; \
- for (i = 0; i <= (m68k_cycles) - STEP_68K; i += STEP_68K) { \
- run_m68k(STEP_68K); \
- if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
- sh2_execute(&msh2, CYCLES_M68K2SH2(STEP_68K)); \
- if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
- sh2_execute(&ssh2, CYCLES_M68K2SH2(STEP_68K)); \
- } \
- /* last step */ \
- i = (m68k_cycles) - i; \
- run_m68k(i); \
- if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
- sh2_execute(&msh2, CYCLES_M68K2SH2(i)); \
- if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
- sh2_execute(&ssh2, CYCLES_M68K2SH2(i)); \
+
+void sync_sh2s_lockstep(unsigned int m68k_target)
+{
+ unsigned int mcycles;
+
+ mcycles = msh2.m68krcycles_done;
+ if (ssh2.m68krcycles_done < mcycles)
+ mcycles = ssh2.m68krcycles_done;
+
+ while (mcycles < m68k_target) {
+ mcycles += STEP_68K;
+ sync_sh2s_normal(mcycles);
+ }
}
-#define CPUS_RUN CPUS_RUN_SIMPLE
-//#define CPUS_RUN CPUS_RUN_LOCKSTEP
+#define CPUS_RUN(m68k_cycles,s68k_cycles) do { \
+ SekRunM68k(m68k_cycles); \
+ if (SekIsStoppedM68k()) \
+ p32x_sync_sh2s(SekCycleCntT + SekCycleCnt); \
+} while (0)
+#define PICO_32X
#include "../pico_cmn.c"
void PicoFrame32x(void)
elprintf(EL_32X, "poll: %02x", Pico32x.emu_flags);
}
+// calculate multipliers against 68k clock (7670442)
+// normally * 3, but effectively slower due to high latencies everywhere
+// however using something lower breaks MK2 animations
+void Pico32xSetClocks(int msh2_hz, int ssh2_hz)
+{
+ float m68k_clk = (float)(OSC_NTSC / 7);
+ if (msh2_hz > 0) {
+ msh2.mult_m68k_to_sh2 = (int)((float)msh2_hz * (1 << CYCLE_MULT_SHIFT) / m68k_clk);
+ msh2.mult_sh2_to_m68k = (int)(m68k_clk * (1 << CYCLE_MULT_SHIFT) / (float)msh2_hz);
+ }
+ if (ssh2_hz > 0) {
+ ssh2.mult_m68k_to_sh2 = (int)((float)ssh2_hz * (1 << CYCLE_MULT_SHIFT) / m68k_clk);
+ ssh2.mult_sh2_to_m68k = (int)(m68k_clk * (1 << CYCLE_MULT_SHIFT) / (float)ssh2_hz);
+ }
+}
+
+// vim:shiftwidth=2:ts=2:expandtab
notaz.gp2x.de / picodrive.git / blobdiff