#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
#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
#endif\r
\r
//#define sh2_pc(c) (c) ? ssh2.ppc : msh2.ppc\r
// 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 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