diff options
| author | Ben Marshall <ben.marshall@bristol.ac.uk> | 2021-07-28 11:24:59 +0100 |
|---|---|---|
| committer | Ben Marshall <ben.marshall@bristol.ac.uk> | 2021-07-28 11:24:59 +0100 |
| commit | a4eefd3fe6e99e63664bee49d6994221debbd0ea (patch) | |
| tree | a3453d9124fed46fbb925334aa7ade99aacad5a4 /riscv/encoding.h | |
| parent | 1b158981c550d1eabeb3df065ce3b3cfd5ccf55d (diff) | |
| download | spike-a4eefd3fe6e99e63664bee49d6994221debbd0ea.zip spike-a4eefd3fe6e99e63664bee49d6994221debbd0ea.tar.gz spike-a4eefd3fe6e99e63664bee49d6994221debbd0ea.tar.bz2 | |
scalar-crypto: Remove DECLARE_RV*_ONLY macros from encoding.h
- These are no longer needed since none of the scalar crypto instructions
overlap their encodings any more.
- There is more code to be removed in relation to letting Spike handle
overlapped RV32/64 instructions, but this will be done in subsequent commits
and PRs so that the downstream scalar-crypto work can be un-gated.
On branch scalar-crypto
Changes to be committed:
modified: riscv/encoding.h
Diffstat (limited to 'riscv/encoding.h')
| -rw-r--r-- | riscv/encoding.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/riscv/encoding.h b/riscv/encoding.h index e0d399d..8ad3a6c 100644 --- a/riscv/encoding.h +++ b/riscv/encoding.h @@ -3419,21 +3419,10 @@ DECLARE_INSN(aes64es, MATCH_AES64ES, MASK_AES64ES) DECLARE_INSN(aes64esm, MATCH_AES64ESM, MASK_AES64ESM) DECLARE_INSN(aes64ds, MATCH_AES64DS, MASK_AES64DS) DECLARE_INSN(aes64dsm, MATCH_AES64DSM, MASK_AES64DSM) -DECLARE_RV64_ONLY(aes64ks1i) -DECLARE_RV64_ONLY(aes64ks2) -DECLARE_RV64_ONLY(aes64im) -DECLARE_RV64_ONLY(aes64es) -DECLARE_RV64_ONLY(aes64esm) -DECLARE_RV64_ONLY(aes64ds) -DECLARE_RV64_ONLY(aes64dsm) DECLARE_INSN(aes32esi, MATCH_AES32ESI, MASK_AES32ESI) DECLARE_INSN(aes32esmi, MATCH_AES32ESMI, MASK_AES32ESMI) DECLARE_INSN(aes32dsi, MATCH_AES32DSI, MASK_AES32DSI) DECLARE_INSN(aes32dsmi, MATCH_AES32DSMI, MASK_AES32DSMI) -DECLARE_RV32_ONLY(aes32esi) -DECLARE_RV32_ONLY(aes32esmi) -DECLARE_RV32_ONLY(aes32dsi) -DECLARE_RV32_ONLY(aes32dsmi) DECLARE_INSN(sha256sig0, MATCH_SHA256SIG0, MASK_SHA256SIG0) DECLARE_INSN(sha256sig1, MATCH_SHA256SIG1, MASK_SHA256SIG1) DECLARE_INSN(sha256sum0, MATCH_SHA256SUM0, MASK_SHA256SUM0) @@ -3446,20 +3435,10 @@ DECLARE_INSN(sha512sig1l, MATCH_SHA512SIG1L, MASK_SHA512SIG1L) DECLARE_INSN(sha512sig1h, MATCH_SHA512SIG1H, MASK_SHA512SIG1H) DECLARE_INSN(sha512sum0r, MATCH_SHA512SUM0R, MASK_SHA512SUM0R) DECLARE_INSN(sha512sum1r, MATCH_SHA512SUM1R, MASK_SHA512SUM1R) -DECLARE_RV32_ONLY(sha512sig0l) -DECLARE_RV32_ONLY(sha512sig0h) -DECLARE_RV32_ONLY(sha512sig1l) -DECLARE_RV32_ONLY(sha512sig1h) -DECLARE_RV32_ONLY(sha512sum0r) -DECLARE_RV32_ONLY(sha512sum1r) DECLARE_INSN(sha512sig0, MATCH_SHA512SIG0, MASK_SHA512SIG0) DECLARE_INSN(sha512sig1, MATCH_SHA512SIG1, MASK_SHA512SIG1) DECLARE_INSN(sha512sum0, MATCH_SHA512SUM0, MASK_SHA512SUM0) DECLARE_INSN(sha512sum1, MATCH_SHA512SUM1, MASK_SHA512SUM1) -DECLARE_RV64_ONLY(sha512sig0) -DECLARE_RV64_ONLY(sha512sig1) -DECLARE_RV64_ONLY(sha512sum0) -DECLARE_RV64_ONLY(sha512sum1) DECLARE_INSN(pollentropy, MATCH_POLLENTROPY, MASK_POLLENTROPY) DECLARE_INSN(getnoise, MATCH_GETNOISE, MASK_GETNOISE) DECLARE_INSN(ecall, MATCH_ECALL, MASK_ECALL) |