32x: improve irq handling + few bugfixes

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

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index b631a30..e7779b9 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -19,7 +19,7 @@ static int REGPARM(2) sh2_irq_cb(SH2 *sh2, int level)
   }
 }
 
-void p32x_update_irls(void)
+void p32x_update_irls(int nested_call)
 {
   int irqs, mlvl = 0, slvl = 0;
 
@@ -36,8 +36,8 @@ void p32x_update_irls(void)
   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);
@@ -141,31 +141,38 @@ void PicoReset32x(void)
 {
   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 != 0) {
+  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;
-      int offs = 8, lines = 224;
-      if (Pico.video.reg[1] & 8) {
-        offs = 0;
-        lines = 240;
-      }
 
       // we draw full layer (not line-by-line)
       PicoDraw32xLayer(offs, lines, md_bg);
     }
-    else {
-      // TODO: MD layer only?
-    }
+    else if (Pico32xDrawMode != PDM32X_32X_ONLY)
+      PicoDraw32xLayerMdOnly(offs, lines);
+
+    pprof_end(draw);
   }
 
   // enter vblank
@@ -179,7 +186,7 @@ static void p32x_start_blank(void)
   }
 
   Pico32x.sh2irqs |= P32XI_VINT;
-  p32x_update_irls();
+  p32x_update_irls(0);
   p32x_poll_event(3, 1);
 }