github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-06 19:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPU: Clear pending bus error when interpreting block

Browse Source 
It can get set from a failed rec access much earlier.

Also eliminates a redundant store from the main interpreter loop.
This commit is contained in:
Stenzek 2025-05-14 22:53:54 +10:00
parent 8382a1ac7b
commit 2ed7aa5536
No known key found for this signature in database
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/cpu_core.cpp
View File

@ -2082,12 +2082,14 @@ void CPU::CheckForExecutionModeChange()
WARNING_LOG("Execution mode changed from {} to {}", Settings::GetCPUExecutionModeName(s_current_execution_mode), WARNING_LOG("Execution mode changed from {} to {}", Settings::GetCPUExecutionModeName(s_current_execution_mode),
Settings::GetCPUExecutionModeName(new_execution_mode)); Settings::GetCPUExecutionModeName(new_execution_mode));
// Clear bus error flag, it can get set in the rec and we don't want to fire it later in the int.
g_state.bus_error = false;
const bool new_interpreter = (new_execution_mode == CPUExecutionMode::Interpreter); const bool new_interpreter = (new_execution_mode == CPUExecutionMode::Interpreter);
if (g_state.using_interpreter != new_interpreter) if (g_state.using_interpreter != new_interpreter)
{ {
// Have to clear out the icache too, only the tags are valid in the recs. // Have to clear out the icache too, only the tags are valid in the recs.
ClearICache(); ClearICache();
g_state.bus_error = false;
if (new_interpreter) if (new_interpreter)
{ {
@ -2464,7 +2466,6 @@ template<PGXPMode pgxp_mode, bool debug>
g_state.current_instruction_was_branch_taken = g_state.branch_was_taken; g_state.current_instruction_was_branch_taken = g_state.branch_was_taken;
g_state.next_instruction_is_branch_delay_slot = false; g_state.next_instruction_is_branch_delay_slot = false;
g_state.branch_was_taken = false; g_state.branch_was_taken = false;
g_state.exception_raised = false;
// fetch the next instruction - even if this fails, it'll still refetch on the flush so we can continue // fetch the next instruction - even if this fails, it'll still refetch on the flush so we can continue
if (!FetchInstruction()) if (!FetchInstruction())
@ -2579,6 +2580,7 @@ void CPU::CodeCache::InterpretCachedBlock(const Block* block)
// set up the state so we've already fetched the instruction // set up the state so we've already fetched the instruction
DebugAssert(g_state.pc == block->pc); DebugAssert(g_state.pc == block->pc);
g_state.npc = block->pc + 4; g_state.npc = block->pc + 4;
g_state.exception_raised = false;
const Instruction* instruction = block->Instructions(); const Instruction* instruction = block->Instructions();
const Instruction* end_instruction = instruction + block->size; const Instruction* end_instruction = instruction + block->size;
@ -2594,7 +2596,6 @@ void CPU::CodeCache::InterpretCachedBlock(const Block* block)
g_state.current_instruction_in_branch_delay_slot = info->is_branch_delay_slot; // TODO: let int set it instead g_state.current_instruction_in_branch_delay_slot = info->is_branch_delay_slot; // TODO: let int set it instead
g_state.current_instruction_was_branch_taken = g_state.branch_was_taken; g_state.current_instruction_was_branch_taken = g_state.branch_was_taken;
g_state.branch_was_taken = false; g_state.branch_was_taken = false;
g_state.exception_raised = false;
// update pc // update pc
g_state.pc = g_state.npc; g_state.pc = g_state.npc;
@ -2625,6 +2626,8 @@ template<PGXPMode pgxp_mode>
void CPU::CodeCache::InterpretUncachedBlock() void CPU::CodeCache::InterpretUncachedBlock()
{ {
g_state.npc = g_state.pc; g_state.npc = g_state.pc;
g_state.exception_raised = false;
g_state.bus_error = false;
if (!FetchInstructionForInterpreterFallback()) if (!FetchInstructionForInterpreterFallback())
return; return;
@ -2642,7 +2645,6 @@ void CPU::CodeCache::InterpretUncachedBlock()
g_state.current_instruction_was_branch_taken = g_state.branch_was_taken; g_state.current_instruction_was_branch_taken = g_state.branch_was_taken;
g_state.next_instruction_is_branch_delay_slot = false; g_state.next_instruction_is_branch_delay_slot = false;
g_state.branch_was_taken = false; g_state.branch_was_taken = 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.
const bool branch = IsBranchInstruction(g_state.current_instruction); const bool branch = IsBranchInstruction(g_state.current_instruction);
@ -2684,12 +2686,16 @@ template void CPU::CodeCache::InterpretUncachedBlock<PGXPMode::CPU>();
bool CPU::RecompilerThunks::InterpretInstruction() bool CPU::RecompilerThunks::InterpretInstruction()
{ {
g_state.exception_raised = false;
g_state.bus_error = false;
ExecuteInstruction<PGXPMode::Disabled, false>(); ExecuteInstruction<PGXPMode::Disabled, false>();
return g_state.exception_raised; return g_state.exception_raised;
} }
bool CPU::RecompilerThunks::InterpretInstructionPGXP() bool CPU::RecompilerThunks::InterpretInstructionPGXP()
{ {
g_state.exception_raised = false;
g_state.bus_error = false;
ExecuteInstruction<PGXPMode::Memory, false>(); ExecuteInstruction<PGXPMode::Memory, false>();
return g_state.exception_raised; return g_state.exception_raised;
} }