ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDROM: Handle INT1 with pending command 

Fixes lockup during track playback in Gokujou Parodius Da! Deluxe Pack.
This commit is contained in:
Stenzek 2024-05-25 16:08:08 +10:00
parent 60ee17e713
commit 2ff1f398a3
No known key found for this signature in database
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/cdrom.cpp
View File

@ -993,7 +993,7 @@ void CDROM::WriteRegister(u32 offset, u8 value)
if (s_interrupt_flag_register == 0) if (s_interrupt_flag_register == 0)
{ {
InterruptController::SetLineState(InterruptController::IRQ::CDROM, false); InterruptController::SetLineState(InterruptController::IRQ::CDROM, false);
if (HasPendingAsyncInterrupt()) if (HasPendingAsyncInterrupt() && !HasPendingCommand())
QueueDeliverAsyncInterrupt(); QueueDeliverAsyncInterrupt();
else else
UpdateCommandEvent(); UpdateCommandEvent();
@ -1120,7 +1120,19 @@ void CDROM::SetAsyncInterrupt(Interrupt interrupt)
Assert(s_pending_async_interrupt == 0); Assert(s_pending_async_interrupt == 0);
s_pending_async_interrupt = static_cast<u8>(interrupt); s_pending_async_interrupt = static_cast<u8>(interrupt);
if (!HasPendingInterrupt()) if (!HasPendingInterrupt())
{
// Pending interrupt should block INT1 from going through. But pending command needs to as well, for games like
// Gokujou Parodius Da! Deluxe Pack that spam GetlocL while data is being played back, if they get an INT1 instead
// of an INT3 during the small window of time that the INT3 is delayed, causes a lock-up.
if (!HasPendingCommand())
QueueDeliverAsyncInterrupt(); QueueDeliverAsyncInterrupt();
else
DEBUG_LOG("Delaying async interrupt {} because of pending command", s_pending_async_interrupt);
}
else
{
DEBUG_LOG("Delaying async interrupt {} because of pending interrupt", s_interrupt_flag_register);
}
} }
void CDROM::ClearAsyncInterrupt() void CDROM::ClearAsyncInterrupt()
@ -1139,9 +1151,7 @@ void CDROM::QueueDeliverAsyncInterrupt()
// instead of the INT3 response, and the game gets confused. So, we just delay INT1s a bit, if there // instead of the INT3 response, and the game gets confused. So, we just delay INT1s a bit, if there
// has been any recent INT3s - give it enough time to read the response out. The real console does // has been any recent INT3s - give it enough time to read the response out. The real console does
// something similar anyway, the INT1 task won't run immediately after the INT3 is cleared. // something similar anyway, the INT1 task won't run immediately after the INT3 is cleared.
DebugAssert(HasPendingAsyncInterrupt());
if (!HasPendingAsyncInterrupt())
return;
// underflows here are okay // underflows here are okay
const u32 diff = System::GetGlobalTickCounter() - s_last_interrupt_time; const u32 diff = System::GetGlobalTickCounter() - s_last_interrupt_time;