X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=a654c5aa92779502dc24bd1681932a2080d60d92;hb=6d7979571d08d7b020022fa169a34a29fc20dfdc;hp=f5b4cd4733399d02334e786a8ea7c89971b99d30;hpb=ed4402a7dfd12dbbf34c547b438a671ae8114197;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index f5b4cd4..a654c5a 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -237,18 +237,27 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]
 
 #ifndef DRC_SH2
-# define ash2_end_run(after) if (sh2->icount > (after)) sh2->icount = after
-# define ash2_cycles_done() (sh2->cycles_timeslice - sh2->icount)
+# define ash2_end_run(sh2, after) do { \
+  if ((sh2)->icount > (after)) { \
+    (sh2)->cycles_timeslice -= (sh2)->icount; \
+    (sh2)->icount = after; \
+  } \
+} while (0)
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - (sh2)->icount)
+# define sh2_pc(c)    (c) ? ssh2.ppc : msh2.ppc
 #else
-# define ash2_end_run(after) { \
-   if ((sh2->sr >> 12) > (after)) \
-     { sh2->sr &= 0xfff; sh2->sr |= (after) << 12; } \
-}
-# define ash2_cycles_done() (sh2->cycles_timeslice - (sh2->sr >> 12))
+# define ash2_end_run(sh2, after) do { \
+  int left = (sh2)->sr >> 12; \
+  if (left > (after)) { \
+    (sh2)->cycles_timeslice -= left; \
+    (sh2)->sr &= 0xfff; \
+    (sh2)->sr |= (after) << 12; \
+  } \
+} while (0)
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - ((sh2)->sr >> 12))
+# define sh2_pc(c)    (c) ? ssh2.pc : msh2.pc
 #endif
 
-//#define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc
-#define sh2_pc(c)     (c) ? ssh2.pc : msh2.pc
 #define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]
 #define sh2_gbr(c)    (c) ? ssh2.gbr : msh2.gbr
 #define sh2_vbr(c)    (c) ? ssh2.vbr : msh2.vbr
@@ -460,6 +469,7 @@ typedef struct
 #define P32XF_68KVPOLL  (1 << 3)
 #define P32XF_MSH2VPOLL (1 << 4)
 #define P32XF_SSH2VPOLL (1 << 5)
+#define P32XF_PWM_PEND  (1 << 6)
 
 #define P32XI_VRES (1 << 14/2) // IRL/2
 #define P32XI_VINT (1 << 12/2)
@@ -493,7 +503,10 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];
   unsigned int dmac_ptr;
   unsigned int pwm_irq_sample_cnt;
-  unsigned int reserved[9];
+  unsigned char comm_dirty_68k;
+  unsigned char comm_dirty_sh2;
+  unsigned short pad;
+  unsigned int reserved[8];
 };
 
 struct Pico32xMem
@@ -709,15 +722,24 @@ void PicoFrameDrawOnlyMS(void);
 // 32x/32x.c
 #ifndef NO_32X
 extern struct Pico32x Pico32x;
+enum p32x_event {
+  P32X_EVENT_PWM,
+  P32X_EVENT_FILLEND,
+  P32X_EVENT_COUNT,
+};
+extern unsigned int event_times[P32X_EVENT_COUNT];
+
 void Pico32xInit(void);
 void PicoPower32x(void);
 void PicoReset32x(void);
 void Pico32xStartup(void);
 void PicoUnload32x(void);
 void PicoFrame32x(void);
+void Pico32xStateLoaded(int is_early);
 void p32x_sync_sh2s(unsigned int m68k_target);
 void p32x_update_irls(int nested_call);
 void p32x_reset_sh2s(void);
+void p32x_event_schedule(enum p32x_event event, unsigned int now, int after);
 
 // 32x/memory.c
 struct Pico32xMem *Pico32xMem;
@@ -727,7 +749,7 @@ void PicoWrite8_32x(unsigned int a, unsigned int d);
 void PicoWrite16_32x(unsigned int a, unsigned int d);
 void PicoMemSetup32x(void);
 void Pico32xSwapDRAM(int b);
-void Pico32xStateLoaded(void);
+void Pico32xMemStateLoaded(void);
 void p32x_poll_event(int cpu_mask, int is_vdp);
 
 // 32x/draw.c
@@ -747,9 +769,9 @@ extern int Pico32xDrawMode;
 unsigned int p32x_pwm_read16(unsigned int a);
 void p32x_pwm_write16(unsigned int a, unsigned int d);
 void p32x_pwm_update(int *buf32, int length, int stereo);
-void p32x_timers_do(int line_call);
+void p32x_timers_do(unsigned int cycles);
 void p32x_timers_recalc(void);
-extern int pwm_frame_smp_cnt;
+void p32x_pwm_schedule(unsigned int now);
 #else
 #define Pico32xInit()
 #define PicoPower32x()
@@ -805,10 +827,10 @@ static __inline int isspace_(int c)
 
 #if EL_LOGMASK
 #define elprintf(w,f,...) \
-{ \
+do { \
 	if ((w) & EL_LOGMASK) \
 		lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
-}
+} while (0)
 #elif defined(_MSC_VER)
 #define elprintf
 #else