32x: rework scheduling/timing

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

diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c
index 937f8e4..7b9f9a1 100644 (file)
--- a/cpu/sh2/sh2.c
+++ b/cpu/sh2/sh2.c
@@ -63,23 +63,27 @@ void sh2_do_irq(SH2 *sh2, int level, int vector)
 //     sh2->icount -= 13;
 }
 
-void sh2_irl_irq(SH2 *sh2, int level, int nested_call)
+int sh2_irl_irq(SH2 *sh2, int level, int nested_call)
 {
+       int taken;
+
        sh2->pending_irl = level;
        if (level < sh2->pending_int_irq)
                level = sh2->pending_int_irq;
        sh2->pending_level = level;
 
-       if (!nested_call) {
-               // not in memhandler, so handle this now (recompiler friendly)
-               // do this to avoid missing irqs that other SH2 might clear
-               if (level > ((sh2->sr >> 4) & 0x0f)) {
+       taken = (level > ((sh2->sr >> 4) & 0x0f));
+       if (taken) {
+               if (!nested_call) {
+                       // not in memhandler, so handle this now (recompiler friendly)
+                       // do this to avoid missing irqs that other SH2 might clear
                        int vector = sh2->irq_callback(sh2, level);
                        sh2_do_irq(sh2, level, vector);
                }
+               else
+                       sh2->test_irq = 1;
        }
-       else
-               sh2->test_irq = 1;
+       return taken;
 }
 
 void sh2_internal_irq(SH2 *sh2, int level, int vector)