udb 0.1.13 → 0.1.15

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

@@ -38,21 +38,13 @@ fields:
       h! L ! 7   ! Locks the entry from further modification. Additionally, when set, PMP checks also apply to M-mode for the entry.
       h! MT ! 6:5 ! When the `Smpmpmt` extension is implemented, MT (Memory Type) is a WARL field that overrides the memory type for accesses that match this PMP entry.  See the `Smpmpmt` extension definition for encodings.  When the `Smpmpmt` extension is not implemented, MT is _Reserved_ Writes shall be ignored.
       h! A ! 4:3
-      a! Address matching mode. One of:
+      a! Address matching mode. Encodings:
 
-          [when="PMP_GRANULARITY < 2"]
           * *OFF* (0) - Null region (disabled)
           * *TOR* (1) - Top of range
           * *NA4* (2) - Naturally aligned four-byte region
           * *NAPOT* (3) - Naturally aligned power of two
 
-          [when="PMP_GRANULARITY >= 2"]
-          * *OFF* (0) - Null region (disabled)
-          * *TOR* (1) - Top of range
-          * *NAPOT* (3) - Naturally aligned power of two
-
-      [when="PMP_GRANULARITY >= 2"]
-      Naturally aligned four-byte region, *NA4* (2), is not valid (not needed when the PMP granularity is larger than 4 bytes).
 
       h! X ! 2 ! When clear, instruction fetches cause an `Access Fault` for the matching region and privilege mode.
       h! W ! 1 ! When clear, stores and AMOs cause an `Access Fault` for the matching region and privilege mode.
@@ -61,23 +53,28 @@ fields:
 
       The combination of R = 0, W = 1 is reserved.
     type(): |
-      if (NUM_PMP_ENTRIES > 36) {
+      if (NUM_USABLE_PMP_ENTRIES > 36) {
         return CsrFieldType::RWR;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if ((CSR[pmpcfg9].pmp36cfg & 0x80) == 0) {
-        # entry is not locked
-        if (!(((csr_value.pmp36cfg & 0x1) == 0) && ((csr_value.pmp36cfg & 0x2) == 0x2))) {
-          # not R = 0, W =1, which is reserved
-          if ((PMP_GRANULARITY < 2) ||
-              ((csr_value.pmp36cfg & 0x18) != 0x10)) {
-            # NA4 is not allowed when PMP granularity is larger than 4 bytes
-            return csr_value.pmp36cfg;
+      if (NUM_USABLE_PMP_ENTRIES > 36 && (CSR[pmpcfg9].pmp36cfg & 0x80) == 0) {
+        # entry is usable and not locked
+        Bits<8> new_cfg = csr_value.pmp36cfg;
+        Bits<2> a_mode = (new_cfg & 0x18) >> 3;
+        if (!(((new_cfg & 0x1) == 0) && ((new_cfg & 0x2) == 0x2))) {
+          # not R = 0, W = 1, which is reserved
+          if (((a_mode == 0x1) && !PMP_TOR_SUPPORTED) ||
+              ((a_mode == 0x2) && !PMP_NA4_SUPPORTED) ||
+              ((a_mode == 0x3) && !PMP_NAPOT_SUPPORTED)) {
+            # unsupported address matching mode; keep old value
+            return CSR[pmpcfg9].pmp36cfg;
           }
+          return new_cfg;
         }
       }
       # fall through: keep old value
@@ -96,21 +93,13 @@ fields:
       h! L ! 15   ! Locks the entry from further modification. Additionally, when set, PMP checks also apply to M-mode for the entry.
       h! MT ! 14:13 ! When the `Smpmpmt` extension is implemented, MT (Memory Type) is a WARL field that overrides the memory type for accesses that match this PMP entry.  See the `Smpmpmt` extension definition for encodings.  When the `Smpmpmt` extension is not implemented, MT is _Reserved_ Writes shall be ignored.
       h! A ! 12:11
-      a! Address matching mode. One of:
+      a! Address matching mode. Encodings:
 
-          [when="PMP_GRANULARITY < 2"]
           * *OFF* (0) - Null region (disabled)
           * *TOR* (1) - Top of range
           * *NA4* (2) - Naturally aligned four-byte region
           * *NAPOT* (3) - Naturally aligned power of two
 
-          [when="PMP_GRANULARITY >= 2"]
-          * *OFF* (0) - Null region (disabled)
-          * *TOR* (1) - Top of range
-          * *NAPOT* (3) - Naturally aligned power of two
-
-      [when="PMP_GRANULARITY >= 2"]
-      Naturally aligned four-byte region, *NA4* (2), is not valid (not needed when the PMP granularity is larger than 4 bytes).
 
       h! X ! 10 ! When clear, instruction fetches cause an `Access Fault` for the matching region and privilege mode.
       h! W ! 9 ! When clear, stores and AMOs cause an `Access Fault` for the matching region and privilege mode.
@@ -119,23 +108,28 @@ fields:
 
       The combination of R = 0, W = 1 is reserved.
     type(): |
-      if (NUM_PMP_ENTRIES > 37) {
+      if (NUM_USABLE_PMP_ENTRIES > 37) {
         return CsrFieldType::RWR;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if ((CSR[pmpcfg9].pmp37cfg & 0x80) == 0) {
-        # entry is not locked
-        if (!(((csr_value.pmp37cfg & 0x1) == 0) && ((csr_value.pmp37cfg & 0x2) == 0x2))) {
-          # not R = 0, W =1, which is reserved
-          if ((PMP_GRANULARITY < 2) ||
-              ((csr_value.pmp37cfg & 0x18) != 0x10)) {
-            # NA4 is not allowed when PMP granularity is larger than 4 bytes
-            return csr_value.pmp37cfg;
+      if (NUM_USABLE_PMP_ENTRIES > 37 && (CSR[pmpcfg9].pmp37cfg & 0x80) == 0) {
+        # entry is usable and not locked
+        Bits<8> new_cfg = csr_value.pmp37cfg;
+        Bits<2> a_mode = (new_cfg & 0x18) >> 3;
+        if (!(((new_cfg & 0x1) == 0) && ((new_cfg & 0x2) == 0x2))) {
+          # not R = 0, W = 1, which is reserved
+          if (((a_mode == 0x1) && !PMP_TOR_SUPPORTED) ||
+              ((a_mode == 0x2) && !PMP_NA4_SUPPORTED) ||
+              ((a_mode == 0x3) && !PMP_NAPOT_SUPPORTED)) {
+            # unsupported address matching mode; keep old value
+            return CSR[pmpcfg9].pmp37cfg;
           }
+          return new_cfg;
         }
       }
       # fall through: keep old value
@@ -154,21 +148,13 @@ fields:
       h! L ! 23   ! Locks the entry from further modification. Additionally, when set, PMP checks also apply to M-mode for the entry.
       h! MT ! 22:21 ! When the `Smpmpmt` extension is implemented, MT (Memory Type) is a WARL field that overrides the memory type for accesses that match this PMP entry.  See the `Smpmpmt` extension definition for encodings.  When the `Smpmpmt` extension is not implemented, MT is _Reserved_ Writes shall be ignored.
       h! A ! 20:19
-      a! Address matching mode. One of:
+      a! Address matching mode. Encodings:
 
-          [when="PMP_GRANULARITY < 2"]
           * *OFF* (0) - Null region (disabled)
           * *TOR* (1) - Top of range
           * *NA4* (2) - Naturally aligned four-byte region
           * *NAPOT* (3) - Naturally aligned power of two
 
-          [when="PMP_GRANULARITY >= 2"]
-          * *OFF* (0) - Null region (disabled)
-          * *TOR* (1) - Top of range
-          * *NAPOT* (3) - Naturally aligned power of two
-
-      [when="PMP_GRANULARITY >= 2"]
-      Naturally aligned four-byte region, *NA4* (2), is not valid (not needed when the PMP granularity is larger than 4 bytes).
 
       h! X ! 18 ! When clear, instruction fetches cause an `Access Fault` for the matching region and privilege mode.
       h! W ! 17 ! When clear, stores and AMOs cause an `Access Fault` for the matching region and privilege mode.
@@ -177,23 +163,28 @@ fields:
 
       The combination of R = 0, W = 1 is reserved.
     type(): |
-      if (NUM_PMP_ENTRIES > 38) {
+      if (NUM_USABLE_PMP_ENTRIES > 38) {
         return CsrFieldType::RWR;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if ((CSR[pmpcfg9].pmp38cfg & 0x80) == 0) {
-        # entry is not locked
-        if (!(((csr_value.pmp38cfg & 0x1) == 0) && ((csr_value.pmp38cfg & 0x2) == 0x2))) {
-          # not R = 0, W =1, which is reserved
-          if ((PMP_GRANULARITY < 2) ||
-              ((csr_value.pmp38cfg & 0x18) != 0x10)) {
-            # NA4 is not allowed when PMP granularity is larger than 4 bytes
-            return csr_value.pmp38cfg;
+      if (NUM_USABLE_PMP_ENTRIES > 38 && (CSR[pmpcfg9].pmp38cfg & 0x80) == 0) {
+        # entry is usable and not locked
+        Bits<8> new_cfg = csr_value.pmp38cfg;
+        Bits<2> a_mode = (new_cfg & 0x18) >> 3;
+        if (!(((new_cfg & 0x1) == 0) && ((new_cfg & 0x2) == 0x2))) {
+          # not R = 0, W = 1, which is reserved
+          if (((a_mode == 0x1) && !PMP_TOR_SUPPORTED) ||
+              ((a_mode == 0x2) && !PMP_NA4_SUPPORTED) ||
+              ((a_mode == 0x3) && !PMP_NAPOT_SUPPORTED)) {
+            # unsupported address matching mode; keep old value
+            return CSR[pmpcfg9].pmp38cfg;
           }
+          return new_cfg;
         }
       }
       # fall through: keep old value
@@ -212,21 +203,13 @@ fields:
       h! L ! 31   ! Locks the entry from further modification. Additionally, when set, PMP checks also apply to M-mode for the entry.
       h! MT ! 30:29 ! When the `Smpmpmt` extension is implemented, MT (Memory Type) is a WARL field that overrides the memory type for accesses that match this PMP entry.  See the `Smpmpmt` extension definition for encodings.  When the `Smpmpmt` extension is not implemented, MT is _Reserved_ Writes shall be ignored.
       h! A ! 28:27
-      a! Address matching mode. One of:
+      a! Address matching mode. Encodings:
 
-          [when="PMP_GRANULARITY < 2"]
           * *OFF* (0) - Null region (disabled)
           * *TOR* (1) - Top of range
           * *NA4* (2) - Naturally aligned four-byte region
           * *NAPOT* (3) - Naturally aligned power of two
 
-          [when="PMP_GRANULARITY >= 2"]
-          * *OFF* (0) - Null region (disabled)
-          * *TOR* (1) - Top of range
-          * *NAPOT* (3) - Naturally aligned power of two
-
-      [when="PMP_GRANULARITY >= 2"]
-      Naturally aligned four-byte region, *NA4* (2), is not valid (not needed when the PMP granularity is larger than 4 bytes).
 
       h! X ! 26 ! When clear, instruction fetches cause an `Access Fault` for the matching region and privilege mode.
       h! W ! 25 ! When clear, stores and AMOs cause an `Access Fault` for the matching region and privilege mode.
@@ -235,23 +218,28 @@ fields:
 
       The combination of R = 0, W = 1 is reserved.
     type(): |
-      if (NUM_PMP_ENTRIES > 39) {
+      if (NUM_USABLE_PMP_ENTRIES > 39) {
         return CsrFieldType::RWR;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if ((CSR[pmpcfg9].pmp39cfg & 0x80) == 0) {
-        # entry is not locked
-        if (!(((csr_value.pmp39cfg & 0x1) == 0) && ((csr_value.pmp39cfg & 0x2) == 0x2))) {
-          # not R = 0, W =1, which is reserved
-          if ((PMP_GRANULARITY < 2) ||
-              ((csr_value.pmp39cfg & 0x18) != 0x10)) {
-            # NA4 is not allowed when PMP granularity is larger than 4 bytes
-            return csr_value.pmp39cfg;
+      if (NUM_USABLE_PMP_ENTRIES > 39 && (CSR[pmpcfg9].pmp39cfg & 0x80) == 0) {
+        # entry is usable and not locked
+        Bits<8> new_cfg = csr_value.pmp39cfg;
+        Bits<2> a_mode = (new_cfg & 0x18) >> 3;
+        if (!(((new_cfg & 0x1) == 0) && ((new_cfg & 0x2) == 0x2))) {
+          # not R = 0, W = 1, which is reserved
+          if (((a_mode == 0x1) && !PMP_TOR_SUPPORTED) ||
+              ((a_mode == 0x2) && !PMP_NA4_SUPPORTED) ||
+              ((a_mode == 0x3) && !PMP_NAPOT_SUPPORTED)) {
+            # unsupported address matching mode; keep old value
+            return CSR[pmpcfg9].pmp39cfg;
           }
+          return new_cfg;
         }
       }
       # fall through: keep old value

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

@@ -50,21 +50,13 @@ fields:
       h! L ! <%= ((i+1)*8)-1 %>   ! Locks the entry from further modification. Additionally, when set, PMP checks also apply to M-mode for the entry.
       h! MT ! <%= ((i+1)*8)-2 %>:<%= ((i+1)*8)-3 %> ! When the `Smpmpmt` extension is implemented, MT (Memory Type) is a WARL field that overrides the memory type for accesses that match this PMP entry.  See the `Smpmpmt` extension definition for encodings.  When the `Smpmpmt` extension is not implemented, MT is _Reserved_ Writes shall be ignored.
       h! A ! <%= ((i+1)*8)-4 %>:<%= ((i+1)*8)-5 %>
-      a! Address matching mode. One of:
+      a! Address matching mode. Encodings:
 
-          [when="PMP_GRANULARITY < 2"]
           * *OFF* (0) - Null region (disabled)
           * *TOR* (1) - Top of range
           * *NA4* (2) - Naturally aligned four-byte region
           * *NAPOT* (3) - Naturally aligned power of two
 
-          [when="PMP_GRANULARITY >= 2"]
-          * *OFF* (0) - Null region (disabled)
-          * *TOR* (1) - Top of range
-          * *NAPOT* (3) - Naturally aligned power of two
-
-      [when="PMP_GRANULARITY >= 2"]
-      Naturally aligned four-byte region, *NA4* (2), is not valid (not needed when the PMP granularity is larger than 4 bytes).
 
       h! X ! <%= ((i)*8)+2 %> ! When clear, instruction fetches cause an `Access Fault` for the matching region and privilege mode.
       h! W ! <%= ((i)*8)+1 %> ! When clear, stores and AMOs cause an `Access Fault` for the matching region and privilege mode.
@@ -73,23 +65,28 @@ fields:
 
       The combination of R = 0, W = 1 is reserved.
     type(): |
-      if (NUM_PMP_ENTRIES > <%= pmpcfg_num*4 + i %>) {
+      if (NUM_USABLE_PMP_ENTRIES > <%= pmpcfg_num*4 + i %>) {
         return CsrFieldType::RWR;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (<%- if i > 4 -%>(xlen() == 64) && <%- end -%>(CSR[<%= "pmpcfg#{pmpcfg_num}" %>].pmp<%= pmpcfg_num*4 + i %>cfg & 0x80) == 0) {
-        # entry is not locked
-        if (!(((csr_value.pmp<%= pmpcfg_num*4 + i %>cfg & 0x1) == 0) && ((csr_value.pmp<%= pmpcfg_num*4 + i %>cfg & 0x2) == 0x2))) {
-          # not R = 0, W =1, which is reserved
-          if ((PMP_GRANULARITY < 2) ||
-              ((csr_value.pmp<%= pmpcfg_num*4 + i %>cfg & 0x18) != 0x10)) {
-            # NA4 is not allowed when PMP granularity is larger than 4 bytes
-            return csr_value.pmp<%= pmpcfg_num*4 + i %>cfg;
+      if (<%- if i > 4 -%>(xlen() == 64) && <%- end -%>NUM_USABLE_PMP_ENTRIES > <%= pmpcfg_num*4 + i %> && (CSR[<%= "pmpcfg#{pmpcfg_num}" %>].pmp<%= pmpcfg_num*4 + i %>cfg & 0x80) == 0) {
+        # entry is usable and not locked
+        Bits<8> new_cfg = csr_value.pmp<%= pmpcfg_num*4 + i %>cfg;
+        Bits<2> a_mode = (new_cfg & 0x18) >> 3;
+        if (!(((new_cfg & 0x1) == 0) && ((new_cfg & 0x2) == 0x2))) {
+          # not R = 0, W = 1, which is reserved
+          if (((a_mode == 0x1) && !PMP_TOR_SUPPORTED) ||
+              ((a_mode == 0x2) && !PMP_NA4_SUPPORTED) ||
+              ((a_mode == 0x3) && !PMP_NAPOT_SUPPORTED)) {
+            # unsupported address matching mode; keep old value
+            return CSR[<%= "pmpcfg#{pmpcfg_num}" %>].pmp<%= pmpcfg_num*4 + i %>cfg;
           }
+          return new_cfg;
         }
       }
       # fall through: keep old value

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/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(): |