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/insns/sm4ks.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/insns/sm4ks.h')
-rw-r--r-- | riscv/insns/sm4ks.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/riscv/insns/sm4ks.h b/riscv/insns/sm4ks.h index 589eb97..5758d57 100644 --- a/riscv/insns/sm4ks.h +++ b/riscv/insns/sm4ks.h @@ -15,7 +15,6 @@ uint32_t x = sb_out ^ uint32_t rotl = (x << (8*bs)) | (x >> (32-8*bs)); uint32_t result = rotl ^ RS1; -uint64_t rd = insn.rs1(); // RD sourced from RS1 field. -WRITE_REG(rd, zext_xlen(result)); +WRITE_RD(zext_xlen(result)); |