32x: watchdog for Star Wars, SCI IRQs for X-men (also needs idle loop hacks)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@799 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-10-01 20:53:36 +00:00
parent 236990cf77
commit 1d7a28a723
8 changed files with 167 additions and 54 deletions

View file

@ -6,11 +6,14 @@ static int pwm_mult;
static int pwm_ptr;
int pwm_frame_smp_cnt;
static int timer_line_ticks[2];
void p32x_pwm_refresh(void)
// timers. This includes PWM timer in 32x and internal SH2 timers
void p32x_timers_recalc(void)
{
int cycles = Pico32x.regs[0x32 / 2];
int frame_samples;
int tmp, i;
cycles = (cycles - 1) & 0x0fff;
if (cycles < 500) {
@ -25,22 +28,56 @@ void p32x_pwm_refresh(void)
frame_samples = OSC_NTSC / 7 * 3 / 60 / cycles;
pwm_line_samples = (frame_samples << 16) / scanlines_total;
// 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;
if (Pico.m.pal)
tmp = OSC_PAL / 7 * 3 / 50 / scanlines_total;
else
tmp = OSC_NTSC / 7 * 3 / 60 / scanlines_total;
timer_line_ticks[i] = (tmp << 16) / cycles;
elprintf(EL_32X, "timer_line_ticks[%d] = %.3f", i, (double)timer_line_ticks[i] / 0x10000);
}
}
// irq for every sample??
// FIXME: we need to hit more than once per line :(
void p32x_pwm_irq_check(int new_line)
// PWM irq for every tm samples
void p32x_timers_do(int new_line)
{
int tm = (Pico32x.regs[0x30 / 2] & 0x0f00) >> 8;
if (tm == 0)
return; // TODO: verify
int tm, cnt, i;
tm = (Pico32x.regs[0x30 / 2] & 0x0f00) >> 8;
if (tm != 0) {
if (new_line)
Pico32x.pwm_irq_sample_cnt += pwm_line_samples;
if (Pico32x.pwm_irq_sample_cnt >= (tm << 16)) {
Pico32x.pwm_irq_sample_cnt -= tm << 16;
Pico32x.sh2irqs |= P32XI_PWM;
p32x_update_irls();
}
}
if (new_line)
Pico32x.pwm_irq_sample_cnt += pwm_line_samples;
if (Pico32x.pwm_irq_sample_cnt >= (tm << 16)) {
Pico32x.pwm_irq_sample_cnt -= tm << 16;
Pico32x.sh2irqs |= P32XI_PWM;
p32x_update_irls();
if (!new_line)
return;
for (i = 0; i < 2; i++) {
void *pregs = Pico32xMem->sh2_peri_regs[i];
if (PREG8(pregs, 0x80) & 0x20) { // TME
cnt = PREG8(pregs, 0x81);
cnt += timer_line_ticks[i];
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;
}
}
}
@ -78,7 +115,7 @@ void p32x_pwm_write16(unsigned int a, unsigned int d)
Pico32x.regs[0x30 / 2] = d;
else if (a == 2) { // cycle
Pico32x.regs[0x32 / 2] = d & 0x0fff;
p32x_pwm_refresh();
p32x_timers_recalc();
Pico32x.pwm_irq_sample_cnt = 0; // resets?
}
else if (a <= 8) {