X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.c;h=cd07bef801b5576261a56b210dad50dc254117e6;hb=c18edb34e6708b399c6bfee8dac7b21a62988643;hp=8ba5673d52b19566841c887bbd8cbebc8ace8de2;hpb=e898de13cdd5416507675f175958204c5e9f27e9;p=picodrive.git

diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c
index 8ba5673..cd07bef 100644
--- a/cpu/sh2/sh2.c
+++ b/cpu/sh2/sh2.c
@@ -25,27 +25,27 @@ void sh2_finish(SH2 *sh2)
 
 void sh2_reset(SH2 *sh2)
 {
-	sh2->pc = p32x_sh2_read32(0, sh2->is_slave);
-	sh2->r[15] = p32x_sh2_read32(4, sh2->is_slave);
+	sh2->pc = p32x_sh2_read32(0, sh2);
+	sh2->r[15] = p32x_sh2_read32(4, sh2);
 	sh2->sr = I;
 	sh2->vbr = 0;
 	sh2->pending_int_irq = 0;
 }
 
-static void sh2_do_irq(SH2 *sh2, int level, int vector)
+void sh2_do_irq(SH2 *sh2, int level, int vector)
 {
 	sh2->irq_callback(sh2->is_slave, level);
 
 	sh2->r[15] -= 4;
-	p32x_sh2_write32(sh2->r[15], sh2->sr, sh2->is_slave);	/* push SR onto stack */
+	p32x_sh2_write32(sh2->r[15], sh2->sr, sh2);	/* push SR onto stack */
 	sh2->r[15] -= 4;
-	p32x_sh2_write32(sh2->r[15], sh2->pc, sh2->is_slave);	/* push PC onto stack */
+	p32x_sh2_write32(sh2->r[15], sh2->pc, sh2);	/* push PC onto stack */
 
 	/* set I flags in SR */
 	sh2->sr = (sh2->sr & ~I) | (level << 4);
 
 	/* fetch PC */
-	sh2->pc = p32x_sh2_read32(sh2->vbr + vector * 4, sh2->is_slave);
+	sh2->pc = p32x_sh2_read32(sh2->vbr + vector * 4, sh2);
 
 	/* 13 cycles at best */
 	sh2->cycles_done += 13;
@@ -55,20 +55,23 @@ static void sh2_do_irq(SH2 *sh2, int level, int vector)
 void sh2_irl_irq(SH2 *sh2, int level)
 {
 	sh2->pending_irl = level;
-	if (level <= ((sh2->sr >> 4) & 0x0f))
-		return;
+	if (level > sh2->pending_int_irq)
+		sh2->pending_level = level;
+	else
+		sh2->pending_level = sh2->pending_int_irq;
 
-	sh2_do_irq(sh2, level, 64 + level/2);
+	sh2->test_irq = 1;
 }
 
 void sh2_internal_irq(SH2 *sh2, int level, int vector)
 {
+	// FIXME: multiple internal irqs not handled..
+	// assuming internal irqs never clear until accepted
 	sh2->pending_int_irq = level;
 	sh2->pending_int_vector = vector;
-	if (level <= ((sh2->sr >> 4) & 0x0f))
-		return;
+	if (level > sh2->pending_level)
+		sh2->pending_level = level;
 
-	sh2_do_irq(sh2, level, vector);
-	sh2->pending_int_irq = 0; // auto-clear
+	sh2->test_irq = 1;
 }