RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mcd, improve polling detection

Browse source
This commit is contained in:
kub 2021-05-06 22:43:31 +02:00
parent 1106272c84
commit 9b61ba715a
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pico/cd/mcd.c
View file

@ -124,9 +124,6 @@ static void SekRunS68k(unsigned int to)
if ((cyc_do = SekCycleAimS68k - SekCycleCntS68k) <= 0) if ((cyc_do = SekCycleAimS68k - SekCycleCntS68k) <= 0)
return; return;
if (SekShouldInterrupt())
Pico_mcd->m.s68k_poll_a = 0;
pprof_start(s68k); pprof_start(s68k);
SekCycleCntS68k += cyc_do; SekCycleCntS68k += cyc_do;
#if defined(EMU_C68K) #if defined(EMU_C68K)
@ -317,7 +314,11 @@ int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
if (event_time_next && CYCLES_GT(target, event_time_next)) if (event_time_next && CYCLES_GT(target, event_time_next))
target = event_time_next; target = event_time_next;
if (SekIsStoppedS68k())
SekCycleCntS68k = SekCycleAimS68k = target;
else
SekRunS68k(target); SekRunS68k(target);
if (m68k_poll_sync && Pico_mcd->m.m68k_poll_cnt == 0) if (m68k_poll_sync && Pico_mcd->m.m68k_poll_cnt == 0)
break; break;
} }
@ -334,20 +335,27 @@ static void SekSyncM68k(void);
void pcd_run_cpus_normal(int m68k_cycles) void pcd_run_cpus_normal(int m68k_cycles)
{ {
Pico.t.m68c_aim += m68k_cycles; Pico.t.m68c_aim += m68k_cycles;
if (SekShouldInterrupt() || Pico_mcd->m.m68k_poll_cnt < 12)
Pico_mcd->m.m68k_poll_cnt = 0;
else if (Pico_mcd->m.m68k_poll_cnt >= 16) {
int s68k_left = pcd_sync_s68k(Pico.t.m68c_aim, 1);
if (s68k_left <= 0) {
elprintf(EL_CDPOLL, "m68k poll [%02x] x%d @%06x",
Pico_mcd->m.m68k_poll_a, Pico_mcd->m.m68k_poll_cnt, SekPc);
Pico.t.m68c_cnt = Pico.t.m68c_aim;
return;
}
Pico.t.m68c_cnt = Pico.t.m68c_aim - (s68k_left * mcd_s68k_cycle_mult >> 16);
}
while (CYCLES_GT(Pico.t.m68c_aim, Pico.t.m68c_cnt)) { while (CYCLES_GT(Pico.t.m68c_aim, Pico.t.m68c_cnt)) {
if (SekShouldInterrupt())
Pico_mcd->m.m68k_poll_cnt = 0;
#ifdef USE_POLL_DETECT
if (Pico_mcd->m.m68k_poll_cnt >= 16) {
// main CPU is polling, (wake and) run sub only
SekSetStopS68k(0);
pcd_sync_s68k(Pico.t.m68c_aim, 1);
Pico.t.m68c_cnt = Pico.t.m68c_aim;
if (SekIsStoppedS68k()) {
// slave has stopped, wake master to avoid lockups
Pico_mcd->m.m68k_poll_cnt = 0;
}
elprintf(EL_CDPOLL, "m68k poll [%02x] x%d @%06x",
Pico_mcd->m.m68k_poll_a, Pico_mcd->m.m68k_poll_cnt, SekPc);
}
#endif
SekRunM68kOnce(); SekRunM68kOnce();
if (Pico_mcd->m.need_sync) { if (Pico_mcd->m.need_sync) {
Pico_mcd->m.need_sync = 0; Pico_mcd->m.need_sync = 0;

2
pico/cd/memory.c
View file

@ -331,7 +331,7 @@ u32 s68k_reg_read16(u32 a)
d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1]; d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];
if (a >= 0x0e && a < 0x30) if (a >= 0x0e && a < 0x20)
return s68k_poll_detect(a, d); return s68k_poll_detect(a, d);
return d; return d;