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

code reduction

Browse source
This commit is contained in:
folkert van heusden 2024-04-17 09:38:00 +02:00
parent ef0121a26c
commit fac8c93865
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cpu.cpp
View file

@ -1319,9 +1319,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
case 0b00110101: { // MFPD/MFPI case 0b00110101: { // MFPD/MFPI
// always words: word_mode-bit is to select between MFPI and MFPD // always words: word_mode-bit is to select between MFPI and MFPD
uint16_t v = 0xffff;
bool set_flags = true;
uint16_t v = 0xffff;
if (dst_mode == 0) if (dst_mode == 0)
v = getRegister(dst_reg, rm_prev); v = getRegister(dst_reg, rm_prev);
@ -1330,27 +1328,11 @@ bool cpu::single_operand_instructions(const uint16_t instr)
auto a = getGAMAddress(dst_mode, dst_reg, wm_word); auto a = getGAMAddress(dst_mode, dst_reg, wm_word);
addToMMR1(a); addToMMR1(a);
int prev_run_mode = getPSW_prev_runmode(); // read from previous space
bool is_d = word_mode == wm_byte; v = b->read(a.addr.value(), wm_word, rm_prev);
auto phys = b->calculate_physical_address(prev_run_mode, a.addr.value());
uint32_t phys_a = is_d ? phys.physical_data : phys.physical_instruction;
bool phys_psw = is_d ? phys.physical_data_is_psw : phys.physical_instruction_is_psw;
if (phys_a >= b->get_io_base()) {
// read from previous space
v = b->read(a.addr.value(), wm_word, rm_prev);
set_flags = !phys_psw;
}
else {
b->check_odd_addressing(phys_a, prev_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(is_d ? phys.physical_data : phys.physical_instruction);
}
} }
if (set_flags) setPSW_flags_nzv(v, wm_word);
setPSW_flags_nzv(v, wm_word);
// put on current stack // put on current stack
pushStack(v); pushStack(v);