cleanup

Author: jevinjojo

spec/std/isa/csr/misa.yaml

@@ -139,22 +139,11 @@ fields:
       }
     definedBy: F
     sw_write(csr_value): |
-      if (MISA_CSR_IMPLEMENTED) {
-        if (csr_value.F == 0 && csr_value.D == 1) {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
-
-        # fall-through; write the intended value
-        return csr_value.F;
-      } else {
-        return 0;
-      }
-    legal?(csr_value): |
-      if (MISA_CSR_IMPLEMENTED) {
-        return !(csr_value.F == 0 && csr_value.D == 1);
-      } else {
-        return true;
+      if (csr_value.F == 0 && csr_value.D == 1) {
+        return UNDEFINED_LEGAL_DETERMINISTIC;
       }
+      # fall-through; write the intended value
+      return csr_value.F;
   G:
     location: 6
     description: |
@@ -272,22 +261,12 @@ fields:
       return MISA_CSR_IMPLEMENTED ? 1 : 0;
     definedBy: Q
     sw_write(csr_value): |
-      if (MISA_CSR_IMPLEMENTED) {
-        if ((csr_value.F == 0 || csr_value.D == 0) && csr_value.Q == 1) {
-          return UNDEFINED_LEGAL_DETERMINISTIC;
-        }
-
-        # fall-through; write the intended value
-        return csr_value.Q;
-      } else {
-        return 0;
-      }
-    legal?(csr_value): |
-      if (MISA_CSR_IMPLEMENTED) {
-        return !(csr_value.Q == 1 && csr_value.D == 0);
-      } else {
-        return true;
+      if ((csr_value.F == 0 || csr_value.D == 0) && csr_value.Q == 1) {
+        return UNDEFINED_LEGAL_DETERMINISTIC;
       }
+
+      # fall-through; write the intended value
+      return csr_value.Q;
   S:
     location: 18
     description: |
@@ -333,11 +312,8 @@ fields:
     description: |
       Indicates support for the `V` (vector) extension.
 
-      [when,"MUTABLE_MISA_V == true && MISA_CSR_IMPLEMENTED == true"]
+      [when,"MUTABLE_MISA_V == true"]
       Writing 0 to this field will cause all attempts to execute a vector instruction to raise an `IllegalInstruction` trap.
-
-      [when,"MISA_CSR_IMPLEMENTED == false"]
-      This field reads as 0 and cannot be modified.
     type(): |
       if (MISA_CSR_IMPLEMENTED && implemented?(ExtensionName::V) && MUTABLE_MISA_V) {
         return CsrFieldType::RW;

spec/std/isa/ext/A.yaml

@@ -128,3 +128,4 @@ params:
       the extension can be disabled in the `misa.A` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/B.yaml

@@ -43,3 +43,4 @@ params:
       Indicates whether or not the `B` extension can be disabled with the `misa.B` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/C.yaml

@@ -319,3 +319,4 @@ params:
       Indicates whether or not the `C` extension can be disabled with the `misa.C` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/D.yaml

@@ -112,3 +112,4 @@ params:
       Indicates whether or not the `D` extension can be disabled with the `misa.D` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/F.yaml

@@ -245,6 +245,7 @@ params:
       Indicates whether or not the `F` extension can be disabled with the `misa.F` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true
   HW_MSTATUS_FS_DIRTY_UPDATE:
     description: |
       Indicates whether or not hardware will write to `mstatus.FS`

spec/std/isa/ext/H.yaml

@@ -157,6 +157,7 @@ params:
       Indicates whether or not the `H` extension can be disabled with the `misa.H` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true
     extra_validation: |
       # If S mode can be disabled, then H mode must also be disabled since you can't
       # be in H mode without S mode

spec/std/isa/ext/M.yaml

@@ -30,3 +30,4 @@ params:
       Indicates whether or not the `M` extension can be disabled with the `misa.M` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/Q.yaml

@@ -27,3 +27,4 @@ params:
       Indicates whether or not the `Q` extension can be disabled with the `misa.Q` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true

spec/std/isa/ext/S.yaml

@@ -50,6 +50,7 @@ params:
       Indicates whether or not the `S` extension can be disabled with the `misa.S` bit.
     schema:
       type: boolean
+      extra_validation: assert MISA_CSR_IMPLEMENTED == true
     extra_validation: |
       # If U mode can be disabled, then S mode must also be disabled since you can't
       # be in S mode without U mode