udb 0.1.14 → 0.1.16

data/.data/spec/std/isa/csr/H/htinst.yaml

@@ -10,9 +10,9 @@ address: 0x64a
 writable: true
 long_name: Hypervisor Trap Instruction Register
 description: |
-  When a trap is taken into HS-mode, mtinst is written with a value that, if nonzero,
+  When a trap is taken into HS-mode, htinst is written with a value that, if nonzero,
   provides information about the instruction that trapped, to assist software in handling the trap.
-  The values that may be written to mtinst on a trap are documented in TODO.
+  The values that may be written to htinst on a trap are documented in TODO.
 
   htinst is a WARL register that need only be able to hold the values that the implementation may automatically write to it on a trap.
 priv_mode: S
@@ -34,7 +34,7 @@ fields:
           || (TINST_VALUE_ON_LOAD_ADDRESS_MISALIGNED != "always zero")
           || (TINST_VALUE_ON_LOAD_ACCESS_FAULT != "always zero")
           || (TINST_VALUE_ON_STORE_AMO_ADDRESS_MISALIGNED != "always zero")
-          || (TINST_VALUE_ON_STORE_AMO_ACCESS_FAULT != "always_zero")
+          || (TINST_VALUE_ON_STORE_AMO_ACCESS_FAULT != "always zero")
           || (TINST_VALUE_ON_UCALL != "always zero")
           || (TINST_VALUE_ON_SCALL != "always zero")
           || (TINST_VALUE_ON_MCALL != "always zero")

data/.data/spec/std/isa/csr/H/htval.yaml

@@ -19,8 +19,8 @@ description: |
   Otherwise, for misaligned loads and stores that cause guest-page faults, a nonzero guest physical address in htval corresponds to the faulting portion of the access as indicated by the virtual address in stval. For instruction guest-page faults on systems with variable-length instructions, a nonzero htval corresponds to the faulting portion of the instruction as indicated by the virtual address in stval.
 
   htval is a WARL register that must be able to hold zero and may be capable of holding only an arbitrary subset of other 2-bit-shifted guest physical addresses, if any.
-priv_mode: M
-length: MXLEN
+priv_mode: S
+length: SXLEN
 definedBy:
   extension:
     name: H
@@ -38,5 +38,5 @@ fields:
         return CsrFieldType::RO;
       }
     description: |
-      Exception-specific information for a trap into M-mode.
+      Exception-specific information for a trap into HS-mode.
     reset_value: UNDEFINED_LEGAL

data/.data/spec/std/isa/csr/H/mtinst.yaml

@@ -34,7 +34,7 @@ fields:
           || (TINST_VALUE_ON_LOAD_ADDRESS_MISALIGNED != "always zero")
           || (TINST_VALUE_ON_LOAD_ACCESS_FAULT != "always zero")
           || (TINST_VALUE_ON_STORE_AMO_ADDRESS_MISALIGNED != "always zero")
-          || (TINST_VALUE_ON_STORE_AMO_ACCESS_FAULT != "always_zero")
+          || (TINST_VALUE_ON_STORE_AMO_ACCESS_FAULT != "always zero")
           || (TINST_VALUE_ON_UCALL != "always zero")
           || (TINST_VALUE_ON_SCALL != "always zero")
           || (TINST_VALUE_ON_MCALL != "always zero")

data/.data/spec/std/isa/csr/Smcntrpmf/mcyclecfg.yaml

@@ -48,7 +48,7 @@ fields:
       allOf:
         - xlen: 64
         - extension:
-            name: M
+            name: Sm
     description: If set, then counting of events in M-mode is inhibited.
     reset_value: UNDEFINED_LEGAL
 

data/.data/spec/std/isa/csr/Smcntrpmf/mcyclecfgh.yaml

@@ -24,7 +24,7 @@ fields:
     type: RW
     definedBy:
       extension:
-        name: M
+        name: Sm
     description: If set, then counting of events in M-mode is inhibited.
     reset_value: UNDEFINED_LEGAL
 

data/.data/spec/std/isa/csr/Smcntrpmf/minstretcfg.yaml

@@ -45,7 +45,7 @@ fields:
       allOf:
         - xlen: 64
         - extension:
-            name: M
+            name: Sm
     description: If set, then counting of events in M-mode is inhibited.
     reset_value: UNDEFINED_LEGAL
 

data/.data/spec/std/isa/csr/Smcntrpmf/minstretcfgh.yaml

@@ -24,7 +24,7 @@ fields:
     type: RW
     definedBy:
       extension:
-        name: M
+        name: Sm
     description: If set, then counting of events in M-mode is inhibited.
     reset_value: UNDEFINED_LEGAL
 

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

@@ -225,4 +225,4 @@ sw_read(): |
   if (MCTRCTL_CUSTOM_IMPLEMENTED) {
     mask = mask | (4'b1111 `<< 60);
   }
-  return ($bits(CSR[mctrctl]) & mask);
+  return ($bits(CSR[vsctrctl]) & mask);

data/.data/spec/std/isa/csr/Sscofpmf/scountovf.layout

@@ -41,7 +41,7 @@ fields:
       [when="HPM_COUNTER_EN[<%= of_num %>] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[<%= of_num %>] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[<%= of_num %>] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[<%= of_num %>] ? UNDEFINED_LEGAL : 0;
 <%- end -%>

data/.data/spec/std/isa/csr/Sscofpmf/scountovf.yaml

@@ -43,7 +43,7 @@ fields:
       [when="HPM_COUNTER_EN[3] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[3] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[3] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[3] ? UNDEFINED_LEGAL : 0;
   OF4:
@@ -56,7 +56,7 @@ fields:
       [when="HPM_COUNTER_EN[4] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[4] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[4] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[4] ? UNDEFINED_LEGAL : 0;
   OF5:
@@ -69,7 +69,7 @@ fields:
       [when="HPM_COUNTER_EN[5] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[5] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[5] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[5] ? UNDEFINED_LEGAL : 0;
   OF6:
@@ -82,7 +82,7 @@ fields:
       [when="HPM_COUNTER_EN[6] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[6] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[6] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[6] ? UNDEFINED_LEGAL : 0;
   OF7:
@@ -95,7 +95,7 @@ fields:
       [when="HPM_COUNTER_EN[7] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[7] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[7] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[7] ? UNDEFINED_LEGAL : 0;
   OF8:
@@ -108,7 +108,7 @@ fields:
       [when="HPM_COUNTER_EN[8] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[8] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[8] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[8] ? UNDEFINED_LEGAL : 0;
   OF9:
@@ -121,7 +121,7 @@ fields:
       [when="HPM_COUNTER_EN[9] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[9] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[9] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[9] ? UNDEFINED_LEGAL : 0;
   OF10:
@@ -134,7 +134,7 @@ fields:
       [when="HPM_COUNTER_EN[10] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[10] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[10] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[10] ? UNDEFINED_LEGAL : 0;
   OF11:
@@ -147,7 +147,7 @@ fields:
       [when="HPM_COUNTER_EN[11] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[11] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[11] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[11] ? UNDEFINED_LEGAL : 0;
   OF12:
@@ -160,7 +160,7 @@ fields:
       [when="HPM_COUNTER_EN[12] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[12] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[12] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[12] ? UNDEFINED_LEGAL : 0;
   OF13:
@@ -173,7 +173,7 @@ fields:
       [when="HPM_COUNTER_EN[13] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[13] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[13] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[13] ? UNDEFINED_LEGAL : 0;
   OF14:
@@ -186,7 +186,7 @@ fields:
       [when="HPM_COUNTER_EN[14] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[14] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[14] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[14] ? UNDEFINED_LEGAL : 0;
   OF15:
@@ -199,7 +199,7 @@ fields:
       [when="HPM_COUNTER_EN[15] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[15] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[15] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[15] ? UNDEFINED_LEGAL : 0;
   OF16:
@@ -212,7 +212,7 @@ fields:
       [when="HPM_COUNTER_EN[16] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[16] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[16] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[16] ? UNDEFINED_LEGAL : 0;
   OF17:
@@ -225,7 +225,7 @@ fields:
       [when="HPM_COUNTER_EN[17] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[17] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[17] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[17] ? UNDEFINED_LEGAL : 0;
   OF18:
@@ -238,7 +238,7 @@ fields:
       [when="HPM_COUNTER_EN[18] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[18] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[18] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[18] ? UNDEFINED_LEGAL : 0;
   OF19:
@@ -251,7 +251,7 @@ fields:
       [when="HPM_COUNTER_EN[19] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[19] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[19] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[19] ? UNDEFINED_LEGAL : 0;
   OF20:
@@ -264,7 +264,7 @@ fields:
       [when="HPM_COUNTER_EN[20] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[20] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[20] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[20] ? UNDEFINED_LEGAL : 0;
   OF21:
@@ -277,7 +277,7 @@ fields:
       [when="HPM_COUNTER_EN[21] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[21] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[21] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[21] ? UNDEFINED_LEGAL : 0;
   OF22:
@@ -290,7 +290,7 @@ fields:
       [when="HPM_COUNTER_EN[22] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[22] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[22] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[22] ? UNDEFINED_LEGAL : 0;
   OF23:
@@ -303,7 +303,7 @@ fields:
       [when="HPM_COUNTER_EN[23] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[23] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[23] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[23] ? UNDEFINED_LEGAL : 0;
   OF24:
@@ -316,7 +316,7 @@ fields:
       [when="HPM_COUNTER_EN[24] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[24] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[24] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[24] ? UNDEFINED_LEGAL : 0;
   OF25:
@@ -329,7 +329,7 @@ fields:
       [when="HPM_COUNTER_EN[25] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[25] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[25] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[25] ? UNDEFINED_LEGAL : 0;
   OF26:
@@ -342,7 +342,7 @@ fields:
       [when="HPM_COUNTER_EN[26] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[26] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[26] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[26] ? UNDEFINED_LEGAL : 0;
   OF27:
@@ -355,7 +355,7 @@ fields:
       [when="HPM_COUNTER_EN[27] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[27] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[27] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[27] ? UNDEFINED_LEGAL : 0;
   OF28:
@@ -368,7 +368,7 @@ fields:
       [when="HPM_COUNTER_EN[28] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[28] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[28] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[28] ? UNDEFINED_LEGAL : 0;
   OF29:
@@ -381,7 +381,7 @@ fields:
       [when="HPM_COUNTER_EN[29] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[29] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[29] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[29] ? UNDEFINED_LEGAL : 0;
   OF30:
@@ -394,7 +394,7 @@ fields:
       [when="HPM_COUNTER_EN[30] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[30] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[30] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[30] ? UNDEFINED_LEGAL : 0;
   OF31:
@@ -407,7 +407,7 @@ fields:
       [when="HPM_COUNTER_EN[31] == false"]
       This field is read-only zero because the counter is not enabled.
     type(): |
-      return HPM_COUNTER_EN[31] ? CsrFieldType::RO : CsrFieldType::ROH;
+      return HPM_COUNTER_EN[31] ? CsrFieldType::ROH : CsrFieldType::RO;
     reset_value(): |
       return HPM_COUNTER_EN[31] ? UNDEFINED_LEGAL : 0;
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter10.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent10.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent10.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent10.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent10.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent10.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent10.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent10.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent10.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent10.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent10.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter10h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT10[63:32]
+    alias: mhpmcounter10.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter11.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent11.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent11.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent11.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent11.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent11.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent11.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent11.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent11.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent11.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent11.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter11h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT11[63:32]
+    alias: mhpmcounter11.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter12.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent12.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent12.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent12.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent12.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent12.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent12.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent12.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent12.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent12.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent12.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter12h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT12[63:32]
+    alias: mhpmcounter12.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter13.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent13.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent13.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent13.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent13.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent13.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent13.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent13.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent13.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent13.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent13.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter13h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT13[63:32]
+    alias: mhpmcounter13.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter14.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent14.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent14.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent14.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent14.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent14.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent14.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent14.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent14.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent14.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent14.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter14h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT14[63:32]
+    alias: mhpmcounter14.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter15.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent15.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent15.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent15.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent15.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent15.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent15.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent15.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent15.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent15.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent15.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter15h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT15[63:32]
+    alias: mhpmcounter15.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter16.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent16.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent16.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent16.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent16.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent16.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent16.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent16.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent16.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent16.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent16.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter16h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT16[63:32]
+    alias: mhpmcounter16.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter17.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent17.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent17.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent17.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent17.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent17.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent17.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent17.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent17.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent17.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent17.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter17h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT17[63:32]
+    alias: mhpmcounter17.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter18.yaml

@@ -84,14 +84,14 @@ fields:
         <%- if ext?(:Sscofpmf) -%>
         * `mhpmevent18.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mhpmevent18.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18..SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mhpmevent18.SINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mhpmevent18.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.SINH`<%- end -%> is set and the current privilege level is U
+        * `mhpmevent18.UINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mhpmevent18.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mhpmevent18.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mhpmevent18.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mhpmevent18.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `hpmevent18.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
       --

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter18h.yaml

@@ -74,7 +74,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT18[63:32]
+    alias: mhpmcounter18.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |