32x: drc: inline dispatcher and irq handling; do write-caused irqs

[picodrive.git] / cpu / sh2 / sh2.h

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 9d6f0d2..074b142 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,6 +1,12 @@
 #ifndef __SH2_H__\r
 #define __SH2_H__\r
 \r
+#if !defined(REGPARM) && defined(__i386__) \r
+#define REGPARM(x) __attribute__((regparm(x)))\r
+#else\r
+#define REGPARM(x)\r
+#endif\r
+\r
 // registers - matches structure order\r
 typedef enum {\r
   SHR_R0 = 0, SHR_SP = 15,\r
@@ -8,7 +14,7 @@ typedef enum {
   SHR_GBR, SHR_VBR, SHR_MACH, SHR_MACL,\r
 } sh2_reg_e;\r
 \r
-typedef struct\r
+typedef struct SH2_\r
 {\r
        unsigned int    r[16];          // 00\r
        unsigned int    pc;             // 40\r
@@ -26,6 +32,7 @@ typedef struct
 \r
        // drc stuff\r
        int             drc_tmp;        // 70\r
+       int             irq_cycles;\r
 \r
        // interpreter stuff\r
        int             icount;         // cycles left in current timeslice\r
@@ -37,7 +44,7 @@ typedef struct
        int     pending_irl;\r
        int     pending_int_irq;        // internal irq\r
        int     pending_int_vector;\r
-       void    (*irq_callback)(int id, int level);\r
+       int     REGPARM(2) (*irq_callback)(struct SH2_ *sh2, int level);\r
        int     is_slave;\r
 \r
        unsigned int    cycles_aim;     // subtract sh2_icount to get global counter\r
@@ -57,17 +64,11 @@ void sh2_execute(SH2 *sh2, int cycles);
 \r
 // pico memhandlers\r
 // XXX: move somewhere else\r
-#if !defined(REGPARM) && defined(__i386__) \r
-#define REGPARM(x) __attribute__((regparm(x)))\r
-#else\r
-#define REGPARM(x)\r
-#endif\r
-\r
 unsigned int REGPARM(2) p32x_sh2_read8(unsigned int a, SH2 *sh2);\r
 unsigned int REGPARM(2) p32x_sh2_read16(unsigned int a, SH2 *sh2);\r
 unsigned int REGPARM(2) p32x_sh2_read32(unsigned int a, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write8(unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
+int REGPARM(3) p32x_sh2_write8 (unsigned int a, unsigned int d, SH2 *sh2);\r
+int REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
+int REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
 \r
 #endif /* __SH2_H__ */\r