rework sh2 sync, again..

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index a654c5a..bfdf73a 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -146,6 +146,7 @@ extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame
 #define SekCyclesBurn(c)  SekCycleCnt+=c\r
 #define SekCyclesDone()  (SekCycleAim-SekCyclesLeft)    // number of cycles done in this frame (can be checked anywhere)\r
 #define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom\r
+#define SekCyclesDoneT2() (SekCycleCntT + SekCycleCnt)  // same as above but not from memhandlers\r
 \r
 #define SekEndRun(after) { \\r
        SekCycleCnt -= SekCyclesLeft - (after); \\r
@@ -237,27 +238,31 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]\r
 \r
 #ifndef DRC_SH2\r
-# define ash2_end_run(sh2, after) do { \\r
-  if ((sh2)->icount > (after)) { \\r
+# define sh2_end_run(sh2, after_) do { \\r
+  if ((sh2)->icount > (after_)) { \\r
     (sh2)->cycles_timeslice -= (sh2)->icount; \\r
-    (sh2)->icount = after; \\r
+    (sh2)->icount = after_; \\r
   } \\r
 } while (0)\r
-# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - (sh2)->icount)\r
+# define sh2_cycles_left(sh2) (sh2)->icount\r
 # define sh2_pc(c)    (c) ? ssh2.ppc : msh2.ppc\r
 #else\r
-# define ash2_end_run(sh2, after) do { \\r
-  int left = (sh2)->sr >> 12; \\r
-  if (left > (after)) { \\r
-    (sh2)->cycles_timeslice -= left; \\r
+# define sh2_end_run(sh2, after_) do { \\r
+  int left_ = (signed int)(sh2)->sr >> 12; \\r
+  if (left_ > (after_)) { \\r
+    (sh2)->cycles_timeslice -= left_; \\r
     (sh2)->sr &= 0xfff; \\r
-    (sh2)->sr |= (after) << 12; \\r
+    (sh2)->sr |= (after_) << 12; \\r
   } \\r
 } while (0)\r
-# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - ((sh2)->sr >> 12))\r
+# define sh2_cycles_left(sh2) ((signed int)(sh2)->sr >> 12)\r
 # define sh2_pc(c)    (c) ? ssh2.pc : msh2.pc\r
 #endif\r
 \r
+#define sh2_cycles_done(sh2) ((int)(sh2)->cycles_timeslice - sh2_cycles_left(sh2))\r
+#define sh2_cycles_done_m68k(sh2) \\r
+  ((sh2)->m68krcycles_done + (sh2_cycles_done(sh2) / 3))\r
+\r
 #define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]\r
 #define sh2_gbr(c)    (c) ? ssh2.gbr : msh2.gbr\r
 #define sh2_vbr(c)    (c) ? ssh2.vbr : msh2.vbr\r
@@ -463,12 +468,8 @@ typedef struct
 #define P32XP_FULL  (1<<15) // PWM\r
 #define P32XP_EMPTY (1<<14)\r
 \r
-#define P32XF_68KPOLL   (1 << 0)\r
-#define P32XF_MSH2POLL  (1 << 1)\r
-#define P32XF_SSH2POLL  (1 << 2)\r
-#define P32XF_68KVPOLL  (1 << 3)\r
-#define P32XF_MSH2VPOLL (1 << 4)\r
-#define P32XF_SSH2VPOLL (1 << 5)\r
+#define P32XF_68KCPOLL  (1 << 0)\r
+#define P32XF_68KVPOLL  (1 << 1)\r
 #define P32XF_PWM_PEND  (1 << 6)\r
 \r
 #define P32XI_VRES (1 << 14/2) // IRL/2\r
@@ -737,9 +738,11 @@ void PicoUnload32x(void);
 void PicoFrame32x(void);\r
 void Pico32xStateLoaded(int is_early);\r
 void p32x_sync_sh2s(unsigned int m68k_target);\r
-void p32x_update_irls(int nested_call);\r
+void p32x_sync_other_sh2(SH2 *sh2, unsigned int m68k_target);\r
+void p32x_update_irls(SH2 *active_sh2);\r
 void p32x_reset_sh2s(void);\r
-void p32x_event_schedule(enum p32x_event event, unsigned int now, int after);\r
+void p32x_event_schedule(unsigned int now, enum p32x_event event, int after);\r
+void p32x_event_schedule_sh2(SH2 *sh2, enum p32x_event event, int after);\r
 \r
 // 32x/memory.c\r
 struct Pico32xMem *Pico32xMem;\r
@@ -750,7 +753,8 @@ void PicoWrite16_32x(unsigned int a, unsigned int d);
 void PicoMemSetup32x(void);\r
 void Pico32xSwapDRAM(int b);\r
 void Pico32xMemStateLoaded(void);\r
-void p32x_poll_event(int cpu_mask, int is_vdp);\r
+void p32x_m68k_poll_event(unsigned int flags);\r
+void p32x_sh2_poll_event(SH2 *sh2, unsigned int flags, unsigned int m68k_cycles);\r
 \r
 // 32x/draw.c\r
 void FinalizeLine32xRGB555(int sh, int line);\r
@@ -772,6 +776,7 @@ void p32x_pwm_update(int *buf32, int length, int stereo);
 void p32x_timers_do(unsigned int cycles);\r
 void p32x_timers_recalc(void);\r
 void p32x_pwm_schedule(unsigned int now);\r
+void p32x_pwm_schedule_sh2(SH2 *sh2);\r
 #else\r
 #define Pico32xInit()\r
 #define PicoPower32x()\r
@@ -848,6 +853,45 @@ do { \
 #define pprof_end_sub(...)\r
 #endif\r
 \r
+#ifdef EVT_LOG\r
+enum evt {\r
+  EVT_FRAME_START,\r
+  EVT_NEXT_LINE,\r
+  EVT_RUN_START,\r
+  EVT_RUN_END,\r
+  EVT_POLL_START,\r
+  EVT_POLL_END,\r
+  EVT_CNT\r
+};\r
+\r
+enum evt_cpu {\r
+  EVT_M68K,\r
+  EVT_S68K,\r
+  EVT_MSH2,\r
+  EVT_SSH2,\r
+  EVT_CPU_CNT\r
+};\r
+\r
+void pevt_log(unsigned int cycles, enum evt_cpu c, enum evt e);\r
+void pevt_dump(void);\r
+\r
+#define pevt_log_m68k(e) \\r
+  pevt_log(SekCyclesDoneT(), EVT_M68K, e)\r
+#define pevt_log_m68k_o(e) \\r
+  pevt_log(SekCyclesDoneT2(), EVT_M68K, e)\r
+#define pevt_log_sh2(sh2, e) \\r
+  pevt_log(sh2_cycles_done_m68k(sh2), EVT_MSH2 + (sh2)->is_slave, e)\r
+#define pevt_log_sh2_o(sh2, e) \\r
+  pevt_log((sh2)->m68krcycles_done, EVT_MSH2 + (sh2)->is_slave, e)\r
+#else\r
+#define pevt_log(c, e)\r
+#define pevt_log_m68k(e)\r
+#define pevt_log_m68k_o(e)\r
+#define pevt_log_sh2(sh2, e)\r
+#define pevt_log_sh2_o(sh2, e)\r
+#define pevt_dump()\r
+#endif\r
+\r
 // misc\r
 #ifdef _MSC_VER\r
 #define cdprintf\r