Merge branch 'main' into main

2023-04-19 04:50:12 -07:00 · 2023-04-19 04:50:12 -07:00 · 59d153ace0
commit 59d153ace0
parent 2a4bc01944 2beb32e6b9
3 changed files with 7 additions and 4 deletions
--- a/testbench/tests.vh
+++ b/testbench/tests.vh
@ -53,11 +53,11 @@ string tvpaths[] = '{
    "lsu",
    "vm64check",
    "pmp",
-    "tlbKP",
    "pmpcfg",
    "pmpcfg1",
-    "pmpcfg2"
-
+    "pmpcfg2",
+    "tlbKP",
+    "ifuCamlineWrite"
  };

  string coremark[] = '{
--- a/tests/coverage/pmpcfg.S
+++ b/tests/coverage/pmpcfg.S
@ -36,4 +36,6 @@ main:
    li t0, 0x8800
    csrw pmpcfg0, t0

-    j done
+
+    j done
+
--- a/tests/coverage/priv.S
+++ b/tests/coverage/priv.S
@ -189,6 +189,7 @@ main:
    li t1, -1
    csrw mcounteren, t1

+
    # Go to supervisor mode
    li a0, 1
    ecall