drc: debug improvements

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 8d1a337..a654c5a 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -237,27 +237,27 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]\r
 \r
 #ifndef DRC_SH2\r
-# define ash2_end_run(after) do { \\r
-  if (sh2->icount > (after)) { \\r
-    sh2->cycles_timeslice -= sh2->icount; \\r
-    sh2->icount = after; \\r
+# define ash2_end_run(sh2, after) do { \\r
+  if ((sh2)->icount > (after)) { \\r
+    (sh2)->cycles_timeslice -= (sh2)->icount; \\r
+    (sh2)->icount = after; \\r
   } \\r
 } while (0)\r
-# define ash2_cycles_done() (sh2->cycles_timeslice - sh2->icount)\r
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - (sh2)->icount)\r
+# define sh2_pc(c)    (c) ? ssh2.ppc : msh2.ppc\r
 #else\r
-# define ash2_end_run(after) do { \\r
-  int left = sh2->sr >> 12; \\r
+# define ash2_end_run(sh2, after) do { \\r
+  int left = (sh2)->sr >> 12; \\r
   if (left > (after)) { \\r
-    sh2->cycles_timeslice -= left; \\r
-    sh2->sr &= 0xfff; \\r
-    sh2->sr |= (after) << 12; \\r
+    (sh2)->cycles_timeslice -= left; \\r
+    (sh2)->sr &= 0xfff; \\r
+    (sh2)->sr |= (after) << 12; \\r
   } \\r
 } while (0)\r
-# define ash2_cycles_done() (sh2->cycles_timeslice - (sh2->sr >> 12))\r
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - ((sh2)->sr >> 12))\r
+# define sh2_pc(c)    (c) ? ssh2.pc : msh2.pc\r
 #endif\r
 \r
-//#define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc\r
-#define sh2_pc(c)     (c) ? ssh2.pc : msh2.pc\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
@@ -722,21 +722,23 @@ void PicoFrameDrawOnlyMS(void);
 // 32x/32x.c\r
 #ifndef NO_32X\r
 extern struct Pico32x Pico32x;\r
+enum p32x_event {\r
+  P32X_EVENT_PWM,\r
+  P32X_EVENT_FILLEND,\r
+  P32X_EVENT_COUNT,\r
+};\r
+extern unsigned int event_times[P32X_EVENT_COUNT];\r
+\r
 void Pico32xInit(void);\r
 void PicoPower32x(void);\r
 void PicoReset32x(void);\r
 void Pico32xStartup(void);\r
 void PicoUnload32x(void);\r
 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_reset_sh2s(void);\r
-\r
-enum p32x_event {\r
-  P32X_EVENT_PWM,\r
-  P32X_EVENT_FILLEND,\r
-  P32X_EVENT_COUNT,\r
-};\r
 void p32x_event_schedule(enum p32x_event event, unsigned int now, int after);\r
 \r
 // 32x/memory.c\r
@@ -747,7 +749,7 @@ void PicoWrite8_32x(unsigned int a, unsigned int d);
 void PicoWrite16_32x(unsigned int a, unsigned int d);\r
 void PicoMemSetup32x(void);\r
 void Pico32xSwapDRAM(int b);\r
-void Pico32xStateLoaded(void);\r
+void Pico32xMemStateLoaded(void);\r
 void p32x_poll_event(int cpu_mask, int is_vdp);\r
 \r
 // 32x/draw.c\r