6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Avoid repeated trans comparison.

Browse Source
This commit is contained in:
Thomas Harte 2024-04-29 22:35:01 -04:00
parent 03c3da7338
commit 71c5a1d419
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Machines/Acorn/Archimedes/Archimedes.cpp
View File

@ -421,6 +421,7 @@ class ConcreteMachine:
void did_set_status() { void did_set_status() {
// This might have been a change of mode, so... // This might have been a change of mode, so...
trans_ = executor_.registers().mode() == InstructionSet::ARM::Mode::User;
fill_pipeline(executor_.pc()); fill_pipeline(executor_.pc());
update_interrupts(); update_interrupts();
} }
@ -540,6 +541,7 @@ class ConcreteMachine:
static constexpr auto arm_model = InstructionSet::ARM::Model::ARMv2; static constexpr auto arm_model = InstructionSet::ARM::Model::ARMv2;
using Executor = InstructionSet::ARM::Executor<arm_model, MemoryController<ConcreteMachine, ConcreteMachine>, ConcreteMachine>; using Executor = InstructionSet::ARM::Executor<arm_model, MemoryController<ConcreteMachine, ConcreteMachine>, ConcreteMachine>;
Executor executor_; Executor executor_;
bool trans_ = false;
void fill_pipeline(uint32_t pc) { void fill_pipeline(uint32_t pc) {
if(pipeline_.interrupt_next()) return; if(pipeline_.interrupt_next()) return;
@ -549,7 +551,7 @@ class ConcreteMachine:
uint32_t advance_pipeline(uint32_t pc) { uint32_t advance_pipeline(uint32_t pc) {
uint32_t instruction = 0; // Value should never be used; this avoids a spurious GCC warning. uint32_t instruction = 0; // Value should never be used; this avoids a spurious GCC warning.
const bool did_read = executor_.bus.read(pc, instruction, executor_.registers().mode() == InstructionSet::ARM::Mode::User); const bool did_read = executor_.bus.read(pc, instruction, trans_);
return pipeline_.exchange( return pipeline_.exchange(
did_read ? instruction : Pipeline::SWI, did_read ? instruction : Pipeline::SWI,
did_read ? Pipeline::SWISubversion::None : Pipeline::SWISubversion::DataAbort); did_read ? Pipeline::SWISubversion::None : Pipeline::SWISubversion::DataAbort);