diff options
| author | Markku-Juhani O. Saarinen <mjos@pqshield.com> | 2021-11-03 01:03:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 18:03:39 -0700 |
| commit | 61244507802b5f8c13a4025baaf9a68b9f076c20 (patch) | |
| tree | b59454a9170f213dddde93fe0f1294fce1ab9e52 /riscv/encoding.h | |
| parent | 9139d5f3873a048b31b1d5ae70bf9b91b7966272 (diff) | |
| download | spike-61244507802b5f8c13a4025baaf9a68b9f076c20.zip spike-61244507802b5f8c13a4025baaf9a68b9f076c20.tar.gz spike-61244507802b5f8c13a4025baaf9a68b9f076c20.tar.bz2 | |
Zbkx renames xperm.n and xperm.b as xperm4 and xperm8. (#846)
Krypto 1.0 changes: Entropy source CSR, name.
List scalar crypto instruction groupings, as there is no single K extension.
Co-authored-by: Markku-Juhani O. Saarinen <mjos@mjos.fi>
Diffstat (limited to 'riscv/encoding.h')
| -rw-r--r-- | riscv/encoding.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/riscv/encoding.h b/riscv/encoding.h index 49ee3d5..c459498 100644 --- a/riscv/encoding.h +++ b/riscv/encoding.h @@ -1,6 +1,6 @@ /* * This file is auto-generated by running 'make ../riscv-isa-sim/riscv/encoding.h' in - * https://github.com/riscv/riscv-opcodes (70c120b) + * https://github.com/riscv/riscv-opcodes (ce0bd39) */ /* See LICENSE for license details. */ @@ -833,12 +833,12 @@ #define MASK_SHFLI 0xfe00707f #define MATCH_UNSHFLI 0x8005013 #define MASK_UNSHFLI 0xfe00707f -#define MATCH_XPERM_N 0x28002033 -#define MASK_XPERM_N 0xfe00707f -#define MATCH_XPERM_B 0x28004033 -#define MASK_XPERM_B 0xfe00707f -#define MATCH_XPERM_H 0x28006033 -#define MASK_XPERM_H 0xfe00707f +#define MATCH_XPERM4 0x28002033 +#define MASK_XPERM4 0xfe00707f +#define MATCH_XPERM8 0x28004033 +#define MASK_XPERM8 0xfe00707f +#define MATCH_XPERM16 0x28006033 +#define MASK_XPERM16 0xfe00707f #define MATCH_BMATFLIP 0x60301013 #define MASK_BMATFLIP 0xfff0707f #define MATCH_CRC32_D 0x61301013 @@ -921,8 +921,8 @@ #define MASK_PACKUW 0xfe00707f #define MATCH_BFPW 0x4800703b #define MASK_BFPW 0xfe00707f -#define MATCH_XPERM_W 0x28000033 -#define MASK_XPERM_W 0xfe00707f +#define MATCH_XPERM32 0x28000033 +#define MASK_XPERM32 0xfe00707f #define MATCH_ECALL 0x73 #define MASK_ECALL 0xffffffff #define MATCH_EBREAK 0x100073 @@ -2800,6 +2800,7 @@ #define CSR_VXSAT 0x9 #define CSR_VXRM 0xa #define CSR_VCSR 0xf +#define CSR_SEED 0x15 #define CSR_CYCLE 0xc00 #define CSR_TIME 0xc01 #define CSR_INSTRET 0xc02 @@ -2995,7 +2996,6 @@ #define CSR_MARCHID 0xf12 #define CSR_MIMPID 0xf13 #define CSR_MHARTID 0xf14 -#define CSR_SENTROPY 0x546 #define CSR_HTIMEDELTAH 0x615 #define CSR_CYCLEH 0xc80 #define CSR_TIMEH 0xc81 @@ -3358,9 +3358,9 @@ DECLARE_INSN(packh, MATCH_PACKH, MASK_PACKH) DECLARE_INSN(bfp, MATCH_BFP, MASK_BFP) DECLARE_INSN(shfli, MATCH_SHFLI, MASK_SHFLI) DECLARE_INSN(unshfli, MATCH_UNSHFLI, MASK_UNSHFLI) -DECLARE_INSN(xperm_n, MATCH_XPERM_N, MASK_XPERM_N) -DECLARE_INSN(xperm_b, MATCH_XPERM_B, MASK_XPERM_B) -DECLARE_INSN(xperm_h, MATCH_XPERM_H, MASK_XPERM_H) +DECLARE_INSN(xperm4, MATCH_XPERM4, MASK_XPERM4) +DECLARE_INSN(xperm8, MATCH_XPERM8, MASK_XPERM8) +DECLARE_INSN(xperm16, MATCH_XPERM16, MASK_XPERM16) DECLARE_INSN(bmatflip, MATCH_BMATFLIP, MASK_BMATFLIP) DECLARE_INSN(crc32_d, MATCH_CRC32_D, MASK_CRC32_D) DECLARE_INSN(crc32c_d, MATCH_CRC32C_D, MASK_CRC32C_D) @@ -3402,7 +3402,7 @@ DECLARE_INSN(bdecompressw, MATCH_BDECOMPRESSW, MASK_BDECOMPRESSW) DECLARE_INSN(packw, MATCH_PACKW, MASK_PACKW) DECLARE_INSN(packuw, MATCH_PACKUW, MASK_PACKUW) DECLARE_INSN(bfpw, MATCH_BFPW, MASK_BFPW) -DECLARE_INSN(xperm_w, MATCH_XPERM_W, MASK_XPERM_W) +DECLARE_INSN(xperm32, MATCH_XPERM32, MASK_XPERM32) DECLARE_INSN(ecall, MATCH_ECALL, MASK_ECALL) DECLARE_INSN(ebreak, MATCH_EBREAK, MASK_EBREAK) DECLARE_INSN(sret, MATCH_SRET, MASK_SRET) @@ -4347,6 +4347,7 @@ DECLARE_CSR(vstart, CSR_VSTART) DECLARE_CSR(vxsat, CSR_VXSAT) DECLARE_CSR(vxrm, CSR_VXRM) DECLARE_CSR(vcsr, CSR_VCSR) +DECLARE_CSR(seed, CSR_SEED) DECLARE_CSR(cycle, CSR_CYCLE) DECLARE_CSR(time, CSR_TIME) DECLARE_CSR(instret, CSR_INSTRET) @@ -4542,7 +4543,6 @@ DECLARE_CSR(mvendorid, CSR_MVENDORID) DECLARE_CSR(marchid, CSR_MARCHID) DECLARE_CSR(mimpid, CSR_MIMPID) DECLARE_CSR(mhartid, CSR_MHARTID) -DECLARE_CSR(sentropy, CSR_SENTROPY) DECLARE_CSR(htimedeltah, CSR_HTIMEDELTAH) DECLARE_CSR(cycleh, CSR_CYCLEH) DECLARE_CSR(timeh, CSR_TIMEH) |