Separate Zcf and Zcd extensions from Zce (#539)

* Separate Zcf and Zcd extensions from Zce

Signed-off-by: Albert Yosher <[email protected]>

* Restore per-instruction dependencies of Zcf/Zcd

Signed-off-by: Albert Yosher <[email protected]>

---------

Signed-off-by: Albert Yosher <[email protected]>

Author: ayosher

arch/ext/Zcd.yaml

@@ -39,5 +39,5 @@ versions:
       allOf:
         - anyOf:
           - { name: Zca, version: "= 1.0.0" }
-          - { name: C, version: "= 1.0.0" }
+          - { name: C, version: "~> 2.0.0" }
         - { name: D, version: "~> 2.2.0" }

arch/ext/Zce.yaml

@@ -76,3 +76,7 @@ versions:
       #   - [Zcb, "1.0.0"]
       #   - [Zcmp, "1.0.0"]
       #   - [Zcmt, "1.0.0"]
+conflicts:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd

arch/ext/Zcf.yaml

@@ -5,7 +5,7 @@ kind: extension
 name: Zcf
 long_name: Compressed instructions for single precision floating point
 description: |
-  Zcf is the existing set of compressed single precision floating point loads and stores:
+  Zcf is the existing set of compressed single precision floating point loads and stores (RV32 only):
   `c.flw`, `c.flwsp`, `c.fsw`, `c.fswsp`.
 
 type: unprivileged
@@ -35,4 +35,9 @@ versions:
       - name: Graeme Smecher
       - name: Nicolas Brunie
       - name: Jiawei
-    requires: F
+    requires:
+      allOf:
+        - anyOf:
+          - { name: Zca, version: "= 1.0.0" }
+          - { name: C, version: "~> 2.0.0" }
+        - { name: F, version: "~> 2.2.0" }

arch/ext/Zcmp.yaml

@@ -88,6 +88,7 @@ versions:
       - name: Graeme Smecher
       - name: Nicolas Brunie
       - name: Jiawei
+    requires: { name: Zca, version: ">= 1.0.0" }
 conflicts:
   anyOf:
     - allOf: [C, D]

arch/inst/C/c.fld.yaml renamed to arch/inst/Zcd/c.fld.yaml

@@ -10,9 +10,11 @@ description: |
   to the base address in register rs1.
   It expands to `flw` `rd, offset(rs1)`.
 definedBy:
-  allOf:
-    - C
-    - F
+  anyOf:
+    - allOf:
+        - C
+        - F
+    - Zcf
 assembly: xd, imm(xs1)
 base: 32
 encoding:

arch/inst/C/c.fldsp.yaml renamed to arch/inst/Zcd/c.fldsp.yaml

@@ -10,9 +10,11 @@ description: |
   to the stack pointer, x2.
   It expands to `flw` `rd, offset(x2)`.
 definedBy:
-  allOf:
-    - C
-    - F
+  anyOf:
+    - allOf:
+        - C
+        - F
+    - Zcf
 assembly: fd, imm(sp)
 base: 32
 encoding: