From bf86ef1af2fd2eb60af43e7fb3ec2efd61f9ed73 Mon Sep 17 00:00:00 2001 From: Ben Marshall Date: Thu, 3 Sep 2020 13:34:25 +0100 Subject: [PATCH] Change pollentropy temporary opcode. - It clashed with sha256.sum1 On branch dev/next-release Your branch is up-to-date with 'origin/dev/next-release'. Changes to be committed: modified: sail/riscv_insts_crypto.sail modified: tools/opcodes-crypto-scalar modified: tools/patch-binutils.patch modified: tools/patch-spike.patch Changes not staged for commit: modified: extern/riscv-gnu-toolchain (modified content, untracked content) modified: extern/riscv-isa-sim (modified content) --- sail/riscv_insts_crypto.sail | 2 +- tools/opcodes-crypto-scalar | 2 +- tools/patch-binutils.patch | 2 +- tools/patch-spike.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sail/riscv_insts_crypto.sail b/sail/riscv_insts_crypto.sail index 9c326202..abd74e44 100644 --- a/sail/riscv_insts_crypto.sail +++ b/sail/riscv_insts_crypto.sail @@ -198,7 +198,7 @@ union clause ast = POLLENTROPY : (bits(5),regidx) /* Encode / decode mapping for pollentropy */ mapping clause encdec = POLLENTROPY (shamtw,rd) <-> - 0b0000111 @ shamtw @ 0b01010111 @ rd @ 0b0101011 + 0b0001111 @ shamtw @ 0b01010111 @ rd @ 0b0101011 /* Assembly string mapping for pollentropy */ mapping clause assembly = POLLENTROPY (shamtw,rd) <-> diff --git a/tools/opcodes-crypto-scalar b/tools/opcodes-crypto-scalar index 1a559c21..4253109f 100644 --- a/tools/opcodes-crypto-scalar +++ b/tools/opcodes-crypto-scalar @@ -58,5 +58,5 @@ ssha512.sum0 rd rs1 31..25=7 24..20=6 14..12=7 6..0=0x2B ssha512.sum1 rd rs1 31..25=7 24..20=7 14..12=7 6..0=0x2B # Poll Entropy Instruction -pollentropy rd shamtw 31..25=7 19..15=10 14..12=7 6..0=0x2B +pollentropy rd shamtw 31..25=15 19..15=10 14..12=7 6..0=0x2B diff --git a/tools/patch-binutils.patch b/tools/patch-binutils.patch index 0d8c6d9d..3cd0a53e 100644 --- a/tools/patch-binutils.patch +++ b/tools/patch-binutils.patch @@ -115,7 +115,7 @@ index 6c750a33b1..2748204cf2 100644 +#define MASK_SSHA512_SUM0 0xfff0707f +#define MATCH_SSHA512_SUM1 0xe70702b +#define MASK_SSHA512_SUM1 0xfff0707f -+#define MATCH_POLLENTROPY 0xe05702b ++#define MATCH_POLLENTROPY 0x1e05702b +#define MASK_POLLENTROPY 0xfe0ff07f +// Crypto ISE - end #define MATCH_FSLW 0x400103b diff --git a/tools/patch-spike.patch b/tools/patch-spike.patch index 0dbe9cc2..9ea40b65 100644 --- a/tools/patch-spike.patch +++ b/tools/patch-spike.patch @@ -79,7 +79,7 @@ index 3c4bf1c..714d88b 100644 +#define MASK_SSHA512_SUM0 0xfff0707f +#define MATCH_SSHA512_SUM1 0xe70702b +#define MASK_SSHA512_SUM1 0xfff0707f -+#define MATCH_POLLENTROPY 0xe05702b ++#define MATCH_POLLENTROPY 0x1e05702b +#define MASK_POLLENTROPY 0xfe0ff07f +// Crypto ISE - end #define MATCH_AMOADD_W 0x202f