32x: rework scheduling/timing

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index f5b4cd4..8d1a337 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -237,13 +237,22 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]\r
 \r
 #ifndef DRC_SH2\r
-# define ash2_end_run(after) if (sh2->icount > (after)) sh2->icount = after\r
+# define ash2_end_run(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
 #else\r
-# define ash2_end_run(after) { \\r
-   if ((sh2->sr >> 12) > (after)) \\r
-     { sh2->sr &= 0xfff; sh2->sr |= (after) << 12; } \\r
-}\r
+# define ash2_end_run(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
+  } \\r
+} while (0)\r
 # define ash2_cycles_done() (sh2->cycles_timeslice - (sh2->sr >> 12))\r
 #endif\r
 \r
@@ -460,6 +469,7 @@ typedef struct
 #define P32XF_68KVPOLL  (1 << 3)\r
 #define P32XF_MSH2VPOLL (1 << 4)\r
 #define P32XF_SSH2VPOLL (1 << 5)\r
+#define P32XF_PWM_PEND  (1 << 6)\r
 \r
 #define P32XI_VRES (1 << 14/2) // IRL/2\r
 #define P32XI_VINT (1 << 12/2)\r
@@ -493,7 +503,10 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];\r
   unsigned int dmac_ptr;\r
   unsigned int pwm_irq_sample_cnt;\r
-  unsigned int reserved[9];\r
+  unsigned char comm_dirty_68k;\r
+  unsigned char comm_dirty_sh2;\r
+  unsigned short pad;\r
+  unsigned int reserved[8];\r
 };\r
 \r
 struct Pico32xMem\r
@@ -719,6 +732,13 @@ void p32x_sync_sh2s(unsigned int m68k_target);
 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
 struct Pico32xMem *Pico32xMem;\r
 unsigned int PicoRead8_32x(unsigned int a);\r
@@ -747,9 +767,9 @@ extern int Pico32xDrawMode;
 unsigned int p32x_pwm_read16(unsigned int a);\r
 void p32x_pwm_write16(unsigned int a, unsigned int d);\r
 void p32x_pwm_update(int *buf32, int length, int stereo);\r
-void p32x_timers_do(int line_call);\r
+void p32x_timers_do(unsigned int cycles);\r
 void p32x_timers_recalc(void);\r
-extern int pwm_frame_smp_cnt;\r
+void p32x_pwm_schedule(unsigned int now);\r
 #else\r
 #define Pico32xInit()\r
 #define PicoPower32x()\r
@@ -805,10 +825,10 @@ static __inline int isspace_(int c)
 \r
 #if EL_LOGMASK\r
 #define elprintf(w,f,...) \\r
-{ \\r
+do { \\r
        if ((w) & EL_LOGMASK) \\r
                lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \\r
-}\r
+} while (0)\r
 #elif defined(_MSC_VER)\r
 #define elprintf\r
 #else\r