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

GAM fixes (increment/decrement & MMR1)

Browse source
This commit is contained in:
folkert van heusden 2024-03-29 10:23:39 +01:00
parent 9828a013c9
commit e67f383d65
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cpu.cpp
View file

@ -397,27 +397,28 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const word_mode_t wo
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, mode_selection, false, isR7_space); g.value = b->read(g.addr.value(), word_mode, mode_selection, false, isR7_space);
addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? 2 : 1); addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? 2 : 1);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, word_mode == wm_word || reg == 7 || reg == 6 ? wm_word : wm_byte);
break; break;
case 3: // @(Rn)+ / @#a case 3: // @(Rn)+ / @#a
g.addr = b->read(getRegister(reg, mode_selection), wm_word, mode_selection, false, isR7_space); g.addr = b->read(getRegister(reg, mode_selection), wm_word, mode_selection, false, isR7_space);
// might be wrong: the adds should happen when the read is really performed, because of traps // might be wrong: the adds should happen when the read is really performed, because of traps
addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? 2 : 1); addRegister(reg, mode_selection, 2);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, wm_word);
g.space = d_space; g.space = d_space;
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, mode_selection, false, g.space); g.value = b->read(g.addr.value(), word_mode, mode_selection, false, g.space);
break; break;
case 4: // -(Rn) case 4: // -(Rn)
addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? -2 : -1); addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? -2 : -1);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, word_mode == wm_word || reg == 7 || reg == 6 ? wm_word : wm_byte);
g.space = d_space;
g.addr = getRegister(reg, mode_selection); g.addr = getRegister(reg, mode_selection);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, mode_selection, false, isR7_space); g.value = b->read(g.addr.value(), word_mode, mode_selection, false, isR7_space);
break; break;
case 5: // @-(Rn) case 5: // @-(Rn)
addRegister(reg, mode_selection, word_mode == wm_word || reg == 7 || reg == 6 ? -2 : -1); addRegister(reg, mode_selection, -2);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, wm_word);
g.addr = b->read(getRegister(reg, mode_selection), wm_word, mode_selection, false, isR7_space); g.addr = b->read(getRegister(reg, mode_selection), wm_word, mode_selection, false, isR7_space);
g.space = d_space; g.space = d_space;
if (read_value) if (read_value)