fix(data): fix and refactor check for Zcmt enabled

Author: ThinkOpenly

spec/std/isa/csr/jvt.yaml

@@ -46,25 +46,19 @@ fields:
       }
     reset_value: UNDEFINED_LEGAL
     sw_write(csr_value): |
-      if ((mode() != PrivilegeMode::M) && implemented?(ExtensionName::Smstateen)) {
-        if (CSR[mstateen0].JVT == 1'b0) {
-          unimplemented_csr($encoding);
-        }
-      }
-      else if ((mode() == PrivilegeMode::U) && implemented?(ExtensionName::Ssstateen)) {
-        if (CSR[sstateen0].JVT == 1'b0) {
-          unimplemented_csr($encoding);
-        }
-      }
-      else if ((mode() == PrivilegeMode::VS) && implemented?(ExtensionName::Ssstateen)) {
-        if (CSR[hstateen0].JVT == 1'b0) {
-          unimplemented_csr($encoding);
-        }
-      }
-      else if ((mode() == PrivilegeMode::VU) && implemented?(ExtensionName::Ssstateen)) {
-        if ((CSR[sstateen0].JVT == 1'b0) || (CSR[hstateen0].JVT == 1'b0)) {
-          unimplemented_csr($encoding);
-        }
+      if (( mode() != PrivilegeMode::M && implemented?(ExtensionName::Smstateen)
+            && CSR[mstateen0].JVT == 1'b0 )
+          ||
+          ( mode() == PrivilegeMode::U && implemented?(ExtensionName::Ssstateen)
+            && CSR[sstateen0].JVT == 1'b0 )
+          ||
+          ( mode() == PrivilegeMode::VS && implemented?(ExtensionName::Ssstateen)
+            && CSR[hstateen0].JVT == 1'b0 )
+          ||
+          ( mode() == PrivilegeMode::VU && implemented?(ExtensionName::Ssstateen)
+            && (CSR[sstateen0].JVT == 1'b0 || CSR[hstateen0].JVT == 1'b0) )) {
+
+        unimplemented_csr($encoding);
       }
       else {
         if (JVT_BASE_TYPE == "custom") {
@@ -94,28 +88,4 @@ fields:
       }
       return 0;
 sw_read(): |
-  # If the Smstateen extension is implemented, then bit 2 in `mstateen0`, `sstateen0`, and `hstateen0` is
-  # implemented. If bit 2 of a controlling `stateen0` CSR is zero, then access to the `jvt` CSR and execution
-  # of a `cm.jalt` or `cm.jt` instruction by a lower privilege level results in an illegal-instruction trap (or, if
-  # appropriate, a virtual-instruction trap).
-
-  if ((mode() != PrivilegeMode::M) && implemented?(ExtensionName::Smstateen)) {
-    if (CSR[mstateen0].JVT == 1'b0) {
-      raise(ExceptionCode::VirtualInstruction, mode(), $encoding);
-    }
-  }
-  else if ((mode() == PrivilegeMode::U) && implemented?(ExtensionName::Ssstateen)) {
-    if (CSR[sstateen0].JVT == 1'b0) {
-      raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
-    }
-  }
-  else if ((mode() == PrivilegeMode::VS) && implemented?(ExtensionName::Ssstateen)) {
-    if (CSR[hstateen0].JVT == 1'b0) {
-      raise(ExceptionCode::VirtualInstruction, mode(), $encoding);
-    }
-  }
-  else if ((mode() == PrivilegeMode::VU) && implemented?(ExtensionName::Ssstateen)) {
-    if ((CSR[sstateen0].JVT == 1'b0) || (CSR[hstateen0].JVT == 1'b0)) {
-      raise(ExceptionCode::VirtualInstruction, mode(), $encoding);
-    }
-  }
+  check_zcmt_enabled($encoding);

spec/std/isa/inst/Zcmt/cm.jalt.yaml

@@ -25,9 +25,7 @@ access:
   vu: always
 operation(): |
   # Ensure JVT readable
-  Bits<12> csr_addr = $bits(CSR[jvt].address());
-  Csr csr_handle = direct_csr_lookup(csr_addr);
-  XReg jvt = csr_sw_read(csr_handle);
+  check_zcmt_enabled($encoding);
 
   if (CSR[jvt].MODE != 0) {
     raise(ExceptionCode::IllegalInstruction, mode(), $encoding);

spec/std/isa/inst/Zcmt/cm.jt.yaml

@@ -23,8 +23,7 @@ access:
   vu: always
 operation(): |
   # Ensure JVT readable
-  #Csr csr_handle = direct_csr_lookup(CSR[jvt].address());
-  #XReg jvt = csr_sw_read(csr_handle);
+  check_zcmt_enabled($encoding);
 
   if (CSR[jvt].MODE != 0) {
     raise(ExceptionCode::IllegalInstruction, mode(), $encoding);

spec/std/isa/isa/globals.isa

@@ -3062,3 +3062,33 @@ function mstatus_sd_reset_value
     return ((fs_value == 3) || (vs_value == 3)) ? 1 : 0;
   }
 }
+
+function check_zcmt_enabled {
+  arguments
+    Bits<INSTR_ENC_SIZE> encoding
+  description {
+    If the Smstateen extension is implemented, then bit 2 in `mstateen0`, `sstateen0`, and `hstateen0` is
+    implemented. If bit 2 of a controlling `stateen0` CSR is zero, then access to the `jvt` CSR and execution
+    of a `cm.jalt` or `cm.jt` instruction by a lower privilege level results in an illegal-instruction trap (or, if
+    appropriate, a virtual-instruction trap).
+  }
+  body {
+    if (( mode() != PrivilegeMode::M && implemented?(ExtensionName::Smstateen)
+          && CSR[mstateen0].JVT == 1'b0 )
+        ||
+        ( mode() == PrivilegeMode::U && implemented?(ExtensionName::Ssstateen)
+          && CSR[sstateen0].JVT == 1'b0 )) {
+
+      raise(ExceptionCode::IllegalInstruction, mode(), encoding);
+    }
+    else
+      if (( mode() == PrivilegeMode::VS && implemented?(ExtensionName::Ssstateen)
+            && CSR[hstateen0].JVT == 1'b0 )
+          ||
+          ( mode() == PrivilegeMode::VU && implemented?(ExtensionName::Ssstateen)
+            && (CSR[sstateen0].JVT == 1'b0 || CSR[hstateen0].JVT == 1'b0) )) {
+
+        raise(ExceptionCode::VirtualInstruction, mode(), encoding);
+      }
+  }
+}