32x: fix some more timing problems

[picodrive.git] / pico / 32x / pwm.c

diff --git a/pico/32x/pwm.c b/pico/32x/pwm.c
index 5684924..abe745e 100644 (file)
--- a/pico/32x/pwm.c
+++ b/pico/32x/pwm.c
@@ -12,15 +12,10 @@ static int pwm_mult;
 static int pwm_ptr;
 static int pwm_irq_reload;
 
-static int timer_cycles[2];
-static int timer_tick_cycles[2];
-
-// timers. This includes PWM timer in 32x and internal SH2 timers
-void p32x_timers_recalc(void)
+void p32x_pwm_ctl_changed(void)
 {
   int control = Pico32x.regs[0x30 / 2];
   int cycles = Pico32x.regs[0x32 / 2];
-  int tmp, i;
 
   cycles = (cycles - 1) & 0x0fff;
   pwm_cycles = cycles;
@@ -31,24 +26,12 @@ void p32x_timers_recalc(void)
 
   if (Pico32x.pwm_irq_cnt == 0)
     Pico32x.pwm_irq_cnt = pwm_irq_reload;
-
-  // SH2 timer step
-  for (i = 0; i < 2; i++) {
-    tmp = PREG8(Pico32xMem->sh2_peri_regs[i], 0x80) & 7;
-    // Sclk cycles per timer tick
-    if (tmp)
-      cycles = 0x20 << tmp;
-    else
-      cycles = 2;
-    timer_tick_cycles[i] = cycles;
-    elprintf(EL_32X, "WDT cycles[%d] = %d", i, cycles);
-  }
 }
 
-static void do_pwm_irq(unsigned int m68k_cycles)
+static void do_pwm_irq(SH2 *sh2, unsigned int m68k_cycles)
 {
   Pico32x.sh2irqs |= P32XI_PWM;
-  p32x_update_irls(NULL);
+  p32x_update_irls(sh2, m68k_cycles);
 
   if (Pico32x.regs[0x30 / 2] & P32XP_RTP) {
     p32x_event_schedule(m68k_cycles, P32X_EVENT_PWM, pwm_cycles / 3 + 1);
@@ -57,13 +40,14 @@ static void do_pwm_irq(unsigned int m68k_cycles)
   }
 }
 
-#define consume_fifo(m68k_cycles) { \
+#define consume_fifo(sh2, m68k_cycles) { \
   int cycles_diff = ((m68k_cycles) * 3) - Pico32x.pwm_cycle_p; \
   if (cycles_diff >= pwm_cycles) \
-    consume_fifo_do(m68k_cycles, cycles_diff); \
+    consume_fifo_do(sh2, m68k_cycles, cycles_diff); \
 }
 
-static void consume_fifo_do(unsigned int m68k_cycles, int sh2_cycles_diff)
+static void consume_fifo_do(SH2 *sh2, unsigned int m68k_cycles,
+  int sh2_cycles_diff)
 {
   int do_irq = 0;
 
@@ -115,40 +99,10 @@ static void consume_fifo_do(unsigned int m68k_cycles, int sh2_cycles_diff)
   Pico32x.pwm_cycle_p = m68k_cycles * 3 - sh2_cycles_diff;
 
   if (do_irq)
-    do_pwm_irq(m68k_cycles);
-}
-
-void p32x_timers_do(unsigned int m68k_now, unsigned int m68k_slice)
-{
-  unsigned int cycles = m68k_slice * 3;
-  int cnt, i;
-
-  //consume_fifo(m68k_now);
-
-  // WDT timers
-  for (i = 0; i < 2; i++) {
-    void *pregs = Pico32xMem->sh2_peri_regs[i];
-    if (PREG8(pregs, 0x80) & 0x20) { // TME
-      timer_cycles[i] += cycles;
-      cnt = PREG8(pregs, 0x81);
-      while (timer_cycles[i] >= timer_tick_cycles[i]) {
-        timer_cycles[i] -= timer_tick_cycles[i];
-        cnt++;
-      }
-      if (cnt >= 0x100) {
-        int level = PREG8(pregs, 0xe3) >> 4;
-        int vector = PREG8(pregs, 0xe4) & 0x7f;
-        elprintf(EL_32X, "%csh2 WDT irq (%d, %d)",
-          i ? 's' : 'm', level, vector);
-        sh2_internal_irq(&sh2s[i], level, vector);
-        cnt &= 0xff;
-      }
-      PREG8(pregs, 0x81) = cnt;
-    }
-  }
+    do_pwm_irq(sh2, m68k_cycles);
 }
 
-static int p32x_pwm_schedule_(unsigned int m68k_now)
+static int p32x_pwm_schedule_(SH2 *sh2, unsigned int m68k_now)
 {
   unsigned int sh2_now = m68k_now * 3;
   int cycles_diff_sh2;
@@ -158,7 +112,7 @@ static int p32x_pwm_schedule_(unsigned int m68k_now)
 
   cycles_diff_sh2 = sh2_now - Pico32x.pwm_cycle_p;
   if (cycles_diff_sh2 >= pwm_cycles)
-    consume_fifo_do(m68k_now, cycles_diff_sh2);
+    consume_fifo_do(sh2, m68k_now, cycles_diff_sh2);
 
   if (Pico32x.sh2irqs & P32XI_PWM)
     return 0; // previous not acked
@@ -172,14 +126,14 @@ static int p32x_pwm_schedule_(unsigned int m68k_now)
 
 void p32x_pwm_schedule(unsigned int m68k_now)
 {
-  int after = p32x_pwm_schedule_(m68k_now);
+  int after = p32x_pwm_schedule_(NULL, m68k_now);
   if (after != 0)
     p32x_event_schedule(m68k_now, P32X_EVENT_PWM, after);
 }
 
 void p32x_pwm_schedule_sh2(SH2 *sh2)
 {
-  int after = p32x_pwm_schedule_(sh2_cycles_done_m68k(sh2));
+  int after = p32x_pwm_schedule_(sh2, sh2_cycles_done_m68k(sh2));
   if (after != 0)
     p32x_event_schedule_sh2(sh2, P32X_EVENT_PWM, after);
 }
@@ -189,11 +143,12 @@ void p32x_pwm_irq_event(unsigned int m68k_now)
   p32x_pwm_schedule(m68k_now);
 }
 
-unsigned int p32x_pwm_read16(unsigned int a, unsigned int m68k_cycles)
+unsigned int p32x_pwm_read16(unsigned int a, SH2 *sh2,
+  unsigned int m68k_cycles)
 {
   unsigned int d = 0;
 
-  consume_fifo(m68k_cycles);
+  consume_fifo(sh2, m68k_cycles);
 
   a &= 0x0e;
   switch (a) {
@@ -224,24 +179,24 @@ unsigned int p32x_pwm_read16(unsigned int a, unsigned int m68k_cycles)
 }
 
 void p32x_pwm_write16(unsigned int a, unsigned int d,
-  unsigned int m68k_cycles)
+  SH2 *sh2, unsigned int m68k_cycles)
 {
   elprintf(EL_PWM, "pwm: %u: w16 %02x %04x (p %d %d)",
     m68k_cycles, a & 0x0e, d, Pico32x.pwm_p[0], Pico32x.pwm_p[1]);
 
-  consume_fifo(m68k_cycles);
+  consume_fifo(sh2, m68k_cycles);
 
   a &= 0x0e;
   if (a == 0) { // control
     // supposedly we should stop FIFO when xMd is 0,
     // but mars test disagrees
     Pico32x.regs[0x30 / 2] = d;
-    p32x_timers_recalc();
+    p32x_pwm_ctl_changed();
     Pico32x.pwm_irq_cnt = pwm_irq_reload; // ?
   }
   else if (a == 2) { // cycle
     Pico32x.regs[0x32 / 2] = d & 0x0fff;
-    p32x_timers_recalc();
+    p32x_pwm_ctl_changed();
   }
   else if (a <= 8) {
     d = (d - 1) & 0x0fff;
@@ -332,7 +287,7 @@ void p32x_pwm_state_loaded(void)
 {
   int cycles_diff_sh2;
 
-  p32x_timers_recalc();
+  p32x_pwm_ctl_changed();
 
   // for old savestates
   cycles_diff_sh2 = SekCycleCntT * 3 - Pico32x.pwm_cycle_p;