1 files changed, 34 insertions, 2 deletions
diff --git a/riscv/riscv_sys.sail b/riscv/riscv_sys.sail
index 36942eed..9153c3cb 100644
--- a/riscv/riscv_sys.sail
+++ b/riscv/riscv_sys.sail
@@ -534,6 +534,12 @@ mapping csr_name_map : csreg <-> string = {
     0x000  <-> "ustatus",
     0x004  <-> "uie",
     0x005  <-> "utvec",
+    /* user trap handling */
+    0x040  <-> "uscratch",
+    0x041  <-> "uepc",
+    0x042  <-> "ucause",
+    0x043  <-> "utval",
+    0x044  <-> "uip",
     /* user floating-point context */
     0x001  <-> "fflags",
     0x002  <-> "frm",
@@ -580,7 +586,27 @@ mapping csr_name_map : csreg <-> string = {
     0x342  <-> "mcause",
     0x343  <-> "mtval",
     0x344  <-> "mip",
-    /* TODO: machine protection and translation */
+    /* machine protection and translation */
+    0x3A0  <-> "pmpcfg0",
+    0x3A1  <-> "pmpcfg1",
+    0x3A2  <-> "pmpcfg2",
+    0x3A3  <-> "pmpcfg3",
+    0x3B0  <-> "pmpaddr0",
+    0x3B1  <-> "pmpaddr1",
+    0x3B2  <-> "pmpaddr2",
+    0x3B3  <-> "pmpaddr3",
+    0x3B4  <-> "pmpaddr4",
+    0x3B5  <-> "pmpaddr5",
+    0x3B6  <-> "pmpaddr6",
+    0x3B7  <-> "pmpaddr7",
+    0x3B8  <-> "pmpaddr8",
+    0x3B9  <-> "pmpaddr9",
+    0x3BA  <-> "pmpaddr10",
+    0x3BB  <-> "pmpaddr11",
+    0x3BC  <-> "pmpaddr12",
+    0x3BD  <-> "pmpaddr13",
+    0x3BE  <-> "pmpaddr14",
+    0x3BF  <-> "pmpaddr15",
     /* machine counters/timers */
     0xB00  <-> "mcycle",
     0xB02  <-> "minstret",
@@ -588,7 +614,13 @@ mapping csr_name_map : csreg <-> string = {
     0xB82  <-> "minstreth",
     /* TODO: other hpm counters and events */
     /* trigger/debug */
-    0x7a0  <-> "tselect"
+    0x7a0  <-> "tselect",
+    0x7a1  <-> "tdata1",
+    0x7a2  <-> "tdata2",
+    0x7a3  <-> "tdata3"
+
+    /* numeric fallback */
+    /* reg    <-> hex_bits_12(reg) */
  }