X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.h;h=92774d00a2f2e4d4bb12fce330bbe9435abf36f7;hb=5f0ca48fedc1517d849df86085bc8d1c59780ed8;hp=a91a597e77b704d17891f5360189dddc33534b37;hpb=04092e329bbd050073d42defcd609550d8545e74;p=picodrive.git

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index a91a597..92774d0 100644
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -52,20 +52,33 @@ typedef struct SH2_
 	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;
+	unsigned int	cycles_timeslice;
+
+	// we use 68k reference cycles for easier sync
+	unsigned int	m68krcycles_done;
+	unsigned int	mult_m68k_to_sh2;
+	unsigned int	mult_sh2_to_m68k;
 } SH2;
 
-extern SH2 *sh2; // active sh2. XXX: consider removing
+#define CYCLE_MULT_SHIFT 10
+#define C_M68K_TO_SH2(xsh2, c) \
+	((int)((c) * (xsh2).mult_m68k_to_sh2) >> CYCLE_MULT_SHIFT)
+#define C_SH2_TO_M68K(xsh2, c) \
+	((int)((c + 3) * (xsh2).mult_sh2_to_m68k) >> CYCLE_MULT_SHIFT)
 
 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);
+int  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_pack(const SH2 *sh2, unsigned char *buff);
+void sh2_unpack(SH2 *sh2, const unsigned char *buff);
+
+int  sh2_execute(SH2 *sh2, int cycles);
 
-void sh2_execute(SH2 *sh2, int cycles);
+// regs, pending_int*, cycles, reserved
+#define SH2_STATE_SIZE ((24 + 2 + 2 + 12) * 4)
 
 // pico memhandlers
 // XXX: move somewhere else
@@ -76,4 +89,10 @@ 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);
 
+// debug
+#ifdef DRC_CMP
+void do_sh2_trace(SH2 *current, int cycles);
+void do_sh2_cmp(SH2 *current);
+#endif
+
 #endif /* __SH2_H__ */