From 874d5f6cce05decab1d033bb6111b4eef22e4751 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Mon, 28 Oct 2024 15:55:34 -0700
Subject: [PATCH] Updated ImperasDV config to fix issue #1031

---
 config/rv32gc/imperas.ic | 13 ++++++++++---
 config/rv64gc/imperas.ic | 14 +++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/config/rv32gc/imperas.ic b/config/rv32gc/imperas.ic
index 57c58c3e8..a4b5fe64c 100644
--- a/config/rv32gc/imperas.ic
+++ b/config/rv32gc/imperas.ic
@@ -59,9 +59,16 @@
 #--override cpu/instret_undefined=T
 #--override cpu/hpmcounter_undefined=T
 
-# context registers not implemented
---override cpu/scontext_undefined=T
---override cpu/mcontext_undefined=T
+## context registers not implemented
+#--override cpu/scontext_undefined=True
+#--override cpu/mcontext_undefined=True
+
+# Disable all features that might want mseccfg or CSRs 7a0-7af
+--override cpu/Smepmp_version=none
+--override cpu/Smmpm=none
+#--override cpu/Zicfilp=F
+--override cpu/trigger_num=0 # disable CSRs 7a0-7a8
+
 --override no_pseudo_inst=T # For code coverage, don't produce pseudoinstructions
 
 
diff --git a/config/rv64gc/imperas.ic b/config/rv64gc/imperas.ic
index 558fb8cae..0ff19fa68 100644
--- a/config/rv64gc/imperas.ic
+++ b/config/rv64gc/imperas.ic
@@ -58,9 +58,17 @@
 #--override cpu/hpmcounter_undefined=T
 
 # context registers not implemented
---override cpu/scontext_undefined=T
---override cpu/mcontext_undefined=T
---override no_pseudo_inst=T # For code coverage, don't produce pseudoinstructions
+#--override cpu/scontext_undefined=True
+#--override cpu/mcontext_undefined=True
+
+# Disable all features that might want mseccfg or CSRs 7a0-7af
+--override cpu/Smepmp_version=none
+--override cpu/Smmpm=none
+#--override cpu/Zicfilp=F
+--override cpu/trigger_num=0 # disable CSRs 7a0-7a8
+
+# For code coverage, don't produce pseudoinstructions
+--override no_pseudo_inst=T 
 
 # nonratified mnosie register not implemented
 --override cpu/mnoise_undefined=T