udb 0.1.16 → 0.1.17

data/.data/spec/std/isa/csr/I/pmpaddr8.yaml

@@ -48,16 +48,16 @@ fields:
         return csr_value.ADDR;
       }
 sw_read(): |
-  # when the mode is NAPOT and PMP_GRANULARITY >= 16,
+  # when the mode is NAPOT and PMP_GRANULARITY >= 4,
   # bits (PMP_GRANULARITY-4):0 must read as ones
   if (MXLEN == 32) {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg2].pmp8cfg[4] == 1)) {
       return CSR[pmpaddr8].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg2].pmp8cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr8].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr8].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg2].pmp8cfg[4] == 1)) {
       return CSR[pmpaddr8].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg2].pmp8cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr8].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddr9.yaml

@@ -48,16 +48,16 @@ fields:
         return csr_value.ADDR;
       }
 sw_read(): |
-  # when the mode is NAPOT and PMP_GRANULARITY >= 16,
+  # when the mode is NAPOT and PMP_GRANULARITY >= 4,
   # bits (PMP_GRANULARITY-4):0 must read as ones
   if (MXLEN == 32) {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg2].pmp9cfg[4] == 1)) {
       return CSR[pmpaddr9].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg2].pmp9cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr9].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr9].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg2].pmp9cfg[4] == 1)) {
       return CSR[pmpaddr9].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg2].pmp9cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr9].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddrN.layout

@@ -50,16 +50,16 @@ fields:
         return csr_value.ADDR;
       }
 sw_read(): |
-  # when the mode is NAPOT and PMP_GRANULARITY >= 16,
+  # when the mode is NAPOT and PMP_GRANULARITY >= 4,
   # bits (PMP_GRANULARITY-4):0 must read as ones
   if (MXLEN == 32) {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg<%= pmpcfg_num_32 %>].pmp<%= pmpaddr_num %>cfg[4] == 1)) {
       return CSR[pmpaddr<%= pmpaddr_num %>].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg<%= pmpcfg_num_32 %>].pmp<%= pmpaddr_num %>cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr<%= pmpaddr_num %>].ADDR & ~mask;
@@ -69,13 +69,13 @@ sw_read(): |
       return CSR[pmpaddr<%= pmpaddr_num %>].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg<%= pmpcfg_num_64 %>].pmp<%= pmpaddr_num %>cfg[4] == 1)) {
       return CSR[pmpaddr<%= pmpaddr_num %>].ADDR | {PMP_GRANULARITY-3{1'b1}};
 
-    # when the mode is OFF or TOR and PMP_GRANULARITY >= 8,
+    # when the mode is OFF or TOR and PMP_GRANULARITY >= 3,
     # bits (PMP_GRANULARITY-3):0 must read as zeros
-    } else if ((PMP_GRANULARITY >= 8) &&
+    } else if ((PMP_GRANULARITY >= 3) &&
                 (CSR[pmpcfg<%= pmpcfg_num_64 %>].pmp<%= pmpaddr_num %>cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr<%= pmpaddr_num %>].ADDR & ~mask;

data/.data/spec/std/isa/csr/Smcsrind/mireg.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 1);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 1);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 1);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 1);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/mireg2.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 2);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 2);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 2);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 2);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/mireg3.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 3);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 3);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 3);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 3);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/mireg4.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 4);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 4);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 4);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 4);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/mireg5.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 5);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 5);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 5);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 5);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/mireg6.yaml

@@ -46,7 +46,7 @@ fields:
       Register state of the CSR selected by the current `miselect` value
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 6);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 6);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[miselect].VALUE, 6);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::M, CSR[miselect].VALUE, 6);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 1);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 1);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 1);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 1);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg2.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 2);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 2);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 2);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 2);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg3.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 3);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 3);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 3);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 3);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg4.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 4);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 4);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 4);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 4);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg5.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 5);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 5);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 5);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 5);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/sireg6.yaml

@@ -46,7 +46,7 @@ fields:
       The data read from or written to the register selected by the current `siselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 6);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 6);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[siselect].VALUE, 6);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::S, CSR[siselect].VALUE, 6);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg.yaml

@@ -46,7 +46,7 @@ fields:
       value of the `vsiselect` CSR.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 1);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 1);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -56,7 +56,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 1);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 1);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg2.yaml

@@ -45,7 +45,7 @@ fields:
       Data read or written based on the currently selected `vsiselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 2);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 2);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -55,7 +55,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 2);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 2);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg3.yaml

@@ -44,7 +44,7 @@ fields:
     description: The data read or written based on the currently selected `vsiselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 3);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 3);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -54,7 +54,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 3);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 3);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg4.yaml

@@ -44,7 +44,7 @@ fields:
     description: The data read or written based on the currently selected `vsiselect` value.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 4);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 4);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -54,7 +54,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 4);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 4);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg5.yaml

@@ -45,7 +45,7 @@ fields:
       The data read or written from the register selected by the value in `vsiselect`.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 5);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 5);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -55,7 +55,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 5);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 5);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smcsrind/vsireg6.yaml

@@ -45,7 +45,7 @@ fields:
       The data read or written from the register selected by the current value of `vsiselect`.
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 6);
+      Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 6);
       if (!handle.valid) {
         unimplemented_csr($encoding);
       }
@@ -55,7 +55,7 @@ fields:
       csr_sw_write(handle, csr_value.VALUE);
       return csr_hw_read(handle);
 sw_read(): |
-  Csr handle = indirect_csr_lookup(CSR[vsiselect].VALUE, 6);
+  Csr handle = indirect_csr_lookup(PrivilegeMode::VS, CSR[vsiselect].VALUE, 6);
   if (!handle.valid) {
     unimplemented_csr($encoding);
   }

data/.data/spec/std/isa/csr/Smctr/sctrctl.yaml

@@ -13,7 +13,7 @@ priv_mode: S
 length: 64
 definedBy:
   extension:
-    name: Smctr
+    name: Ssctr
 description: The `sctrctl` register enables and configures the Control Transfer Records capability in S mode.
 fields:
   U:

data/.data/spec/std/isa/csr/Smctr/sctrdepth.yaml

@@ -0,0 +1,43 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# yaml-language-server: $schema=../../../../schemas/csr_schema.json
+
+$schema: "csr_schema.json#"
+kind: csr
+name: sctrdepth
+long_name: Supervisor Control Transfer Records Depth
+address: 0x15F
+writable: true
+priv_mode: S
+length: 32
+description: |
+  The `sctrdepth` register is a 32-bit read/write register used to select the number
+  of records that can be held in the CTR buffer.
+definedBy:
+  extension:
+    name: Smctr
+fields:
+  DEPTH:
+    location: 2-0
+    description: |
+      Selects the depth of the CTR buffer.
+    type(): |
+      return ($array_size(SCTRDEPTH_DEPTH_LEGAL_VALUES) == 1) ? CsrFieldType::RO : CsrFieldType::RW;
+    reset_value(): |
+      if ($array_size(SCTRDEPTH_DEPTH_LEGAL_VALUES) == 1) {
+        if (SCTRDEPTH_DEPTH_LEGAL_VALUES[0] == 16) { return 0; }
+        else if (SCTRDEPTH_DEPTH_LEGAL_VALUES[0] == 32) { return 1; }
+        else if (SCTRDEPTH_DEPTH_LEGAL_VALUES[0] == 64) { return 2; }
+        else if (SCTRDEPTH_DEPTH_LEGAL_VALUES[0] == 128) { return 3; }
+        else if (SCTRDEPTH_DEPTH_LEGAL_VALUES[0] == 256) { return 4; }
+        else { return UNDEFINED_LEGAL; }
+      } else {
+        return UNDEFINED_LEGAL;
+      }
+    sw_write(csr_value): |
+      if ($array_includes?(SCTRDEPTH_DEPTH_LEGAL_VALUES, 32'd16 << csr_value.DEPTH)) {
+        return csr_value.DEPTH;
+      } else {
+        return UNDEFINED_LEGAL_DETERMINISTIC;
+      }

data/.data/spec/std/isa/csr/Smctr/sctrstatus.yaml

@@ -0,0 +1,37 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# yaml-language-server: $schema=../../../../schemas/csr_schema.json
+
+$schema: "csr_schema.json#"
+kind: csr
+name: sctrstatus
+long_name: Supervisor Control Transfer Records Status
+address: 0x14F
+writable: true
+priv_mode: S
+length: 32
+description: |
+  The `sctrstatus` register provides access to CTR status information and is
+  updated by hardware whenever CTR is active.
+definedBy:
+  extension:
+    name: Smctr
+fields:
+  WRPTR:
+    location: 7-0
+    description: |
+      Write Pointer. Indicates the physical CTR buffer entry to be written next.
+
+      Note: Bits above depth-1 are read-only zero depending on the configured CTR depth.
+    type: RW-H
+    reset_value: UNDEFINED_LEGAL
+    sw_write(csr_value): |
+      Bits<8> mask = (9'd16 << CSR[sctrdepth].DEPTH) - 1;
+      return csr_value.WRPTR & mask;
+  FROZEN:
+    location: 31
+    description: |
+      When set, inhibits transfer recording.
+    type: RW-H
+    reset_value: UNDEFINED_LEGAL

data/.data/spec/std/isa/csr/Smctr/vsctrctl.yaml

@@ -14,7 +14,9 @@ priv_mode: VS
 length: 64
 definedBy:
   extension:
-    name: Smctr
+    allOf:
+      - name: Ssctr
+      - name: H
 description: |
   The `vsctrctl` register is a VS-mode's version of supervisor register `sctrctl` that
   configures the Control Transfer Records capability. When `V=1`, vsctrctl substitutes

data/.data/spec/std/isa/csr/Sstc/stimecmp.yaml

@@ -0,0 +1,42 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# yaml-language-server: $schema=../../../../schemas/csr_schema.json
+
+$schema: "csr_schema.json#"
+kind: csr
+name: stimecmp
+long_name: Supervisor timer compare
+address: 0x14D
+writable: true
+priv_mode: S
+length: 64
+description: |
+  Supervisor timer compare register.
+
+  When `menvcfg.STCE` is set, `stimecmp` is operational and provides
+  supervisor mode with a CSR-based timer interrupt facility.
+definedBy:
+  extension:
+    name: Sstc
+fields:
+  TIME:
+    location: 63-0
+    description: |
+      Time compare value for supervisor timer interrupts.
+    type: RW
+    reset_value: UNDEFINED_LEGAL
+    sw_write(csr_value): |
+      if (mode() != PrivilegeMode::M) {
+        if (CSR[menvcfg].STCE == 1'b0 || CSR[mcounteren].TM == 1'b0) {
+          raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+        }
+      }
+      return csr_value.TIME;
+sw_read(): |
+  if (mode() != PrivilegeMode::M) {
+    if (CSR[menvcfg].STCE == 1'b0 || CSR[mcounteren].TM == 1'b0) {
+      raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+    }
+  }
+  return CSR[stimecmp].TIME;

data/.data/spec/std/isa/csr/Sstc/stimecmph.yaml

@@ -0,0 +1,43 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# yaml-language-server: $schema=../../../../schemas/csr_schema.json
+
+$schema: "csr_schema.json#"
+kind: csr
+name: stimecmph
+long_name: Supervisor timer compare high
+address: 0x15D
+writable: true
+priv_mode: S
+length: 32
+description: |
+  Upper 32 bits of the `stimecmp` CSR.
+definedBy:
+  allOf:
+    - xlen: 32
+    - extension:
+        name: Sstc
+fields:
+  TIME:
+    location: 31-0
+    alias: stimecmp.TIME[63:32]
+    description: |
+      Upper 32 bits of the supervisor timer compare value.
+    type: RW
+    reset_value: UNDEFINED_LEGAL
+    sw_write(csr_value): |
+      if (mode() != PrivilegeMode::M) {
+        if (CSR[menvcfg].STCE == 1'b0 || CSR[mcounteren].TM == 1'b0) {
+          raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+        }
+      }
+      CSR[stimecmp].TIME = {csr_value.TIME, CSR[stimecmp].TIME[31:0]};
+      return csr_value.TIME;
+sw_read(): |
+  if (mode() != PrivilegeMode::M) {
+    if (CSR[menvcfg].STCE == 1'b0 || CSR[mcounteren].TM == 1'b0) {
+      raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+    }
+  }
+  return CSR[stimecmp].TIME[63:32];