32x: rework scheduling/timing

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

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index e15259d..4603e84 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -52,22 +52,32 @@ typedef struct SH2_
        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
-       unsigned int    cycles_done;\r
+       unsigned int    cycles_timeslice;\r
+\r
+       // we use 68k reference cycles for easier sync\r
+       unsigned int    m68krcycles_done;\r
+       unsigned int    mult_m68k_to_sh2;\r
+       unsigned int    mult_sh2_to_m68k;\r
 } SH2;\r
 \r
+#define CYCLE_MULT_SHIFT 10\r
+#define C_M68K_TO_SH2(xsh2, c) \\r
+       ((int)((c) * (xsh2).mult_m68k_to_sh2) >> CYCLE_MULT_SHIFT)\r
+#define C_SH2_TO_M68K(xsh2, c) \\r
+       ((int)((c + 3) * (xsh2).mult_sh2_to_m68k) >> CYCLE_MULT_SHIFT)\r
+\r
 extern SH2 *sh2; // active sh2. XXX: consider removing\r
 \r
 int  sh2_init(SH2 *sh2, int is_slave);\r
 void sh2_finish(SH2 *sh2);\r
 void sh2_reset(SH2 *sh2);\r
-void sh2_irl_irq(SH2 *sh2, int level, int nested_call);\r
+int  sh2_irl_irq(SH2 *sh2, int level, int nested_call);\r
 void sh2_internal_irq(SH2 *sh2, int level, int vector);\r
 void sh2_do_irq(SH2 *sh2, int level, int vector);\r
 void sh2_pack(const SH2 *sh2, unsigned char *buff);\r
 void sh2_unpack(SH2 *sh2, const unsigned char *buff);\r
 \r
-void sh2_execute(SH2 *sh2, int cycles);\r
+int  sh2_execute(SH2 *sh2, int cycles);\r
 \r
 // regs, pending_int*, cycles, reserved\r
 #define SH2_STATE_SIZE ((24 + 2 + 2 + 12) * 4)\r