Skip to content

Commit d6e744b

Browse files
author
Derek Hower
committed
Fix encodings for qc.swmi qc.c.extu, note conflicts with D, make qc_iu cfg exclusive
1 parent 55a72fd commit d6e744b

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

cfgs/qc_iu/arch_overlay/ext/Xqci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,3 +387,4 @@ doc_license:
387387
company:
388388
name: Qualcomm Technologies, Inc.
389389
url: https://qualcomm.com
390+
conflicts: [D]

cfgs/qc_iu/arch_overlay/ext/Xqciac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ versions:
3333
description: |
3434
The Xqciac extension includes three instructions to accelerate common
3535
address calculations.
36-
36+
conflicts: [D]
3737
doc_license:
3838
name: Creative Commons Attribution 4.0 International License
3939
url: https://creativecommons.org/licenses/by/4.0/

cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.extu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ encoding:
2222
not: [0, 1, 2, 3, 4]
2323
- name: rd
2424
location: 11-7
25+
not: 0
2526
access:
2627
s: always
2728
u: always

cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.muladdi.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ description: |
88
Increments `rd` by the multiplication of `rs1` and an unsigned immediate
99
Instruction encoded in CL instruction format.
1010
definedBy:
11-
anyOf:
12-
- Xqci
13-
- Xqciac
11+
allOf:
12+
- not:
13+
anyOf:
14+
- allOf: [C, D]
15+
- Zcd
16+
- anyOf:
17+
- Xqci
18+
- Xqciac
1419
base: 32
1520
encoding:
1621
match: 001-----------10

cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mveqz.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ description: |
88
Move `rs1` to `rd` if `rd` == 0, keep `rd` value otherwise
99
Instruction encoded in CL instruction format.
1010
definedBy:
11-
anyOf:
12-
- Xqci
13-
- Xqcicm
11+
allOf:
12+
- anyOf:
13+
- Xqci
14+
- Xqcicm
15+
- not:
16+
anyOf:
17+
- allOf: [C, D]
18+
- Zcd
1419
base: 32
1520
encoding:
1621
match: 101011---00---10

cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ definedBy:
1414
- Xqcilsm
1515
base: 32
1616
encoding:
17-
match: 00---------------111-----0101011
17+
match: 01---------------111-----0101011
1818
variables:
1919
- name: imm
2020
location: 29-25

cfgs/qc_iu/cfg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ mandatory_extensions:
1010
- { name: Smrnmi }
1111
- { name: I }
1212
- { name: Xqci, version: "~> 0.4" }
13+
additional_extensions: false
1314
params:
1415
XLEN: 32

0 commit comments

Comments
 (0)