udb 0.1.14 → 0.1.15

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/.data/spec/std/isa/csr/Zihpm/mhpmcounterN.layout

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

data/.data/spec/std/isa/csr/Zihpm/mhpmcounterNh.layout

@@ -72,7 +72,7 @@ definedBy:
 fields:
   COUNT:
     location: 31-0
-    alias: mhpmcounter.COUNT<%= hpm_num %>[63:32]
+    alias: mhpmcounter<%= hpm_num %>.COUNT[63:32]
     description: |
       Upper bits of counter.
     type(): |

data/.data/spec/std/isa/csr/hstatus.yaml

@@ -138,7 +138,7 @@ fields:
 
       Notably, `hstatus.VTVM` does *not* cause `hfence.vvma`, `sfence.w.inval`, or `sfence.inval.ir` to trap.
 
-      `mstatus.TVM` does not affect the VS-mode instructions controlled by `hstatus.TVTM`.
+      `mstatus.TVM` does not affect the VS-mode instructions controlled by `hstatus.VTVM`.
     type: RW
     reset_value: UNDEFINED_LEGAL
   VGEIN:

data/.data/spec/std/isa/csr/mcycle.yaml

@@ -32,7 +32,7 @@ fields:
       # since writes to this register may not be hart-local, it must be handled
       # as a special case
       if (xlen() == 32) {
-        return sw_write_mcycle({read_mcycle()[63:31], csr_value.COUNT[31:0]});
+        return sw_write_mcycle({read_mcycle()[63:32], csr_value.COUNT[31:0]});
       } else {
         return sw_write_mcycle(csr_value.COUNT);
       }
@@ -40,7 +40,7 @@ fields:
       Cycle counter.
 
       <%- if ext?(:Zicntr) -%>
-      Aliased as `cycle.CYCLE`.
+      Aliased as `cycle.COUNT`.
       <%- end -%>
 
       Increments every cycle unless:
@@ -49,14 +49,14 @@ fields:
         <%- if ext?(:Smcntrpmf) -%>
         * `mcyclecfg.MINH` is set and the current privilege level is M
         <%- if ext?(:S) -%>
-        * `mcyclecfg.SINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is (H)S
+        * `mcyclecfg.SINH` <%- if ext?(:Ssccfg) -%>or its alias `cyclecfg.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `mcyclecfg.UINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is U
+        * `mcyclecfg.UINH` <%- if ext?(:Ssccfg) -%>or its alias `cyclecfg.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `mcyclecfg.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is VS
-        * `mcyclecfg.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is VU
+        * `mcyclecfg.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `cyclecfg.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `mcyclecfg.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `cyclecfg.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
     reset_value: UNDEFINED_LEGAL