X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2F32x.c;h=6217d2d6ae36ca6619f6b9e4e671dd5ab1485115;hb=faf543cebe3f5e93d39f1fdb7e209ce32c954e56;hp=94e696bb1dcf51c37c17a40691b7a683dc20b263;hpb=b081408f66662068a3d274f696bdabba5186b68e;p=picodrive.git

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 94e696b..6217d2d 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -1,3 +1,10 @@
+/*
+ * 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"
 
@@ -19,7 +26,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 +43,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);
@@ -62,6 +69,8 @@ void Pico32xStartup(void)
   PREG8(Pico32xMem->sh2_peri_regs[0], 4) =
   PREG8(Pico32xMem->sh2_peri_regs[1], 4) = 0x84; // SCI SSR
 
+  rendstatus_old = -1;
+
   emu_32x_startup();
 }
 
@@ -141,13 +150,40 @@ 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 != 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;
 
@@ -159,7 +195,7 @@ static void p32x_start_blank(void)
   }
 
   Pico32x.sh2irqs |= P32XI_VINT;
-  p32x_update_irls();
+  p32x_update_irls(0);
   p32x_poll_event(3, 1);
 }
 
@@ -167,6 +203,7 @@ static __inline void run_m68k(int cyc)
 {
   pprof_start(m68k);
 
+p32x_poll_event(3, 0);
 #if defined(EMU_C68K)
   PicoCpuCM68k.cycles = cyc;
   CycloneRun(&PicoCpuCM68k);
@@ -183,7 +220,8 @@ static __inline void run_m68k(int cyc)
 // ~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 CYCLES_M68K2MSH2(x) (((x) * p32x_msh2_multiplier) >> 10)
+#define CYCLES_M68K2SSH2(x) (((x) * p32x_ssh2_multiplier) >> 10)
 
 #define PICO_32X
 #define CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \
@@ -200,12 +238,12 @@ static __inline void run_m68k(int cyc)
       elprintf(EL_32X, "slice %d", slice); \
     if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) { \
       pprof_start(ssh2); \
-      sh2_execute(&ssh2, CYCLES_M68K2SH2(slice)); \
+      sh2_execute(&ssh2, CYCLES_M68K2SSH2(slice)); \
       pprof_end(ssh2); \
     } \
     if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) { \
       pprof_start(msh2); \
-      sh2_execute(&msh2, CYCLES_M68K2SH2(slice)); \
+      sh2_execute(&msh2, CYCLES_M68K2MSH2(slice)); \
       pprof_end(msh2); \
     } \
     pprof_start(dummy); \