X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2F32x.c;h=94e696bb1dcf51c37c17a40691b7a683dc20b263;hb=9bb5d91c48b50da466aa553db65c9f9b2a0b1e8d;hp=c75e3fe1512ac49a0373f01aabc456e49d424b91;hpb=83ff19ec52ff47992b5d6ceda3900b914eda2123;p=picodrive.git

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index c75e3fe..94e696b 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -4,10 +4,19 @@
 struct Pico32x Pico32x;
 SH2 sh2s[2];
 
-static void sh2_irq_cb(int id, int level)
+static int REGPARM(2) sh2_irq_cb(SH2 *sh2, int level)
 {
-  // diagnostic for now
-  elprintf(EL_32X, "%csh2 ack %d @ %08x", id ? 's' : 'm', level, sh2_pc(id));
+  if (sh2->pending_irl > sh2->pending_int_irq) {
+    elprintf(EL_32X, "%csh2 ack/irl %d @ %08x",
+      sh2->is_slave ? 's' : 'm', level, sh2->pc);
+    return 64 + sh2->pending_irl / 2;
+  } else {
+    elprintf(EL_32X, "%csh2 ack/int %d/%d @ %08x",
+      sh2->is_slave ? 's' : 'm', level, sh2->pending_int_vector, sh2->pc);
+    sh2->pending_int_irq = 0; // auto-clear
+    sh2->pending_level = sh2->pending_irl;
+    return sh2->pending_int_vector;
+  }
 }
 
 void p32x_update_irls(void)
@@ -38,6 +47,7 @@ void Pico32xStartup(void)
 {
   elprintf(EL_STATUS|EL_32X, "32X startup");
 
+  // TODO: OOM handling
   PicoAHW |= PAHW_32X;
   sh2_init(&msh2, 0);
   msh2.irq_callback = sh2_irq_cb;
@@ -119,8 +129,10 @@ void PicoPower32x(void)
 void PicoUnload32x(void)
 {
   if (Pico32xMem != NULL)
-    free(Pico32xMem);
+    plat_munmap(Pico32xMem, sizeof(*Pico32xMem));
   Pico32xMem = NULL;
+  sh2_finish(&msh2);
+  sh2_finish(&ssh2);
 
   PicoAHW &= ~PAHW_32X;
 }
@@ -153,6 +165,8 @@ static void p32x_start_blank(void)
 
 static __inline void run_m68k(int cyc)
 {
+  pprof_start(m68k);
+
 #if defined(EMU_C68K)
   PicoCpuCM68k.cycles = cyc;
   CycloneRun(&PicoCpuCM68k);
@@ -162,6 +176,8 @@ static __inline void run_m68k(int cyc)
 #elif defined(EMU_F68K)
   SekCycleCnt += fm68k_emulate(cyc+1, 0, 0);
 #endif
+
+  pprof_end(m68k);
 }
 
 // ~1463.8, but due to cache misses and slow mem
@@ -182,10 +198,18 @@ static __inline void run_m68k(int cyc)
     slice = SekCycleCnt - slice; /* real count from 68k */ \
     if (SekCycleCnt < SekCycleAim) \
       elprintf(EL_32X, "slice %d", slice); \
-    if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
+    if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) { \
+      pprof_start(ssh2); \
       sh2_execute(&ssh2, CYCLES_M68K2SH2(slice)); \
-    if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
+      pprof_end(ssh2); \
+    } \
+    if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) { \
+      pprof_start(msh2); \
       sh2_execute(&msh2, CYCLES_M68K2SH2(slice)); \
+      pprof_end(msh2); \
+    } \
+    pprof_start(dummy); \
+    pprof_end(dummy); \
   } \
 }