aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Johnson <scott.johnson@arilinc.com>2021-11-02 13:12:04 -0700
committerScott Johnson <scott.johnson@arilinc.com>2021-11-02 13:15:46 -0700
commit70c120b5464d0a77491f07e5d66c4523d63a86a4 (patch)
tree7c27a254b8691b835c618f8702c2f2ae81b6f284
parentcabefd9b4f41c3211f8163c0a333a14ce4e24397 (diff)
downloadriscv-opcodes-70c120b5464d0a77491f07e5d66c4523d63a86a4.zip
riscv-opcodes-70c120b5464d0a77491f07e5d66c4523d63a86a4.tar.gz
riscv-opcodes-70c120b5464d0a77491f07e5d66c4523d63a86a4.tar.bz2
Update Krypto to match what Spike has
Goal is to most closely match the hand-made changes to Spike's copy of encoding.h, before we again start generating it from this repo. This best matches Spike as of https://github.com/riscv-software-src/riscv-isa-sim/commit/47aa83c2dda373bc266de2cb5fc85544cb7bdea8
-rw-r--r--opcodes-rvk4
-rwxr-xr-xparse_opcodes3
2 files changed, 1 insertions, 6 deletions
diff --git a/opcodes-rvk b/opcodes-rvk
index 744c807..956a97d 100644
--- a/opcodes-rvk
+++ b/opcodes-rvk
@@ -5,10 +5,6 @@
# These instructions appear in _both_ RV32 and RV64.
# ------------------------------------------------------------
-# Poll Entropy / Get Noise Pseudo Instructions
-@pollentropy rd 19..15=0 31..20=0xF15 14..12=0 6..0=0b1110011
-@getnoise rd 19..15=0 31..20=0x7A9 14..12=0 6..0=0b1110011
-
# Scalar SM4 - RV32, RV64
sm4ed rd rs1 rs2 bs 29..25=0b11000 14..12=0 6..0=0x33
sm4ks rd rs1 rs2 bs 29..25=0b11010 14..12=0 6..0=0x33
diff --git a/parse_opcodes b/parse_opcodes
index b8059e5..d40155f 100755
--- a/parse_opcodes
+++ b/parse_opcodes
@@ -298,8 +298,7 @@ csrs = [
(0xF12, 'marchid'),
(0xF13, 'mimpid'),
(0xF14, 'mhartid'),
- (0xF15, 'mentropy'), # crypto ext
- (0x7A9, 'mnoise'),
+ (0x546, 'sentropy'), # crypto ext
]
csrs32 = [