WIP on priv spec v1.9

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

diff --git a/riscv/extension.cc b/riscv/extension.cc
index 718ef6d06a638e4ad83b62a112015e66586da853..5321c42c17d96b5f7a985716f36691cc1215ecb2 100644 (file)
--- a/riscv/extension.cc
+++ b/riscv/extension.cc
@@ -1,12 +1,7 @@
+// See LICENSE for license details.
+
 #include "extension.h"
 #include "trap.h"
-#include "dummy-rocc.h"
-
-std::map<std::string, std::function<extension_t*()>>& extensions()
-{
-  static std::map<std::string, std::function<extension_t*()>> v;
-  return v;
-}
 
 extension_t::~extension_t()
 {
@@ -19,11 +14,15 @@ void extension_t::illegal_instruction()
 
 void extension_t::raise_interrupt()
 {
-  p->set_interrupt(IRQ_COP, true);
-  p->take_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);
+
+  throw std::logic_error("a COP exception was posted, but interrupts are disabled!");
 }
 
 void extension_t::clear_interrupt()
 {
-  p->set_interrupt(IRQ_COP, false);
 }