bugfix in raising accelerator interrupts

diff --git a/hwacha/hwacha.cc b/hwacha/hwacha.cc
index 972e151b9c53592c414b0db308f1a745b660d0a6..820faaba7efa9a649991e60e53f2ee8e39b1ffe6 100644 (file)
--- a/hwacha/hwacha.cc
+++ b/hwacha/hwacha.cc
@@ -103,5 +103,5 @@ void hwacha_t::take_exception(reg_t c, reg_t a)
   cause = c;
   aux = a;
   raise_interrupt();
-  throw std::logic_error("a hwacha exception was posted, but interrupts are disabled!");
+  throw std::logic_error("unreachable!");
 }

diff --git a/riscv/extension.cc b/riscv/extension.cc
index c2bea2e648635f30ef513a57d2b97ddcc46172b3..097713929bf43c92da73396ebaf017a311a7b5ac 100644 (file)
--- a/riscv/extension.cc
+++ b/riscv/extension.cc
@@ -12,7 +12,14 @@ void extension_t::illegal_instruction()
 
 void extension_t::raise_interrupt()
 {
-  p->raise_interrupt(IRQ_COP);
+  int priv = get_field(p->get_state()->mstatus, MSTATUS_PRV);
+  int ie = get_field(p->get_state()->mstatus, MSTATUS_IE);
+
+  if (priv < PRV_M || (priv == PRV_M && ie)) {
+    p->raise_interrupt(IRQ_COP);
+  }
+
+  throw std::logic_error("a COP exception was posted, but interrupts are disabled!");
 }
 
 void extension_t::clear_interrupt()