X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.h;h=a69a159d3b4cc4295acf9f56d5453b303dd2d351;hb=1f1ff763e661bab664151c4821c65dad35777976;hp=975b07795b775dc5101f8a9a53bc6027f6c4ca7c;hpb=e898de13cdd5416507675f175958204c5e9f27e9;p=picodrive.git

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 975b077..a69a159 100644
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,17 +1,20 @@
 #ifndef __SH2_H__
 #define __SH2_H__
 
-// pico memhandlers
-// XXX: move somewhere else
-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);
+#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
+typedef struct SH2_
 {
 	unsigned int	r[16];		// 00
 	unsigned int	pc;		// 40
@@ -21,34 +24,56 @@ typedef struct
 	unsigned int	gbr, vbr;	// 50
 	unsigned int	mach, macl;	// 58
 
+	// common
+	const void	*read8_map;	// 60
+	const void	*read16_map;
+	const void	**write8_tab;
+	const void	**write16_tab;
+
+	// drc stuff
+	int		drc_tmp;	// 70
+	int		irq_cycles;
+	void		*p_bios;	// convenience pointers
+	void		*p_da;
+	void		*p_sdram;	// 80
+	void		*p_rom;
+	unsigned int	pdb_io_csum[2];
+
 	// interpreter stuff
-	int		icount;		// 60 cycles left in current timeslice
+	int		icount;		// cycles left in current timeslice
 	unsigned int	ea;
 	unsigned int	delay;
 	unsigned int	test_irq;
 
-	// drc stuff
-	void	**pc_hashtab;		// 70
-
-	// common
+	int	pending_level;		// MAX(pending_irl, pending_int_irq)
 	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
 	unsigned int	cycles_done;
 } SH2;
 
-extern SH2 *sh2; // active sh2
+extern SH2 *sh2; // active sh2. XXX: consider removing
 
 int  sh2_init(SH2 *sh2, int is_slave);
 void sh2_finish(SH2 *sh2);
 void sh2_reset(SH2 *sh2);
-void sh2_irl_irq(SH2 *sh2, int level);
+void sh2_irl_irq(SH2 *sh2, int level, int nested_call);
 void sh2_internal_irq(SH2 *sh2, int level, int vector);
+void sh2_do_irq(SH2 *sh2, int level, int vector);
 
 void sh2_execute(SH2 *sh2, int cycles);
 
+// pico memhandlers
+// XXX: move somewhere else
+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);
+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__ */