diff options
| author | Ben Marshall <ben.marshall@bristol.ac.uk> | 2021-06-04 10:21:48 +0100 |
|---|---|---|
| committer | Ben Marshall <ben.marshall@bristol.ac.uk> | 2021-06-04 10:26:58 +0100 |
| commit | facb985dac8e3126e94d23f9e2b02dc162155cf0 (patch) | |
| tree | 46c07b247de63c5d4c8a1552cff7041311f764c1 /riscv/encoding.h | |
| parent | 9d91c7abe019c0e46f609508b5db1bbecf07dbf0 (diff) | |
| download | spike-facb985dac8e3126e94d23f9e2b02dc162155cf0.zip spike-facb985dac8e3126e94d23f9e2b02dc162155cf0.tar.gz spike-facb985dac8e3126e94d23f9e2b02dc162155cf0.tar.bz2 | |
scalar-crypto: Encoding fixes for v0.9.2
- Reverts the AES32 and SM4 instruction encodings back to a normal R-type
encoding, per the advice of the architecture reviewers.
On branch scalar-crypto-v0.9.2
Changes to be committed:
modified: riscv/encoding.h
modified: riscv/insns/aes32dsi.h
modified: riscv/insns/aes32dsmi.h
modified: riscv/insns/aes32esi.h
modified: riscv/insns/aes32esmi.h
modified: riscv/insns/sm4ed.h
modified: riscv/insns/sm4ks.h
Diffstat (limited to 'riscv/encoding.h')
| -rw-r--r-- | riscv/encoding.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/riscv/encoding.h b/riscv/encoding.h index 7c02e14..ebd401c 100644 --- a/riscv/encoding.h +++ b/riscv/encoding.h @@ -927,9 +927,9 @@ #define MATCH_POLLENTROPY 0xf1500073 #define MASK_GETNOISE 0xfffff07f #define MATCH_GETNOISE 0x7a900073 -#define MASK_SM4ED 0x3e007fff +#define MASK_SM4ED 0x3e00707f #define MATCH_SM4ED 0x30000033 -#define MASK_SM4KS 0x3e007fff +#define MASK_SM4KS 0x3e00707f #define MATCH_SM4KS 0x34000033 #define MASK_SM3P0 0xfff0707f #define MATCH_SM3P0 0x10801013 @@ -961,13 +961,13 @@ #define MATCH_AES64IM 0x30001013 #define MASK_AES64KS2 0xfe00707f #define MATCH_AES64KS2 0x7e000033 -#define MASK_AES32ESMI 0x3e007fff +#define MASK_AES32ESMI 0x3e00707f #define MATCH_AES32ESMI 0x36000033 -#define MASK_AES32ESI 0x3e007fff +#define MASK_AES32ESI 0x3e00707f #define MATCH_AES32ESI 0x32000033 -#define MASK_AES32DSMI 0x3e007fff +#define MASK_AES32DSMI 0x3e00707f #define MATCH_AES32DSMI 0x3e000033 -#define MASK_AES32DSI 0x3e007fff +#define MASK_AES32DSI 0x3e00707f #define MATCH_AES32DSI 0x3a000033 #define MASK_AES64KS1I 0xff00707f #define MATCH_AES64KS1I 0x31001013 |