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

Revert "only read from data-space when enabled"

Browse source 
This reverts commit f071f9faac.
This commit is contained in:
folkert van heusden 2023-03-19 11:19:39 +01:00
parent 9e5da95152
commit e50001ce15
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cpu.cpp
View file

@ -352,33 +352,33 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, g.space); g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, g.space);
addRegister(reg, prev_mode, 2); addRegister(reg, prev_mode, 2);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, false, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, false, d_space);
break; break;
case 4: case 4:
addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? -2 : -1); addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? -2 : -1);
g.addr = getRegister(reg, g.set, prev_mode); g.addr = getRegister(reg, g.set, prev_mode);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, false, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, false, d_space);
break; break;
case 5: case 5:
addRegister(reg, prev_mode, -2); addRegister(reg, prev_mode, -2);
g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, g.space); g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, g.space);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, d_space);
break; break;
case 6: case 6:
next_word = b->read(getPC(), false, prev_mode, i_space); next_word = b -> read(getPC(), false, prev_mode);
addRegister(7, prev_mode, + 2); addRegister(7, prev_mode, + 2);
g.addr = getRegister(reg, g.set, prev_mode) + next_word; g.addr = getRegister(reg, g.set, prev_mode) + next_word;
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, d_space);
break; break;
case 7: case 7:
next_word = b->read(getPC(), false, prev_mode, i_space); next_word = b -> read(getPC(), false, prev_mode);
addRegister(7, prev_mode, + 2); addRegister(7, prev_mode, + 2);
g.addr = b->read(getRegister(reg, g.set, prev_mode) + next_word, false, prev_mode); g.addr = b->read(getRegister(reg, g.set, prev_mode) + next_word, false, prev_mode);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, d_space);
break; break;
} }