Fix interrupt delegation for coprocessors

[riscv-isa-sim.git] / riscv / extension.cc

diff --git a/riscv/extension.cc b/riscv/extension.cc
index 5321c42c17d96b5f7a985716f36691cc1215ecb2..a34dd8040ced3a7f97f4e3f8deac64f9529f982e 100644 (file)
--- a/riscv/extension.cc
+++ b/riscv/extension.cc
@@ -14,12 +14,7 @@ void extension_t::illegal_instruction()
 
 void extension_t::raise_interrupt()
 {
-  reg_t prv = p->get_state()->prv;
-  reg_t mie = get_field(p->get_state()->mstatus, MSTATUS_MIE);
-
-  if (prv < PRV_M || (prv == PRV_M && mie))
-    p->raise_interrupt(IRQ_COP);
-
+  p->take_interrupt((reg_t)1 << IRQ_COP); // must not return
   throw std::logic_error("a COP exception was posted, but interrupts are disabled!");
 }