32x: vints, dram read, hw divider. Doom runs, but fragile to timing

[picodrive.git] / pico / 32x / 32x.c

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index ee561ae..76423f1 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -3,10 +3,10 @@
 
 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)
@@ -39,11 +39,11 @@ 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);
 
@@ -92,6 +92,8 @@ static void p32x_start_blank(void)
     Pico32xSwapDRAM(Pico32x.pending_fb ^ 1);
   }
 
+  Pico32x.sh2irqs |= P32XI_VINT;
+  p32x_update_irls();
   p32x_poll_event(1);
 }
 
@@ -122,31 +124,28 @@ static __inline void SekRunM68k(int cyc)
 
 // ~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 PICO_32X
 #define RUN_SH2S \
   if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
-    sh2_execute(&msh2, SH2_LINE_CYCLES);
+    sh2_execute(&msh2, SH2_LINE_CYCLES); \
+  if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
+    sh2_execute(&ssh2, SH2_LINE_CYCLES);
 
 #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);
 
   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';
-  }
 }
+