Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-05-06 13:26:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14573 from jordan-woyak/CheckExternalExceptions-cleanup

Browse Source 
Core/PowerPC: Minor code cleanup to CheckExternalExceptions function.
This commit is contained in:
JosJuice 2026-04-11 13:10:26 +02:00 committed by GitHub
commit cae765b5cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -583,56 +583,54 @@ void PowerPCManager::CheckExceptions()
void PowerPCManager::CheckExternalExceptions()
{
u32 exceptions = m_ppc_state.Exceptions;
const u32 exceptions = m_ppc_state.Exceptions;
// EXTERNAL INTERRUPT
// Handling is delayed until MSR.EE=1.
if (exceptions && m_ppc_state.msr.EE)
if (exceptions == 0 || !m_ppc_state.msr.EE)
return;
u32 exception_vector = 0;
if (exceptions & EXCEPTION_EXTERNAL_INT)
{
if (exceptions & EXCEPTION_EXTERNAL_INT)
{
// Pokemon gets this "too early", it hasn't a handler yet
SRR0(m_ppc_state) = m_ppc_state.npc;
SRR1(m_ppc_state) = m_ppc_state.msr.Hex & 0x87C0FFFF;
m_ppc_state.msr.LE = m_ppc_state.msr.ILE;
m_ppc_state.msr.Hex &= ~0x04EF36;
m_ppc_state.pc = m_ppc_state.npc = 0x00000500;
// Pokemon gets this "too early", it hasn't a handler yet
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_EXTERNAL_INT");
m_ppc_state.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_EXTERNAL_INT");
DEBUG_ASSERT_MSG(POWERPC, m_ppc_state.msr.RI, "EXTERNAL_INT unrecoverable???");
DEBUG_ASSERT_MSG(POWERPC, (SRR1(m_ppc_state) & 0x02) != 0, "EXTERNAL_INT unrecoverable???");
}
else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
{
SRR0(m_ppc_state) = m_ppc_state.npc;
SRR1(m_ppc_state) = m_ppc_state.msr.Hex & 0x87C0FFFF;
m_ppc_state.msr.LE = m_ppc_state.msr.ILE;
m_ppc_state.msr.Hex &= ~0x04EF36;
m_ppc_state.pc = m_ppc_state.npc = 0x00000F00;
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
m_ppc_state.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR;
}
else if (exceptions & EXCEPTION_DECREMENTER)
{
SRR0(m_ppc_state) = m_ppc_state.npc;
SRR1(m_ppc_state) = m_ppc_state.msr.Hex & 0x87C0FFFF;
m_ppc_state.msr.LE = m_ppc_state.msr.ILE;
m_ppc_state.msr.Hex &= ~0x04EF36;
m_ppc_state.pc = m_ppc_state.npc = 0x00000900;
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_DECREMENTER");
m_ppc_state.Exceptions &= ~EXCEPTION_DECREMENTER;
}
else
{
DEBUG_ASSERT_MSG(POWERPC, 0, "Unknown EXT interrupt: Exceptions == {:08x}", exceptions);
ERROR_LOG_FMT(POWERPC, "Unknown EXTERNAL INTERRUPT exception: Exceptions == {:08x}",
exceptions);
}
MSRUpdated();
exception_vector = 0x00000500;
m_ppc_state.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
}
else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
{
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
exception_vector = 0x00000F00;
m_ppc_state.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR;
}
else if (exceptions & EXCEPTION_DECREMENTER)
{
DEBUG_LOG_FMT(POWERPC, "EXCEPTION_DECREMENTER");
exception_vector = 0x00000900;
m_ppc_state.Exceptions &= ~EXCEPTION_DECREMENTER;
}
else
{
DEBUG_ASSERT_MSG(POWERPC, 0, "Unknown EXT interrupt: Exceptions == {:08x}", exceptions);
ERROR_LOG_FMT(POWERPC, "Unknown EXTERNAL INTERRUPT exception: Exceptions == {:08x}",
exceptions);
return;
}
SRR0(m_ppc_state) = m_ppc_state.npc;
SRR1(m_ppc_state) = m_ppc_state.msr.Hex & 0x87C0FFFF;
m_ppc_state.msr.LE = m_ppc_state.msr.ILE;
m_ppc_state.msr.Hex &= ~0x04EF36;
m_ppc_state.pc = m_ppc_state.npc = exception_vector;
MSRUpdated();
}
bool PowerPCManager::CheckBreakPoints()