Merge branch 'main' into csr_link

Author: dhower-qc

arch/csr/hstatus.yaml

@@ -133,10 +133,10 @@ hstatus:
         When `hstatus.VGEIN` != 0, it selects which bit of `hgeip` is currently active in VS-mode.
 
       type(): |
-        # if NUM_EXTERNAL_GUEST_INTERRUPTS+1 is a power of two (beacuse indexing in `hgeip` starts at 1),
+        # if NUM_EXTERNAL_GUEST_INTERRUPTS+1 is 63 (beacuse indexing in `hgeip` starts at 1),
         # then the field accepts any value.
         # Otherwise, it accepts a restricted set of values
-        if (power_of_2?<6>(NUM_EXTERNAL_GUEST_INTERRUPTS + 1)) {
+        if (NUM_EXTERNAL_GUEST_INTERRUPTS == 63) {
           return CsrFieldType::RW;
         } else {
           return CsrFieldType::RWR;

arch/ext/Sm.yaml

@@ -291,9 +291,18 @@ Sm:
         type: boolean
     TRAP_ON_UNIMPLEMENTED_INSTRUCTION:
       description: |
-        When true, fetching an unimplemented instruction will cause an `IllegalInstruction` exception.
+        When true, fetching an unimplemented instruction from the custom encoding space will cause
+        an `IllegalInstruction` exception.
 
-        When false, fetching an unimplemented instruction is `unpredictable`.
+        When false, fetching an unimplemented instruction is `UNPREDICTABLE`.
+      schema:
+        type: boolean
+    TRAP_ON_RESERVED_INSTRUCTION:
+      description: |
+        When true, fetching an unimplemented and/or undefined instruction from the standard/reserved
+        encoding space will cause an `IllegalInstruction` exception.
+
+        When false, fetching such an instruction is `UNPREDICTABLE`.
       schema:
         type: boolean
     TRAP_ON_UNIMPLEMENTED_CSR:

cfgs/generic_rv64/params.yaml

@@ -234,6 +234,7 @@ params:
   # when false, writing an illegal value to a WLRL CSR field is ignored
   TRAP_ON_ILLEGAL_WLRL: true
   TRAP_ON_UNIMPLEMENTED_INSTRUCTION: true
+  TRAP_ON_RESERVED_INSTRUCTION: true
   TRAP_ON_UNIMPLEMENTED_CSR: true
 
   # Whether or not a real hardware `time` CSR exists. Implementations can either provide a real