udb 0.1.13 → 0.1.15

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/jvt.yaml

@@ -56,6 +56,7 @@ fields:
             && (CSR[sstateen0].JVT == 1'b0 || CSR[hstateen0].JVT == 1'b0) )) {
 
         unimplemented_csr($encoding);
+        return 0;
       }
       else {
         if (JVT_BASE_TYPE == "custom") {

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

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

@@ -296,6 +296,26 @@ fields:
         name: Zicfiss
     type: RW
     reset_value: UNDEFINED_LEGAL
+  LPE:
+    location: 2
+    description: |
+      *Landing Pad Enable*
+
+      When the LPE field is set to 1 and S-mode is implemented, the Zicfilp
+      extension is enabled in S-mode. If the LPE field is set to 1 and S-mode
+      is not implemented, the Zicfilp extension is enabled in U-mode. When the
+      LPE field is 0, the Zicfilp extension is not enabled in S-mode (or U-mode
+      if S-mode is not implemented), and the following rules apply:
+
+        * The hart does not update the `ELP` state; it remains as `NO_LP_EXPECTED`.
+        * The `LPAD` instruction operates as a no-op.
+
+      When `menvcfg.LPE` is 0, `henvcfg.LPE` and `senvcfg.LPE` are read-only zero.
+    definedBy:
+      extension:
+        name: Zicfilp
+    type: RW
+    reset_value: UNDEFINED_LEGAL
   FIOM:
     location: 0
     description: |

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

@@ -37,11 +37,11 @@ fields:
         * `minstretcfg.SINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is (H)S
         <%- end -%>
         <%- if ext?(:U) -%>
-        * `minstretcfg.UINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is U
+        * `minstretcfg.UINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.UINH`<%- end -%> is set and the current privilege level is U
         <%- end -%>
         <%- if ext?(:H) -%>
-        * `minstretcfg.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is VS
-        * `minstretcfg.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.SINH`<%- end -%> is set and the current privilege level is VU
+        * `minstretcfg.VSINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.VSINH`<%- end -%> is set and the current privilege level is VS
+        * `minstretcfg.VUINH` <%- if ext?(:Ssccfg) -%>or its alias `instretcfg.VUINH`<%- end -%> is set and the current privilege level is VU
         <%- end -%>
         <%- end -%>
 

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

@@ -28,7 +28,7 @@ fields:
     reset_value: UNDEFINED_LEGAL
     affectedBy: [Zicntr, Smcntrpmf, Smcdeleg, Ssccfg]
     sw_write(csr_value): |
-      CSR[mcycle].COUNT = {csr_value.COUNT[31:0], CSR[minstret].COUNT[31:0]};
+      CSR[minstret].COUNT = {csr_value.COUNT[31:0], CSR[minstret].COUNT[31:0]};
       return csr_value.COUNT;
 definedBy:
   allOf:

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

@@ -111,7 +111,11 @@ fields:
     long_name: Guest Virtual Address
     description: |
       When a trap is taken and a guest virtual address is written into mtval, GVA is set.
-      When a trap is taken and a guest virtual address is written into mtval, GVA is cleared.
+      GVA is written by the implementation whenever a trap is taken into
+      HS mode. For any trap (breakpoint, address misaligned, access fault,
+      page fault, or guest-page fault) that writes a guest virtual address to
+      `stval`, GVA is set to 1. For any other trap into HS-mode,
+      GVA is set to 0.
     type: RW-H
     reset_value: 0
     definedBy:
@@ -328,6 +332,8 @@ fields:
     type(): |
       if (CSR[misa].S == 1'b0) {
         return CsrFieldType::RO;
+      } else if (!(implemented?(ExtensionName::Sv32) || implemented?(ExtensionName::Sv39) || implemented?(ExtensionName::Sv48) || implemented?(ExtensionName::Sv57))) {
+        return CsrFieldType::RO;
       } else {
         return CsrFieldType::RW;
       }
@@ -337,18 +343,18 @@ fields:
     reset_value(): |
       if (CSR[misa].S == 1'b0) {
         return 0;
-      } else if (MSTATUS_TVM_IMPLEMENTED) {
-        return UNDEFINED_LEGAL;
-      } else {
+      } else if (!(implemented?(ExtensionName::Sv32) || implemented?(ExtensionName::Sv39) || implemented?(ExtensionName::Sv48) || implemented?(ExtensionName::Sv57))) {
         return 0;
+      } else {
+        return UNDEFINED_LEGAL;
       }
     sw_write(csr_value): |
       if (CSR[misa].S == 1'b0) {
         return 0;
-      } else if (MSTATUS_TVM_IMPLEMENTED) {
-        return csr_value.TVM;
-      } else {
+      } else if (!(implemented?(ExtensionName::Sv32) || implemented?(ExtensionName::Sv39) || implemented?(ExtensionName::Sv48) || implemented?(ExtensionName::Sv57))) {
         return 0;
+      } else {
+        return csr_value.TVM;
       }
   MXR:
     location: 19
@@ -434,6 +440,10 @@ fields:
           - name: F
           - name: S
     reset_value(): |
+      if (MISA_CSR_IMPLEMENTED && (CSR[misa].S == 1'b0) && (CSR[misa].F == 1'b0)) {
+        # must be read-only-0
+        return 0;
+      }
       return $array_size(MSTATUS_FS_LEGAL_VALUES) == 1 ? MSTATUS_FS_LEGAL_VALUES[0] : UNDEFINED_LEGAL;
     sw_write(csr_value): |
       if (MISA_CSR_IMPLEMENTED && (CSR[misa].S == 1'b0) && (CSR[misa].F == 1'b0)) {
@@ -497,31 +507,17 @@ fields:
         return $array_size(MSTATUS_VS_LEGAL_VALUES) == 1 ? CsrFieldType::RO : CsrFieldType::RW;
       }
     reset_value(): |
-      if (CSR[misa].V == 1'b1){
-        return UNDEFINED_LEGAL;
-      } else if ((CSR[misa].S == 1'b0) && (CSR[misa].V == 1'b0)) {
+      if ((!implemented?(ExtensionName::S) && !implemented?(ExtensionName::V)) || (MISA_CSR_IMPLEMENTED && (CSR[misa].S == 1'b0) && (CSR[misa].V == 1'b0))) {
         # must be read-only-0
         return 0;
-      } else {
-        # there will be no hardware update in this case because we know the V extension isn't implemented
-        if ($array_size(MSTATUS_VS_LEGAL_VALUES) == 0) {
-          return 0;
-        } else if ($array_size(MSTATUS_VS_LEGAL_VALUES) == 1) {
-          return MSTATUS_VS_LEGAL_VALUES[0];
-        } else {
-          return UNDEFINED_LEGAL;
-        }
       }
+      return $array_size(MSTATUS_VS_LEGAL_VALUES) == 1 ? MSTATUS_VS_LEGAL_VALUES[0] : UNDEFINED_LEGAL;
     sw_write(csr_value): |
-      if (implemented?(ExtensionName::V) && CSR[misa].V == 1'b1){
-        return $array_includes?(MSTATUS_VS_LEGAL_VALUES, csr_value.VS) ? csr_value.VS : UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (!implemented?(ExtensionName::S) && !implemented?(ExtensionName::V)) {
+      if ((!implemented?(ExtensionName::S) && !implemented?(ExtensionName::V)) || (MISA_CSR_IMPLEMENTED && (CSR[misa].S == 1'b0) && (CSR[misa].V == 1'b0))) {
         # must be read-only-0
         return 0;
-      } else {
-        # there will be no hardware update in this case because we know the V extension isn't implemented
-        return $array_includes?(MSTATUS_VS_LEGAL_VALUES, csr_value.VS) ? csr_value.VS : UNDEFINED_LEGAL_DETERMINISTIC;
       }
+      return $array_includes?(MSTATUS_VS_LEGAL_VALUES, csr_value.VS) ? csr_value.VS : UNDEFINED_LEGAL_DETERMINISTIC;
   SPP:
     location: 8
     long_name: S-mode Previous Privilege

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

@@ -30,37 +30,15 @@ fields:
       # implementations may put further constraints on BASE when MODE != Direct
       # If that is the case, stvec should have an override for the implementation
 
-      if (csr_value.MODE == 0) {
-        if ($array_includes?(MTVEC_MODES, 0)) {
-          return csr_value.BASE;
-        }
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-          return CSR[mtvec].BASE;
-        }
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
-        unreachable();
-      } else if (csr_value.MODE == 1) {
-        if ($array_includes?(MTVEC_MODES, 1)) {
-          return csr_value.BASE;
-        }
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-          return CSR[mtvec].BASE;
-        }
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
-        unreachable();
-      } else {
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-          return CSR[mtvec].BASE;
-        }
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
-        unreachable();
+      if ($array_includes?(MTVEC_MODES, csr_value.MODE)) {
+        return csr_value.BASE;
       }
+      if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
+        return CSR[mtvec].BASE;
+      } else if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
+        return UNDEFINED_LEGAL_DETERMINISTIC;
+      }
+      unreachable();
     reset_value: 0
   MODE:
     location: 1-0
@@ -71,7 +49,7 @@ fields:
 
       When Direct, all synchronous exceptions and asynchronous interrupts jump to (`mtvec.BASE` << 2).
 
-      When Vectored, asynchronous interrupts jump to (`mtvec.BASE` << 2 + `mcause.CAUSE`*4) while synchronous exceptions continue to jump to (`mtvec.BASE` << 2).
+      When Vectored, asynchronous interrupts jump to (`mtvec.BASE` << 2 + `mcause.CODE`*4) while synchronous exceptions continue to jump to (`mtvec.BASE` << 2).
     type(): |
       if (MTVEC_ACCESS == "ro") {
         return CsrFieldType::RO;
@@ -79,32 +57,13 @@ fields:
 
       return ($array_size(MTVEC_MODES) == 1) ? CsrFieldType::RO : CsrFieldType::RWR;
     sw_write(csr_value): |
-      if (csr_value.MODE == 0) {
-        if ($array_includes?(MTVEC_MODES, 0)) {
-          return csr_value.MODE;
-        } else {
-          if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-            return CSR[mtvec].MODE;
-          } else if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-            return UNDEFINED_LEGAL_DETERMINISTIC;
-          }
-        }
-      } else if (csr_value.MODE == 1) {
-        if ($array_includes?(MTVEC_MODES, 1)) {
-          return csr_value.MODE;
-        } else {
-          if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-            return CSR[mtvec].MODE;
-          } else if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-            return UNDEFINED_LEGAL_DETERMINISTIC;
-          }
-        }
-      } else {
-        if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
-          return CSR[mtvec].MODE;
-        } else if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
+      if ($array_includes?(MTVEC_MODES, csr_value.MODE)) {
+        return csr_value.MODE;
+      }
+      if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "retain") {
+        return CSR[mtvec].MODE;
+      } else if (MTVEC_ILLEGAL_WRITE_BEHAVIOR == "custom") {
+        return UNDEFINED_LEGAL_DETERMINISTIC;
       }
       unreachable();
     reset_value(): |

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

@@ -165,6 +165,28 @@ fields:
         return 0;
       }
       return csr_value.SSE;
+  LPE:
+    location: 2
+    description: |
+      *Landing Pad Enable*
+
+      When the LPE field is set to 1 and `menvcfg.LPE` is 1, the Zicfilp extension
+      is enabled in U/VU-mode. Read-only zero when `menvcfg.LPE` is 0. When the LPE
+      field is 0, the Zicfilp extension is not enabled in U/VU-mode and the following
+      rules apply:
+
+        * The hart does not update the `ELP` state; it remains as `NO_LP_EXPECTED`.
+        * The `LPAD` instruction operates as a no-op.
+    definedBy:
+      extension:
+        name: Zicfilp
+    type: RW
+    reset_value: UNDEFINED_LEGAL
+    sw_write(csr_value): |
+      if (CSR[menvcfg].LPE == 0) {
+        return 0;
+      }
+      return csr_value.LPE;
   FIOM:
     location: 0
     description: |
@@ -202,4 +224,8 @@ sw_read(): |
     # senvcfg.SSE must read-as-zero
     value = value & ~(1 `<< 3);
   }
+  if (implemented?(ExtensionName::Zicfilp) && CSR[menvcfg].LPE == 0) {
+    # senvcfg.LPE must read-as-zero when menvcfg.LPE is 0
+    value = value & ~(1 `<< 2);
+  }
   return value;