Skip to content

Commit 051b7e1

Browse files
committed
fix(data): fix field names to be closer to operands
- `dret`, `mnret`, and `sctrclr` take no operands. - `sspush` and `sspopchk` are each single mnemonics that take a very restricted set of operand values. Also include a bit of documentation. - `vaeskf1.vi`, `vaeskf2.vi`, `vsm3c.vi`, `vsm4k.vi`, `vwsll.vi`: renamed field to match operand.
1 parent 810ef93 commit 051b7e1

File tree

14 files changed

+69
-100
lines changed

14 files changed

+69
-100
lines changed

spec/std/isa/inst/Sdext/dret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ long_name: No synopsis available
1010
description: |
1111
No description available.
1212
definedBy: Sdext
13-
assembly: dret
13+
assembly: ""
1414
encoding:
1515
match: "01111011001000000000000001110011"
1616
variables: []

spec/std/isa/inst/Smdbltrp/sctrclr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ long_name: No synopsis available
1010
description: |
1111
No description available.
1212
definedBy: Smdbltrp
13-
assembly: sctrclr
13+
assembly: ""
1414
encoding:
1515
match: "00010000010000000000000001110011"
1616
variables: []

spec/std/isa/inst/Smrnmi/mnret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: |
1414
also sets mstatus.MPRV to 0. If the Zicfilp extension is implemented, then if the new privileged mode is
1515
y, MNRET sets ELP to the logical AND of yLPE (see Section 22.1.1) and mnstatus.MNPELP.
1616
definedBy: Smrnmi
17-
assembly: mnret
17+
assembly: ""
1818
encoding:
1919
match: "01110000001000000000000001110011"
2020
variables: []

spec/std/isa/inst/Zicfiss/sspopchk.x1.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

spec/std/isa/inst/Zicfiss/sspopchk.x5.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
2+
# SPDX-License-Identifier: BSD-3-Clause-Clear
3+
4+
# yaml-language-server: $schema=../../../../schemas/inst_schema.json
5+
6+
$schema: inst_schema.json#
7+
kind: instruction
8+
name: sspopchk
9+
long_name: Shadow Stack Pop
10+
description: |
11+
A shadow stack pop operation is defined as an XLEN wide read from the current
12+
top of the shadow stack followed by an increment of the ssp by XLEN/8.
13+
14+
Only x1 and x5 registers are supported as xs1 for SSPOPCHK.
15+
definedBy: Zicfiss
16+
assembly: xs1
17+
encoding:
18+
match: 110011011100-----100000000110011
19+
variables:
20+
- name: xs1
21+
location: 19-15
22+
# prettier-ignore
23+
not: [ 0, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 ]
24+
access:
25+
s: always
26+
u: always
27+
vs: always
28+
vu: always
29+
data_independent_timing: false
30+
operation(): |

spec/std/isa/inst/Zicfiss/sspush.x1.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

spec/std/isa/inst/Zicfiss/sspush.x5.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

spec/std/isa/inst/Zicfiss/sspush.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
2+
# SPDX-License-Identifier: BSD-3-Clause-Clear
3+
4+
# yaml-language-server: $schema=../../../../schemas/inst_schema.json
5+
6+
$schema: inst_schema.json#
7+
kind: instruction
8+
name: sspush
9+
long_name: Shadow Stack Push
10+
description: |
11+
A shadow stack push operation is defined as decrement of the ssp by XLEN/8
12+
followed by a store of the value in the link register to memory at the new
13+
top of the shadow stack.
14+
15+
Only x1 and x5 registers are supported as xs2 for SSPUSH.
16+
definedBy: Zicfiss
17+
assembly: xs2
18+
encoding:
19+
match: "1100111-----00000100000001110011"
20+
variables:
21+
- name: xs2
22+
location: 24-20
23+
# prettier-ignore
24+
not: [ 0, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 ]
25+
access:
26+
s: always
27+
u: always
28+
vs: always
29+
vu: always
30+
data_independent_timing: false
31+
operation(): |

spec/std/isa/inst/Zvbb/vwsll.vi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ encoding:
1818
location: 25-25
1919
- name: vs2
2020
location: 24-20
21-
- name: zimm5
21+
- name: imm
2222
location: 19-15
2323
- name: vd
2424
location: 11-7

0 commit comments

Comments
 (0)