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

comment

Browse source
This commit is contained in:
folkert van heusden 2024-03-30 00:59:05 +01:00
parent 1ef5211bc1
commit 41989863e2
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cpu.cpp
View file

@ -1280,12 +1280,11 @@ bool cpu::single_operand_instructions(const uint16_t instr)
v = b->read(a.addr.value(), wm_word, rm_prev);
}
else {
int run_mode = getPSW_prev_runmode();
auto phys = b->calculate_physical_address(run_mode, a.addr.value());
int run_mode = getPSW_prev_runmode();
auto phys = b->calculate_physical_address(run_mode, a.addr.value());
uint32_t a = word_mode == wm_byte ? phys.physical_data : phys.physical_instruction;
uint32_t a = word_mode == wm_byte ? phys.physical_data : phys.physical_instruction;
b->check_odd_addressing(a, run_mode, word_mode ? d_space : i_space, false);
b->check_odd_addressing(a, run_mode, word_mode ? d_space : i_space, false); // TODO d/i space must depend on the check done in calculate_physical_address
v = b->readPhysical(word_mode == wm_byte ? phys.physical_data : phys.physical_instruction);
}
@ -1327,7 +1326,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
mtpi_count++;
uint32_t a = word_mode == wm_byte ? phys.physical_data : phys.physical_instruction;
b->check_odd_addressing(a, run_mode, word_mode == wm_byte ? d_space : i_space, true);
b->check_odd_addressing(a, run_mode, word_mode == wm_byte ? d_space : i_space, true); // TODO d/i space must depend on the check done in calculate_physical_address
b->writePhysical(a, v);
}
}

1
rk05.cpp
View file

@ -122,7 +122,6 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
if (func == 0) { // controller reset
DOLOG(debug, true, "RK05 invoke %d (controller reset)", func);
}
else if (func == 1) { // write
*disk_write_acitivity = true;