struct Pico32x Pico32x;
-static void sh2_irq_cb(int level)
+static void sh2_irq_cb(int id, int level)
{
// diagnostic for now
- elprintf(EL_32X, "sh2 ack %d @ %08x", level, ash2_pc());
+ elprintf(EL_32X, "%csh2 ack %d @ %08x", id ? 's' : 'm', level, sh2_pc(id));
}
void p32x_update_irls(void)
elprintf(EL_32X, "update_irls: m %d, s %d", mlvl, slvl);
sh2_irl_irq(&msh2, mlvl);
- if (mlvl)
- p32x_poll_event(0);
sh2_irl_irq(&ssh2, slvl);
+ mlvl = mlvl ? 1 : 0;
+ slvl = slvl ? 1 : 0;
+ p32x_poll_event(mlvl | (slvl << 1), 0);
}
void Pico32xStartup(void)
PicoAHW |= PAHW_32X;
PicoMemSetup32x();
- sh2_init(&msh2);
+ sh2_init(&msh2, 0);
msh2.irq_callback = sh2_irq_cb;
sh2_reset(&msh2);
- sh2_init(&ssh2);
+ sh2_init(&ssh2, 1);
ssh2.irq_callback = sh2_irq_cb;
sh2_reset(&ssh2);
Pico32x.regs[0] = 0x0082; // SH2 reset?
Pico32x.vdp_regs[0x0a/2] = P32XV_VBLK|P32XV_HBLK|P32XV_PEN;
+ Pico32x.sh2_regs[0] = P32XS2_ADEN;
}
void PicoUnload32x(void)
Pico32xSwapDRAM(Pico32x.pending_fb ^ 1);
}
- p32x_poll_event(1);
+ Pico32x.sh2irqs |= P32XI_VINT;
+ p32x_update_irls();
+ p32x_poll_event(3, 1);
}
// FIXME..
// ~1463.8, but due to cache misses and slow mem
// it's much lower than that
-#define SH2_LINE_CYCLES 700
+//#define SH2_LINE_CYCLES 735
+#define CYCLES_M68K2SH2(x) ((x) * 6 / 4)
#define PICO_32X
-#define RUN_SH2S \
+#define CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \
+ SekRunM68k(m68k_cycles); \
if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
- sh2_execute(&msh2, SH2_LINE_CYCLES);
+ sh2_execute(&msh2, CYCLES_M68K2SH2(m68k_cycles)); \
+ if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
+ sh2_execute(&ssh2, CYCLES_M68K2SH2(m68k_cycles))
+
+#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) { \
+ SekRunM68k(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; \
+ SekRunM68k(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)); \
+}
+
+//#define CPUS_RUN CPUS_RUN_SIMPLE
+#define CPUS_RUN CPUS_RUN_LOCKSTEP
#include "../pico_cmn.c"
void PicoFrame32x(void)
{
+ pwm_frame_smp_cnt = 0;
+
Pico32x.vdp_regs[0x0a/2] &= ~P32XV_VBLK; // get out of vblank
- if ((Pico32x.vdp_regs[0] & 3 ) != 0) // no forced blanking
- Pico32x.vdp_regs[0x0a/2] &= ~P32XV_PEN; // no pal access
+ if ((Pico32x.vdp_regs[0] & P32XV_Mx) != 0) // no forced blanking
+ Pico32x.vdp_regs[0x0a/2] &= ~P32XV_PEN; // no palette access
- p32x_poll_event(1);
+ p32x_poll_event(3, 1);
PicoFrameStart();
PicoFrameHints();
-
- // hack
- if (Pico.m.frame_count == 83) {
- Pico32xMem->sdram[0x3610 ^ 1] = 'R';
- Pico32xMem->sdram[0x3611 ^ 1] = 'E';
- Pico32xMem->sdram[0x3612 ^ 1] = 'D';
- Pico32xMem->sdram[0x3613 ^ 1] = 'Y';
- }
+ elprintf(EL_32X, "poll: %02x", Pico32x.emu_flags);
}
+