X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.c;h=80c458fcff18ac50e6da2c9b2f2050f2943ce0c5;hb=1f1ff763e661bab664151c4821c65dad35777976;hp=a873d18380ef63b2b1cb09c8ac8beae2b7c89b39;hpb=04092e329bbd050073d42defcd609550d8545e74;p=picodrive.git diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c index a873d18..80c458f 100644 --- a/cpu/sh2/sh2.c +++ b/cpu/sh2/sh2.c @@ -54,15 +54,23 @@ void sh2_do_irq(SH2 *sh2, int level, int vector) // sh2->icount -= 13; } -void sh2_irl_irq(SH2 *sh2, int level) +void sh2_irl_irq(SH2 *sh2, int level, int nested_call) { sh2->pending_irl = level; - if (level > sh2->pending_int_irq) - sh2->pending_level = level; - else - sh2->pending_level = sh2->pending_int_irq; + if (level < sh2->pending_int_irq) + level = sh2->pending_int_irq; + sh2->pending_level = level; - sh2->test_irq = 1; + 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)) { + int vector = sh2->irq_callback(sh2, level); + sh2_do_irq(sh2, level, vector); + } + } + else + sh2->test_irq = 1; } void sh2_internal_irq(SH2 *sh2, int level, int vector)