Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU: Fix InterpretUncachedBlock()

Browse source 
But this shouldn't be hit during normal execution.
This commit is contained in:
Connor McLaughlin 2020-09-19 21:21:29 +10:00
parent 1d5af57f71
commit 9736dc7895
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/cpu_core.cpp
View file

@ -1461,7 +1461,8 @@ template void InterpretCachedBlock<PGXPMode::CPU>(const CodeBlock& block);
void InterpretUncachedBlock() void InterpretUncachedBlock()
{ {
Panic("Fixme with regards to re-fetching PC"); g_state.regs.npc = g_state.regs.pc;
FetchInstruction();
// At this point, pc contains the last address executed (in the previous block). The instruction has not been fetched // At this point, pc contains the last address executed (in the previous block). The instruction has not been fetched
// yet. pc shouldn't be updated until the fetch occurs, that way the exception occurs in the delay slot. // yet. pc shouldn't be updated until the fetch occurs, that way the exception occurs in the delay slot.
@ -1480,8 +1481,15 @@ void InterpretUncachedBlock()
g_state.exception_raised = false; g_state.exception_raised = false;
// Fetch the next instruction, except if we're in a branch delay slot. The "fetch" is done in the next block. // Fetch the next instruction, except if we're in a branch delay slot. The "fetch" is done in the next block.
if (!FetchInstruction()) if (!g_state.current_instruction_in_branch_delay_slot)
break; {
if (!FetchInstruction())
break;
}
else
{
g_state.regs.pc = g_state.regs.npc;
}
// execute the instruction we previously fetched // execute the instruction we previously fetched
ExecuteInstruction<PGXPMode::Disabled>(); ExecuteInstruction<PGXPMode::Disabled>();