Merge remote-tracking branch 'origin/main' into 176-missing-description-for-mip-csr

Author: james-ball-qualcomm

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

arch/inst/C/c.lui.yaml

@@ -3,9 +3,9 @@
 c.lui:
   long_name: Load the non-zero 6-bit immediate field into bits 17–12 of the destination register
   description: |
-    C.LUI loads the non-zero 6-bit immediate field into bits 17–12 of the destination register, clears the bottom 12 bits, and sign-extends bit 17 into all higher bits of the destination. 
-    C.LUI expands into `lui rd, imm`. 
-    C.LUI is only valid when rd≠x0 and rd≠x2, and when the immediate is not equal to zero. 
+    C.LUI loads the non-zero 6-bit immediate field into bits 17–12 of the destination register, clears the bottom 12 bits, and sign-extends bit 17 into all higher bits of the destination.
+    C.LUI expands into `lui rd, imm`.
+    C.LUI is only valid when rd≠x0 and rd≠x2, and when the immediate is not equal to zero.
     The code points with imm=0 are reserved; the remaining code points with rd=x0 are HINTs; and the remaining code points with rd=x2 correspond to the C.ADDI16SP instruction
   definedBy:
     anyOf:
@@ -20,8 +20,7 @@ c.lui:
       left_shift: 12
     - name: rd
       location: 11-7
-      not: 0
-      not: 2
+      not: [0, 2]
   access:
     s: always
     u: always
@@ -33,4 +32,3 @@ c.lui:
     }
 
     X[rd] = imm;
-

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

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

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

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

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

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

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

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