udb 0.1.15 → 0.1.17

data/.data/spec/std/isa/csr/I/pmpaddr60.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[pmpcfg15].pmp60cfg[4] == 1)) {
       return CSR[pmpaddr60].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[pmpcfg15].pmp60cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr60].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr60].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg14].pmp60cfg[4] == 1)) {
       return CSR[pmpaddr60].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[pmpcfg14].pmp60cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr60].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddr61.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[pmpcfg15].pmp61cfg[4] == 1)) {
       return CSR[pmpaddr61].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[pmpcfg15].pmp61cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr61].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr61].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg14].pmp61cfg[4] == 1)) {
       return CSR[pmpaddr61].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[pmpcfg14].pmp61cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr61].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddr62.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[pmpcfg15].pmp62cfg[4] == 1)) {
       return CSR[pmpaddr62].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[pmpcfg15].pmp62cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr62].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr62].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg14].pmp62cfg[4] == 1)) {
       return CSR[pmpaddr62].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[pmpcfg14].pmp62cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr62].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddr63.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[pmpcfg15].pmp63cfg[4] == 1)) {
       return CSR[pmpaddr63].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[pmpcfg15].pmp63cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr63].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr63].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg14].pmp63cfg[4] == 1)) {
       return CSR[pmpaddr63].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[pmpcfg14].pmp63cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr63].ADDR & ~mask;

data/.data/spec/std/isa/csr/I/pmpaddr7.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[pmpcfg1].pmp7cfg[4] == 1)) {
       return CSR[pmpaddr7].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[pmpcfg1].pmp7cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr7].ADDR & ~mask;
@@ -67,13 +67,13 @@ sw_read(): |
       return CSR[pmpaddr7].ADDR;
     }
   } else {
-    if ((PMP_GRANULARITY >= 16) &&
+    if ((PMP_GRANULARITY >= 4) &&
         (CSR[pmpcfg0].pmp7cfg[4] == 1)) {
       return CSR[pmpaddr7].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[pmpcfg0].pmp7cfg[4] == 0)) {
       Bits<PHYS_ADDR_WIDTH-2> mask = {PMP_GRANULARITY-2{1'b1}};
       return CSR[pmpaddr7].ADDR & ~mask;

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: