32x: watchdog for Star Wars, SCI IRQs for X-men (also needs idle loop hacks)

[picodrive.git] / cpu / sh2mame / sh2pico.c

diff --git a/cpu/sh2mame/sh2pico.c b/cpu/sh2mame/sh2pico.c
index c6f87ea..527b2fa 100644 (file)
--- a/cpu/sh2mame/sh2pico.c
+++ b/cpu/sh2mame/sh2pico.c
@@ -9,19 +9,19 @@ typedef unsigned short UINT16;
 typedef unsigned char  UINT8;
 
 // pico memhandlers
-unsigned int pico32x_read8(unsigned int a);
-unsigned int pico32x_read16(unsigned int a);
-unsigned int pico32x_read32(unsigned int a);
-void pico32x_write8(unsigned int a, unsigned int d);
-void pico32x_write16(unsigned int a, unsigned int d);
-void pico32x_write32(unsigned int a, unsigned int d);
-
-#define RB pico32x_read8
-#define RW pico32x_read16
-#define RL pico32x_read32
-#define WB pico32x_write8
-#define WW pico32x_write16
-#define WL pico32x_write32
+unsigned int p32x_sh2_read8(unsigned int a, int id);
+unsigned int p32x_sh2_read16(unsigned int a, int id);
+unsigned int p32x_sh2_read32(unsigned int a, int id);
+void p32x_sh2_write8(unsigned int a, unsigned int d, int id);
+void p32x_sh2_write16(unsigned int a, unsigned int d, int id);
+void p32x_sh2_write32(unsigned int a, unsigned int d, int id);
+
+#define RB(a) p32x_sh2_read8(a,sh2->is_slave)
+#define RW(a) p32x_sh2_read16(a,sh2->is_slave)
+#define RL(a) p32x_sh2_read32(a,sh2->is_slave)
+#define WB(a,d) p32x_sh2_write8(a,d,sh2->is_slave)
+#define WW(a,d) p32x_sh2_write16(a,d,sh2->is_slave)
+#define WL(a,d) p32x_sh2_write32(a,d,sh2->is_slave)
 
 // some stuff from sh2comn.h
 #define T      0x00000001
@@ -42,21 +42,38 @@ void pico32x_write32(unsigned int a, unsigned int d);
 void sh2_reset(SH2 *sh2)
 {
        int save_is_slave;
-//     cpu_irq_callback save_irqcallback;
+       void *save_irqcallback;
 
-//     save_irqcallback = sh2->irq_callback;
+       save_irqcallback = sh2->irq_callback;
        save_is_slave = sh2->is_slave;
 
        memset(sh2, 0, sizeof(SH2));
 
        sh2->is_slave = save_is_slave;
-//     sh2->irq_callback = save_irqcallback;
+       sh2->irq_callback = save_irqcallback;
 
        sh2->pc = RL(0);
        sh2->r[15] = RL(4);
        sh2->sr = I;
+}
+
+static void sh2_do_irq(SH2 *sh2, int level, int vector)
+{
+       sh2->irq_callback(sh2->is_slave, level);
+
+       sh2->r[15] -= 4;
+       WL(sh2->r[15], sh2->sr);                /* push SR onto stack */
+       sh2->r[15] -= 4;
+       WL(sh2->r[15], sh2->pc);                /* push PC onto stack */
+
+       /* set I flags in SR */
+       sh2->sr = (sh2->sr & ~I) | (level << 4);
 
-       sh2->internal_irq_level = -1;
+       /* fetch PC */
+       sh2->pc = RL(sh2->vbr + vector * 4);
+
+       /* 13 cycles at best */
+       sh2_icount -= 13;
 }
 
 /* Execute cycles - returns number of cycles actually run */
@@ -64,16 +81,26 @@ int sh2_execute(SH2 *sh2_, int cycles)
 {
        sh2 = sh2_;
        sh2_icount = cycles;
+       sh2->cycles_aim += cycles;
 
        do
        {
                UINT32 opcode;
 
-               opcode = RW(sh2->pc);
+               if (sh2->delay)
+               {
+                       sh2->ppc = sh2->delay;
+                       opcode = RW(sh2->delay);
+                       sh2->pc -= 2;
+               }
+               else
+               {
+                       sh2->ppc = sh2->pc;
+                       opcode = RW(sh2->pc);
+               }
 
                sh2->delay = 0;
                sh2->pc += 2;
-               sh2->ppc = sh2->pc;
 
                switch (opcode & ( 15 << 12))
                {
@@ -97,19 +124,42 @@ int sh2_execute(SH2 *sh2_, int cycles)
 
                if (sh2->test_irq && !sh2->delay)
                {
-//                     CHECK_PENDING_IRQ("mame_sh2_execute");
+                       if (sh2->pending_irl > sh2->pending_int_irq)
+                               sh2_irl_irq(sh2, sh2->pending_irl);
+                       else
+                               sh2_internal_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
                        sh2->test_irq = 0;
                }
                sh2_icount--;
        }
-       while (sh2_icount > 0);
+       while (sh2_icount > 0 || sh2->delay);   /* can't interrupt before delay */
 
        return cycles - sh2_icount;
 }
 
-void sh2_init(SH2 *sh2)
+void sh2_init(SH2 *sh2, int is_slave)
 {
        memset(sh2, 0, sizeof(*sh2));
+       sh2->is_slave = is_slave;
+}
+
+void sh2_irl_irq(SH2 *sh2, int level)
+{
+       sh2->pending_irl = level;
+       if (level <= ((sh2->sr >> 4) & 0x0f))
+               return;
+
+       sh2_do_irq(sh2, level, 64 + level/2);
 }
 
+void sh2_internal_irq(SH2 *sh2, int level, int vector)
+{
+       sh2->pending_int_irq = level;
+       sh2->pending_int_vector = vector;
+       if (level <= ((sh2->sr >> 4) & 0x0f))
+               return;
+
+       sh2_do_irq(sh2, level, vector);
+       sh2->pending_int_irq = 0; // auto-clear
+}