Merge pull request #269 from riscv-software-src/fixInstructions

dhower-qc · web-flow · commit 0fb90aca9f9a · 2024-11-14T12:33:39.000-05:00
Fix instructions encodings/variables
diff --git a/arch/inst/B/slli.uw.yaml b/arch/inst/B/slli.uw.yaml
@@ -12,10 +12,10 @@ slli.uw:
     anyOf: [B, Zba]
   base: 64
   encoding:
-    match: 0000010----------001-----0011011
+    match: 000010-----------001-----0011011
     variables:
     - name: shamt
-      location: 24-20
+      location: 25-20
     - name: rs1
       location: 19-15
     - name: rd
diff --git a/arch/inst/I/lb.yaml b/arch/inst/I/lb.yaml
@@ -9,7 +9,7 @@ lb:
   definedBy: I
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------000-----0000111
+    match: -----------------000-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/lbu.yaml b/arch/inst/I/lbu.yaml
@@ -9,7 +9,7 @@ lbu:
   definedBy: I
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------100-----0000111
+    match: -----------------100-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/ld.yaml b/arch/inst/I/ld.yaml
@@ -9,7 +9,7 @@ ld:
   base: 64
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------011-----0000111
+    match: -----------------011-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/lh.yaml b/arch/inst/I/lh.yaml
@@ -9,7 +9,7 @@ lh:
   definedBy: I
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------001-----0000111
+    match: -----------------001-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/lhu.yaml b/arch/inst/I/lhu.yaml
@@ -9,7 +9,7 @@ lhu:
   definedBy: I
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------101-----0000111
+    match: -----------------101-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/lui.yaml b/arch/inst/I/lui.yaml
@@ -6,7 +6,7 @@ lui:
   definedBy: I
   assembly: xd, imm
   encoding:
-    match: -------------------------0000111
+    match: -------------------------0110111
     variables:
     - name: imm
       location: 31-12
diff --git a/arch/inst/I/lw.yaml b/arch/inst/I/lw.yaml
@@ -9,7 +9,7 @@ lw:
   definedBy: I
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------010-----0000111
+    match: -----------------010-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/I/lwu.yaml b/arch/inst/I/lwu.yaml
@@ -10,7 +10,7 @@ lwu:
   base: 64
   assembly: xd, imm(rs1)
   encoding:
-    match: -----------------110-----0000111
+    match: -----------------110-----0000011
     variables:
     - name: imm
       location: 31-20
diff --git a/arch/inst/V/vle16.v.yaml b/arch/inst/V/vle16.v.yaml
@@ -5,12 +5,10 @@ vle16.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-00000-----101-----0000111
+    match: 000000-00000-----101-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle16ff.v.yaml b/arch/inst/V/vle16ff.v.yaml
@@ -5,12 +5,10 @@ vle16ff.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-10000-----101-----0000111
+    match: 000000-10000-----101-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle32.v.yaml b/arch/inst/V/vle32.v.yaml
@@ -5,12 +5,10 @@ vle32.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-00000-----110-----0000111
+    match: 000000-00000-----110-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle32ff.v.yaml b/arch/inst/V/vle32ff.v.yaml
@@ -5,12 +5,10 @@ vle32ff.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-10000-----110-----0000111
+    match: 000000-10000-----110-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle64.v.yaml b/arch/inst/V/vle64.v.yaml
@@ -5,12 +5,10 @@ vle64.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-00000-----111-----0000111
+    match: 000000-00000-----111-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle64ff.v.yaml b/arch/inst/V/vle64ff.v.yaml
@@ -5,12 +5,10 @@ vle64ff.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-10000-----111-----0000111
+    match: 000000-10000-----111-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle8.v.yaml b/arch/inst/V/vle8.v.yaml
@@ -5,12 +5,10 @@ vle8.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-00000-----000-----0000111
+    match: 000000-00000-----000-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vle8ff.v.yaml b/arch/inst/V/vle8ff.v.yaml
@@ -5,12 +5,10 @@ vle8ff.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vd
+  assembly: vm, xs1, vd
   encoding:
-    match: ---000-10000-----000-----0000111
+    match: 000000-10000-----000-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vloxei16.v.yaml b/arch/inst/V/vloxei16.v.yaml
@@ -5,12 +5,10 @@ vloxei16.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---011-----------101-----0000111
+    match: 000011-----------101-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vloxei32.v.yaml b/arch/inst/V/vloxei32.v.yaml
@@ -5,12 +5,10 @@ vloxei32.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---011-----------110-----0000111
+    match: 000011-----------110-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vloxei64.v.yaml b/arch/inst/V/vloxei64.v.yaml
@@ -5,12 +5,10 @@ vloxei64.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---011-----------111-----0000111
+    match: 000011-----------111-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vloxei8.v.yaml b/arch/inst/V/vloxei8.v.yaml
@@ -5,12 +5,10 @@ vloxei8.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---011-----------000-----0000111
+    match: 000011-----------000-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vlse16.v.yaml b/arch/inst/V/vlse16.v.yaml
@@ -5,12 +5,10 @@ vlse16.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs2, xs1, vd
+  assembly: vm, xs2, xs1, vd
   encoding:
-    match: ---010-----------101-----0000111
+    match: 000010-----------101-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs2
diff --git a/arch/inst/V/vlse32.v.yaml b/arch/inst/V/vlse32.v.yaml
@@ -5,12 +5,10 @@ vlse32.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs2, xs1, vd
+  assembly: vm, xs2, xs1, vd
   encoding:
-    match: ---010-----------110-----0000111
+    match: 000010-----------110-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs2
diff --git a/arch/inst/V/vlse64.v.yaml b/arch/inst/V/vlse64.v.yaml
@@ -5,12 +5,10 @@ vlse64.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs2, xs1, vd
+  assembly: vm, xs2, xs1, vd
   encoding:
-    match: ---010-----------111-----0000111
+    match: 000010-----------111-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs2
diff --git a/arch/inst/V/vlse8.v.yaml b/arch/inst/V/vlse8.v.yaml
@@ -5,12 +5,10 @@ vlse8.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs2, xs1, vd
+  assembly: vm, xs2, xs1, vd
   encoding:
-    match: ---010-----------000-----0000111
+    match: 000010-----------000-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs2
diff --git a/arch/inst/V/vluxei16.v.yaml b/arch/inst/V/vluxei16.v.yaml
@@ -5,12 +5,10 @@ vluxei16.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---001-----------101-----0000111
+    match: 000001-----------101-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vluxei32.v.yaml b/arch/inst/V/vluxei32.v.yaml
@@ -5,12 +5,10 @@ vluxei32.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---001-----------110-----0000111
+    match: 000001-----------110-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vluxei64.v.yaml b/arch/inst/V/vluxei64.v.yaml
@@ -5,12 +5,10 @@ vluxei64.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---001-----------111-----0000111
+    match: 000001-----------111-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vluxei8.v.yaml b/arch/inst/V/vluxei8.v.yaml
@@ -5,12 +5,10 @@ vluxei8.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, vs2, xs1, vd
+  assembly: vm, vs2, xs1, vd
   encoding:
-    match: ---001-----------000-----0000111
+    match: 000001-----------000-----0000111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: vs2
diff --git a/arch/inst/V/vse16.v.yaml b/arch/inst/V/vse16.v.yaml
@@ -5,12 +5,10 @@ vse16.v:
   description: |
       No description available.
   definedBy: V
-  assembly: nf, vm, xs1, vs3
+  assembly: vm, xs1, vs3
   encoding:
-    match: ---000-00000-----101-----0100111
+    match: 000000-00000-----101-----0100111
     variables:
-    - name: nf
-      location: 31-29
     - name: vm
       location: 25-25
     - name: rs1
diff --git a/arch/inst/V/vse32.v.yaml b/arch/inst/V/vse32.v.yaml
diff --git a/arch/inst/V/vse64.v.yaml b/arch/inst/V/vse64.v.yaml
diff --git a/arch/inst/V/vse8.v.yaml b/arch/inst/V/vse8.v.yaml
diff --git a/arch/inst/V/vsoxei16.v.yaml b/arch/inst/V/vsoxei16.v.yaml
diff --git a/arch/inst/V/vsoxei32.v.yaml b/arch/inst/V/vsoxei32.v.yaml
diff --git a/arch/inst/V/vsoxei64.v.yaml b/arch/inst/V/vsoxei64.v.yaml
diff --git a/arch/inst/V/vsoxei8.v.yaml b/arch/inst/V/vsoxei8.v.yaml
diff --git a/arch/inst/V/vsse16.v.yaml b/arch/inst/V/vsse16.v.yaml
diff --git a/arch/inst/V/vsse32.v.yaml b/arch/inst/V/vsse32.v.yaml
diff --git a/arch/inst/V/vsse64.v.yaml b/arch/inst/V/vsse64.v.yaml
diff --git a/arch/inst/V/vsse8.v.yaml b/arch/inst/V/vsse8.v.yaml
diff --git a/arch/inst/V/vsuxei16.v.yaml b/arch/inst/V/vsuxei16.v.yaml
diff --git a/arch/inst/V/vsuxei32.v.yaml b/arch/inst/V/vsuxei32.v.yaml
diff --git a/arch/inst/V/vsuxei64.v.yaml b/arch/inst/V/vsuxei64.v.yaml
diff --git a/arch/inst/V/vsuxei8.v.yaml b/arch/inst/V/vsuxei8.v.yaml
