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

moved MMR0-bits check to bus

Browse source
This commit is contained in:
folkert van heusden 2023-03-27 21:57:02 +02:00
parent 08362a2a20
commit fad2c52c9b
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpu.cpp
View file

@ -259,7 +259,7 @@ bool cpu::check_queued_interrupts()
uint8_t current_level = getPSW_spl(); uint8_t current_level = getPSW_spl();
// uint8_t start_level = current_level <= 3 ? 0 : current_level + 1; // uint8_t start_level = current_level <= 3 ? 0 : current_level + 1;
uint8_t start_level = current_level + 1; uint8_t start_level = current_level + 1;
for(uint8_t i=start_level; i < 8; i++) { for(uint8_t i=start_level; i < 8; i++) {
auto interrupts = queued_interrupts.find(i); auto interrupts = queued_interrupts.find(i);
@ -1627,15 +1627,13 @@ void cpu::trap(uint16_t vector, const int new_ipl, const bool is_interrupt)
} }
} }
else { else {
bool mmr1_locked = b->getMMR0() & 0160000;
before_psw = getPSW(); before_psw = getPSW();
if (!mmr1_locked) b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
before_pc = getPC(); before_pc = getPC();
if (!mmr1_locked) b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
// TODO set MMR2?
} }
// make sure the trap vector is retrieved from kernel space // make sure the trap vector is retrieved from kernel space