Remove excludedBy

Author: Derek Hower

arch/inst/Zcmp/cm.mva01s.yaml

@@ -8,12 +8,12 @@ description: |
   This instruction moves r1s' into a0 and r2s' into a1. The execution is atomic, so it is not possible to observe state where only one of a0 or a1 have been updated.
   The encoding uses sreg number specifiers instead of xreg number specifiers to save encoding space. The mapping between them is specified in the pseudo-code below.
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: r1s, r2s
 encoding:
   match: 101011---11---10

arch/inst/Zcmp/cm.mvsa01.yaml

@@ -10,12 +10,12 @@ description: |
   The encoding uses sreg number specifiers instead of xreg number specifiers to save encoding space.
   The mapping between them is specified in the pseudo-code below.
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: r1s, r2s
 encoding:
   match: 101011---01---10

arch/inst/Zcmp/cm.pop.yaml

@@ -15,12 +15,12 @@ description: |
   ** for RV32 the allowed values are: 16, 32, 48, 64, 80, 96, 112
   ** for RV64 the allowed values are: 16, 32, 48, 64, 80, 96, 112, 128, 144, 160
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111010------10

arch/inst/Zcmp/cm.popret.yaml

@@ -15,12 +15,12 @@ description: |
   ** for RV32 the allowed values are: 16, 32, 48, 64, 80, 96, 112
   ** for RV64 the allowed values are: 16, 32, 48, 64, 80, 96, 112, 128, 144, 160
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111110------10

arch/inst/Zcmp/cm.popretz.yaml

@@ -15,12 +15,12 @@ description: |
   ** for RV32 the allowed values are: 16, 32, 48, 64, 80, 96, 112
   ** for RV64 the allowed values are: 16, 32, 48, 64, 80, 96, 112, 128, 144, 160
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111100------10

arch/inst/Zcmp/cm.push.yaml

@@ -16,12 +16,12 @@ description: |
   ** for RV32 the allowed values are: 16, 32, 48, 64, 80, 96, 112
   ** for RV64 the allowed values are: 16, 32, 48, 64, 80, 96, 112, 128, 144, 160
 definedBy:
-  anyOf:
+  allOf:
+    - not:
+        anyOf:
+          - allOf: [C, D]
+          - Zcd
     - Zcmp
-excludedBy:
-  anyOf:
-    - allOf: [C, D]
-    - Zcd
 assembly: reg_list, -stack_adj
 encoding:
   match: 10111000------10