32x: improve irq handling + few bugfixes

[picodrive.git] / cpu / sh2 / mame / sh2pico.c

diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index 167f8cc..233e0a1 100644 (file)
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -74,19 +74,6 @@ void sh2_execute(SH2 *sh2_, int cycles)
        {
                UINT32 opcode;
 
-               /* FIXME: Darxide doesn't like this */
-               if (sh2->test_irq && !sh2->delay && sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
-               {
-                       if (sh2->pending_irl > sh2->pending_int_irq)
-                               sh2_do_irq(sh2, sh2->pending_irl, 64 + sh2->pending_irl/2);
-                       else {
-                               sh2_do_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
-                               sh2->pending_int_irq = 0; // auto-clear
-                               sh2->pending_level = sh2->pending_irl;
-                       }
-                       sh2->test_irq = 0;
-               }
-
                if (sh2->delay)
                {
                        sh2->ppc = sh2->delay;
@@ -123,6 +110,15 @@ void sh2_execute(SH2 *sh2_, int cycles)
                }
 
                sh2->icount--;
+
+               if (sh2->test_irq && !sh2->delay && sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
+               {
+                       int level = sh2->pending_level;
+                       int vector = sh2->irq_callback(sh2, level);
+                       sh2_do_irq(sh2, level, vector);
+                       sh2->test_irq = 0;
+               }
+
        }
        while (sh2->icount > 0 || sh2->delay);  /* can't interrupt before delay */