X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fmame%2Fsh2pico.c;h=d78831600e6a5625ba66022d07f903c073a4b53d;hb=ed4402a7dfd12dbbf34c547b438a671ae8114197;hp=167f8cc2e84f6d6cfc846edd7947ba6c6a72fbb4;hpb=71f68165b6e50f58ddbc6e98a38c7dd4968ccca2;p=picodrive.git

diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index 167f8cc..d788316 100644
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -61,32 +61,20 @@ static unsigned int op_refs[0x10000];
 
 #ifndef DRC_SH2
 
-void sh2_execute(SH2 *sh2_, int cycles)
+int sh2_execute(SH2 *sh2_, int cycles)
 {
 	sh2 = sh2_;
-	sh2->cycles_aim += cycles;
-	sh2->icount = cycles = sh2->cycles_aim - sh2->cycles_done;
+	sh2->icount = cycles;
 
 	if (sh2->icount <= 0)
-		return;
+		return cycles;
+
+	sh2->cycles_timeslice = cycles;
 
 	do
 	{
 		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,10 +111,19 @@ 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 */
 
-	sh2->cycles_done += cycles - sh2->icount;
+	return sh2->cycles_timeslice - sh2->icount;
 }
 
 #else // DRC_SH2