32x: start reworking sheduling

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

diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index a65638b..d788316 100644 (file)
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -61,28 +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))
-               {
-                       int level = sh2->pending_level;
-                       int vector = sh2->irq_callback(sh2, level);
-                       sh2_do_irq(sh2, level, vector);
-                       sh2->test_irq = 0;
-               }
-
                if (sh2->delay)
                {
                        sh2->ppc = sh2->delay;
@@ -119,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