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

Merge fix for 2fd1da58bb

Browse source 
The fault in that merge caused two sets of pc/psw to be pushed on the
stack.
This commit is contained in:
folkert van heusden 2023-03-12 13:19:54 +01:00
parent a84d9a2a3a
commit 60210e4f82
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cpu.cpp
View file

@ -1778,21 +1778,6 @@ void cpu::trap(uint16_t vector, const int new_ipl, const bool is_interrupt)
setPSW(before_psw, false);
}
}
setPC(b->readWord(vector + 0, d_space));
if (!is_interrupt)
b->setMMR0Bit(12); // it's a trap
// switch to kernel mode & update 'previous mode'
uint16_t new_psw = b->readWord(vector + 2, d_space) & 0147777; // mask off old 'previous mode'
if (new_ipl != -1)
new_psw = (new_psw & ~0xe0) | (new_ipl << 5);
new_psw |= (before_psw >> 2) & 030000; // apply new 'previous mode'
setPSW(new_psw, false);
pushStack(before_psw);
pushStack(before_pc);
}
cpu::operand_parameters cpu::addressing_to_string(const uint8_t mode_register, const uint16_t pc, const bool word_mode) const