diff options
| author | Ben Marshall <ben.marshall@bristol.ac.uk> | 2021-07-30 12:43:54 +0100 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2021-07-30 14:36:03 -0700 |
| commit | c28c5d09b9a547fd16ef819a5ad9a9509dd84026 (patch) | |
| tree | c86f37cb989fdde2d04919af704986edcbd1e864 /riscv/encoding.h | |
| parent | 9d022a50da53a6e1ce8ba2dcfa73c2df8ead9d9d (diff) | |
| download | spike-c28c5d09b9a547fd16ef819a5ad9a9509dd84026.zip spike-c28c5d09b9a547fd16ef819a5ad9a9509dd84026.tar.gz spike-c28c5d09b9a547fd16ef819a5ad9a9509dd84026.tar.bz2 | |
scalar-crypto: v0.9.4/arch-review entropy source updates.
- Post arch review updates to the entropy source:
- New address is 0x546
- Removed old references to mentropy and mnoise.
- Throw invalid opcode exception when reading without writing.
- Missing: mseccfg register with SKES bit. Waiting for rest of
register to be implemented.
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
modified: riscv/encoding.h
modified: riscv/entropy_source.h
modified: riscv/processor.cc
Diffstat (limited to 'riscv/encoding.h')
| -rw-r--r-- | riscv/encoding.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/riscv/encoding.h b/riscv/encoding.h index fa30993..2c331a6 100644 --- a/riscv/encoding.h +++ b/riscv/encoding.h @@ -1035,10 +1035,6 @@ #define MASK_FCVT_H_L 0xfff0007f #define MATCH_FCVT_H_LU 0xd4300053 #define MASK_FCVT_H_LU 0xfff0007f -#define MATCH_POLLENTROPY 0xf1500073 -#define MASK_POLLENTROPY 0xfffff07f -#define MATCH_GETNOISE 0x7a900073 -#define MASK_GETNOISE 0xfffff07f #define MATCH_SM4ED 0x30000033 #define MASK_SM4ED 0x3e00707f #define MATCH_SM4KS 0x34000033 @@ -3013,8 +3009,7 @@ #define CSR_MARCHID 0xf12 #define CSR_MIMPID 0xf13 #define CSR_MHARTID 0xf14 -#define CSR_MENTROPY 0xf15 -#define CSR_MNOISE 0x7a9 +#define CSR_SENTROPY 0x546 #define CSR_HTIMEDELTAH 0x615 #define CSR_CYCLEH 0xc80 #define CSR_TIMEH 0xc81 @@ -3477,8 +3472,6 @@ DECLARE_INSN(fcvt_l_h, MATCH_FCVT_L_H, MASK_FCVT_L_H) DECLARE_INSN(fcvt_lu_h, MATCH_FCVT_LU_H, MASK_FCVT_LU_H) DECLARE_INSN(fcvt_h_l, MATCH_FCVT_H_L, MASK_FCVT_H_L) DECLARE_INSN(fcvt_h_lu, MATCH_FCVT_H_LU, MASK_FCVT_H_LU) -DECLARE_INSN(pollentropy, MATCH_POLLENTROPY, MASK_POLLENTROPY) -DECLARE_INSN(getnoise, MATCH_GETNOISE, MASK_GETNOISE) DECLARE_INSN(sm4ed, MATCH_SM4ED, MASK_SM4ED) DECLARE_INSN(sm4ks, MATCH_SM4KS, MASK_SM4KS) DECLARE_INSN(sm3p0, MATCH_SM3P0, MASK_SM3P0) @@ -4573,8 +4566,7 @@ DECLARE_CSR(mvendorid, CSR_MVENDORID) DECLARE_CSR(marchid, CSR_MARCHID) DECLARE_CSR(mimpid, CSR_MIMPID) DECLARE_CSR(mhartid, CSR_MHARTID) -DECLARE_CSR(mentropy, CSR_MENTROPY) -DECLARE_CSR(mnoise, CSR_MNOISE) +DECLARE_CSR(sentropy, CSR_SENTROPY) DECLARE_CSR(htimedeltah, CSR_HTIMEDELTAH) DECLARE_CSR(cycleh, CSR_CYCLEH) DECLARE_CSR(timeh, CSR_TIMEH) |