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

trap: always register deltas unless error set in MMR0

Browse source
This commit is contained in:
folkert van heusden 2022-04-14 17:50:18 +02:00
parent 1673548c37
commit 5a4057f6a1
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cpu.cpp
View file

@ -1408,23 +1408,11 @@ bool cpu::misc_operations(const uint16_t instr)
} }
if ((instr >> 8) == 0b10001000) { // EMT if ((instr >> 8) == 0b10001000) { // EMT
if ((b->getMMR1() & 0160000) == 0) {
b->setMMR2(030);
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
}
trap(030); trap(030);
return true; return true;
} }
if ((instr >> 8) == 0b10001001) { // TRAP if ((instr >> 8) == 0b10001001) { // TRAP
if ((b->getMMR1() & 0160000) == 0) {
b->setMMR2(034);
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
}
trap(034); trap(034);
return true; return true;
} }
@ -1497,6 +1485,13 @@ void cpu::trap(const uint16_t vector, const int new_ipl)
psw &= 037777; // mask off 14/15 psw &= 037777; // mask off 14/15
} }
if ((b->getMMR1() & 0160000) == 0) {
D(fprintf(stderr, "trap: register vector/2xregister-undo\n");)
b->setMMR2(vector);
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
}
setPC(b->readWord(vector + 0)); setPC(b->readWord(vector + 0));
// switch to kernel mode & update 'previous mode' // switch to kernel mode & update 'previous mode'
@ -1997,9 +1992,6 @@ void cpu::step()
if ((b->getMMR1() & 0160000) == 0) if ((b->getMMR1() & 0160000) == 0)
b->clearMMR1(); b->clearMMR1();
if (check_queued_interrupts())
return;
if (scheduled_trap) { if (scheduled_trap) {
trap(scheduled_trap, 7); trap(scheduled_trap, 7);
@ -2008,6 +2000,9 @@ void cpu::step()
return; return;
} }
if (check_queued_interrupts())
return;
uint16_t temp_pc = getPC(); uint16_t temp_pc = getPC();
b->setMMR2(temp_pc); b->setMMR2(temp_pc);