X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2F32x%2F32x.c;h=93d4e3e8992bc7643832e8762e3aac407079839d;hb=be20816c4c487c4b114aa444b1a5819d5785b118;hp=7a122cb030b9c1cca7c9afcae0fba09de3d810b9;hpb=974fdb5bfda8ed006661031e22c920828ddb60dc;p=picodrive.git

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 7a122cb..93d4e3e 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -3,6 +3,36 @@
 
 struct Pico32x Pico32x;
 
+static void sh2_irq_cb(int id, int level)
+{
+  // diagnostic for now
+  elprintf(EL_32X, "%csh2 ack %d @ %08x", id ? 's' : 'm', level, sh2_pc(id));
+}
+
+void p32x_update_irls(void)
+{
+  int irqs, mlvl = 0, slvl = 0;
+
+  // msh2
+  irqs = (Pico32x.sh2irqs | Pico32x.sh2irqi[0]) & ((Pico32x.sh2irq_mask[0] << 3) | P32XI_VRES);
+  while ((irqs >>= 1))
+    mlvl++;
+  mlvl *= 2;
+
+  // ssh2
+  irqs = (Pico32x.sh2irqs | Pico32x.sh2irqi[1]) & ((Pico32x.sh2irq_mask[1] << 3) | P32XI_VRES);
+  while ((irqs >>= 1))
+    slvl++;
+  slvl *= 2;
+
+  elprintf(EL_32X, "update_irls: m %d, s %d", mlvl, slvl);
+  sh2_irl_irq(&msh2, mlvl);
+  sh2_irl_irq(&ssh2, slvl);
+  mlvl = mlvl ? 1 : 0;
+  slvl = slvl ? 1 : 0;
+  p32x_poll_event(mlvl | (slvl << 1), 0);
+}
+
 void Pico32xStartup(void)
 {
   elprintf(EL_STATUS|EL_32X, "32X startup");
@@ -10,6 +40,14 @@ void Pico32xStartup(void)
   PicoAHW |= PAHW_32X;
   PicoMemSetup32x();
 
+  sh2_init(&msh2, 0);
+  msh2.irq_callback = sh2_irq_cb;
+  sh2_reset(&msh2);
+
+  sh2_init(&ssh2, 1);
+  ssh2.irq_callback = sh2_irq_cb;
+  sh2_reset(&ssh2);
+
   if (!Pico.m.pal)
     Pico32x.vdp_regs[0] |= P32XV_nPAL;
 
@@ -23,12 +61,25 @@ void Pico32xInit(void)
 void PicoPower32x(void)
 {
   memset(&Pico32x, 0, sizeof(Pico32x));
+
   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)
+{
+  if (Pico32xMem != NULL)
+    free(Pico32xMem);
+  Pico32xMem = NULL;
+
+  PicoAHW &= ~PAHW_32X;
 }
 
 void PicoReset32x(void)
 {
+  extern int p32x_csum_faked;
+  p32x_csum_faked = 0; // tmp
 }
 
 static void p32x_start_blank(void)
@@ -36,20 +87,29 @@ static void p32x_start_blank(void)
   // enter vblank
   Pico32x.vdp_regs[0x0a/2] |= P32XV_VBLK|P32XV_PEN;
 
-  // swap waits until vblank
+  // FB swap waits until vblank
   if ((Pico32x.vdp_regs[0x0a/2] ^ Pico32x.pending_fb) & P32XV_FS) {
     Pico32x.vdp_regs[0x0a/2] &= ~P32XV_FS;
     Pico32x.vdp_regs[0x0a/2] |= Pico32x.pending_fb;
     Pico32xSwapDRAM(Pico32x.pending_fb ^ 1);
   }
+
+  Pico32x.sh2irqs |= P32XI_VINT;
+  p32x_update_irls();
+  p32x_poll_event(3, 1);
 }
 
 // FIXME..
 static __inline void SekRunM68k(int cyc)
 {
   int cyc_do;
-  SekCycleAim+=cyc;
-  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
+  SekCycleAim += cyc;
+  if (Pico32x.emu_flags & P32XF_68KPOLL) {
+    SekCycleCnt = SekCycleAim;
+    return;
+  }
+  if ((cyc_do = SekCycleAim - SekCycleCnt) <= 0)
+    return;
 #if defined(EMU_CORE_DEBUG)
   // this means we do run-compare
   SekCycleCnt+=CM_compareRun(cyc_do, 0);
@@ -64,14 +124,45 @@ static __inline void SekRunM68k(int cyc)
 #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) * 9 / 4)
+
 #define PICO_32X
+#define RUN_SH2S_SIMPLE(m68k_cycles) \
+  if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
+    sh2_execute(&msh2, CYCLES_M68K2SH2(m68k_cycles)); \
+  if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
+    sh2_execute(&ssh2, CYCLES_M68K2SH2(m68k_cycles))
+
+#define STEP 66
+#define RUN_SH2S_LOCKSTEP(m68k_cycles) \
+{ \
+  int i; \
+  for (i = 0; i < CYCLES_M68K2SH2(m68k_cycles); i+= STEP) { \
+    sh2_execute(&msh2, STEP); \
+    sh2_execute(&ssh2, STEP); \
+  } \
+}
+
+#define RUN_SH2S RUN_SH2S_SIMPLE
+//#define RUN_SH2S RUN_SH2S_LOCKSTEP
+
 #include "../pico_cmn.c"
 
 void PicoFrame32x(void)
 {
-  if ((Pico32x.vdp_regs[0] & 3 ) != 0) // no forced blanking
-    Pico32x.vdp_regs[0x0a/2] &= ~(P32XV_VBLK|P32XV_PEN); // get out of vblank
+  pwm_frame_smp_cnt = 0;
+
+  Pico32x.vdp_regs[0x0a/2] &= ~P32XV_VBLK; // get out of vblank
+  if ((Pico32x.vdp_regs[0] & P32XV_Mx) != 0) // no forced blanking
+    Pico32x.vdp_regs[0x0a/2] &= ~P32XV_PEN; // no palette access
+
+  p32x_poll_event(3, 1);
 
   PicoFrameStart();
   PicoFrameHints();
+  elprintf(EL_32X, "poll: %02x", Pico32x.emu_flags);
 }
+