Merge pull request openhwgroup#1035 from davidharrishmc/dev

Updated ImperasDV config to fix issue openhwgroup#1031
10x-Engineers · Oct 28, 2024 · 13df786 · 13df786
2 parents 00ea357 + 874d5f6
commit 13df786
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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