From fad2c52c9b007f197964c5fa8a9fd46618f3c8cf Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Mon, 27 Mar 2023 21:57:02 +0200 Subject: [PATCH] moved MMR0-bits check to bus --- cpu.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cpu.cpp b/cpu.cpp index ecdc683..0c1543d 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -259,7 +259,7 @@ bool cpu::check_queued_interrupts() uint8_t current_level = getPSW_spl(); // 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++) { 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 { - bool mmr1_locked = b->getMMR0() & 0160000; - before_psw = getPSW(); - if (!mmr1_locked) - b->addToMMR1(-2, 6); + b->addToMMR1(-2, 6); 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