X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.h;h=47c6150097d07a981bcab9579c8903981879cdba;hb=2368651527f2b14e24b7df5f7db3d95dc5bfbd3a;hp=8e9f3b057947ae9d98a05004feee3183c191f21d;hpb=f0d7b1faa17e6e0e21c04db2e1b46ae33a808e11;p=picodrive.git

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 8e9f3b0..47c6150 100644
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,7 +1,20 @@
 #ifndef __SH2_H__
 #define __SH2_H__
 
-typedef struct
+#if !defined(REGPARM) && defined(__i386__) 
+#define REGPARM(x) __attribute__((regparm(x)))
+#else
+#define REGPARM(x)
+#endif
+
+// registers - matches structure order
+typedef enum {
+  SHR_R0 = 0, SHR_SP = 15,
+  SHR_PC,  SHR_PPC, SHR_PR,   SHR_SR,
+  SHR_GBR, SHR_VBR, SHR_MACH, SHR_MACL,
+} sh2_reg_e;
+
+typedef struct SH2_
 {
 	unsigned int	r[16];		// 00
 	unsigned int	pc;		// 40
@@ -19,6 +32,11 @@ typedef struct
 
 	// drc stuff
 	int		drc_tmp;	// 70
+	int		irq_cycles;
+	void		*p_bios;	// convenience pointers
+	void		*p_da;
+	void		*p_sdram;
+	void		*p_rom;
 
 	// interpreter stuff
 	int		icount;		// cycles left in current timeslice
@@ -30,7 +48,7 @@ typedef struct
 	int	pending_irl;
 	int	pending_int_irq;	// internal irq
 	int	pending_int_vector;
-	void	(*irq_callback)(int id, int level);
+	int	REGPARM(2) (*irq_callback)(struct SH2_ *sh2, int level);
 	int	is_slave;
 
 	unsigned int	cycles_aim;	// subtract sh2_icount to get global counter
@@ -50,17 +68,11 @@ void sh2_execute(SH2 *sh2, int cycles);
 
 // pico memhandlers
 // XXX: move somewhere else
-#if !defined(REGPARM) && defined(__i386__) 
-#define REGPARM(x) __attribute__((regparm(x)))
-#else
-#define REGPARM(x)
-#endif
-
 unsigned int REGPARM(2) p32x_sh2_read8(unsigned int a, SH2 *sh2);
 unsigned int REGPARM(2) p32x_sh2_read16(unsigned int a, SH2 *sh2);
 unsigned int REGPARM(2) p32x_sh2_read32(unsigned int a, SH2 *sh2);
-void REGPARM(3) p32x_sh2_write8(unsigned int a, unsigned int d, SH2 *sh2);
-void REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);
-void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);
+int REGPARM(3) p32x_sh2_write8 (unsigned int a, unsigned int d, SH2 *sh2);
+int REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);
+int REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);
 
 #endif /* __SH2_H__ */