folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into DC11

Browse source
This commit is contained in:
folkert van heusden 2024-05-01 14:24:46 +02:00
commit 253c10e6f3
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bus.cpp
View file

@ -524,7 +524,7 @@ uint16_t bus::read(const uint16_t addr_in, const word_mode_t word_mode, const rm
throw 1; throw 1;
} }
uint16_t temp = 0; uint16_t temp = 0;
if (word_mode == wm_byte) if (word_mode == wm_byte)
temp = m->read_byte(m_offset); temp = m->read_byte(m_offset);
else else
@ -640,7 +640,7 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
if (mmu_->is_enabled() || (is_write && (mmu_->getMMR0() & (1 << 8 /* maintenance check */)))) { if (mmu_->is_enabled() || (is_write && (mmu_->getMMR0() & (1 << 8 /* maintenance check */)))) {
uint8_t apf = a >> 13; // active page field uint8_t apf = a >> 13; // active page field
bool d = space == d_space && mmu_->get_use_data_space(run_mode) ? space == d_space : false; bool d = space == d_space && mmu_->get_use_data_space(run_mode);
uint16_t p_offset = a & 8191; // page offset uint16_t p_offset = a & 8191; // page offset
@ -787,8 +787,7 @@ write_rc_t bus::write(const uint16_t addr_in, const word_mode_t word_mode, uint1
const uint8_t apf = addr_in >> 13; // active page field const uint8_t apf = addr_in >> 13; // active page field
bool is_data = space == d_space; bool is_data = space == d_space;
bool d = is_data && mmu_->get_use_data_space(run_mode);
bool d = is_data && mmu_->get_use_data_space(run_mode) ? is_data : false;
if (mmu_->is_enabled() && (addr_in & 1) == 0 /* TODO remove this? */ && addr_in != ADDR_MMR0) if (mmu_->is_enabled() && (addr_in & 1) == 0 /* TODO remove this? */ && addr_in != ADDR_MMR0)
mmu_->set_page_written_to(run_mode, d, apf); mmu_->set_page_written_to(run_mode, d, apf);