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

redundant check

Browse source
This commit is contained in:
folkert van heusden 2022-06-19 00:31:23 +02:00
parent fdeda07d71
commit 7e1f7a8102
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cpu.cpp
View file

@ -1515,7 +1515,7 @@ bool cpu::condition_code_operations(const uint16_t instr)
void cpu::pushStack(const uint16_t v) void cpu::pushStack(const uint16_t v)
{ {
if (getRegister(6) == stackLimitRegister) { if (getRegister(6) == stackLimitRegister) {
DOLOG(debug, true, "stackLimitRegister reached"); DOLOG(debug, true, "stackLimitRegister reached %06o while pushing %06o", stackLimitRegister, v);
trap(123, 7); // TODO trap(123, 7); // TODO
} }
@ -1685,6 +1685,8 @@ void cpu::trap(const uint16_t vector, const int new_ipl, const bool is_interrupt
new_psw |= (before_psw >> 2) & 030000; // apply new 'previous mode' new_psw |= (before_psw >> 2) & 030000; // apply new 'previous mode'
setPSW(new_psw, false); setPSW(new_psw, false);
// DOLOG(info, true, "R6: %06o, before PSW: %06o, new PSW: %06o", getRegister(6), before_psw, new_psw);
pushStack(before_psw); pushStack(before_psw);
pushStack(before_pc); pushStack(before_pc);
DOLOG(debug, true, "*** CPU::TRAP fin ***"); DOLOG(debug, true, "*** CPU::TRAP fin ***");
@ -2194,9 +2196,6 @@ void cpu::step_b()
if ((b->getMMR0() & 0160000) == 0) if ((b->getMMR0() & 0160000) == 0)
b->setMMR2(temp_pc); b->setMMR2(temp_pc);
if (temp_pc & 1)
busError();
try { try {
uint16_t instr = b->readWord(temp_pc); uint16_t instr = b->readWord(temp_pc);