aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2021-11-01 17:29:12 -0700
committerGitHub <noreply@github.com>2021-11-01 17:29:12 -0700
commit1833ce76db92b553fa37ab9d634c7af5080db292 (patch)
treefe7b8d0ef740069cb0561cab66d8ca9409726f29
parent7cdc0412849acbd5a4a041b24c9defb7e2f6d9bc (diff)
parentc08650229cb7a055378c8a2dbf6370a59f03dea0 (diff)
downloadriscv-opcodes-1833ce76db92b553fa37ab9d634c7af5080db292.zip
riscv-opcodes-1833ce76db92b553fa37ab9d634c7af5080db292.tar.gz
riscv-opcodes-1833ce76db92b553fa37ab9d634c7af5080db292.tar.bz2
Merge pull request #84 from mjosaarinen/master
Zbkx renames xperm.n and xperm.b as xperm4 and xperm8.
-rw-r--r--opcodes-rv32b6
-rw-r--r--opcodes-rv64b2
-rw-r--r--opcodes-rvk4
-rwxr-xr-xparse_opcodes3
4 files changed, 5 insertions, 10 deletions
diff --git a/opcodes-rv32b b/opcodes-rv32b
index b25df90..1099c1d 100644
--- a/opcodes-rv32b
+++ b/opcodes-rv32b
@@ -69,6 +69,6 @@ bfp rd rs1 rs2 31..25=36 14..12=7 6..2=0x0C 1..0=3
shfli rd rs1 31..25=4 shamtw 14..12=1 6..2=0x04 1..0=3
unshfli rd rs1 31..25=4 shamtw 14..12=5 6..2=0x04 1..0=3
-xperm.n rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
-xperm.b rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
-xperm.h rd rs1 rs2 31..25=20 14..12=6 6..2=0x0C 1..0=3
+xperm4 rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
+xperm8 rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
+xperm16 rd rs1 rs2 31..25=20 14..12=6 6..2=0x0C 1..0=3
diff --git a/opcodes-rv64b b/opcodes-rv64b
index 67c2c96..4c8fd54 100644
--- a/opcodes-rv64b
+++ b/opcodes-rv64b
@@ -53,4 +53,4 @@ packw rd rs1 rs2 31..25=4 14..12=4 6..2=0x0E 1..0=3
packuw rd rs1 rs2 31..25=36 14..12=4 6..2=0x0E 1..0=3
bfpw rd rs1 rs2 31..25=36 14..12=7 6..2=0x0E 1..0=3
-xperm.w rd rs1 rs2 31..25=20 14..12=0 6..2=0x0C 1..0=3
+xperm32 rd rs1 rs2 31..25=20 14..12=0 6..2=0x0C 1..0=3
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..b8d9f14 100755
--- a/parse_opcodes
+++ b/parse_opcodes
@@ -91,6 +91,7 @@ csrs = [
(0x009, 'vxsat'),
(0x00A, 'vxrm'),
(0x00F, 'vcsr'),
+ (0x015, 'seed'), # Zkr
# Standard User RO
(0xC00, 'cycle'),
@@ -298,8 +299,6 @@ csrs = [
(0xF12, 'marchid'),
(0xF13, 'mimpid'),
(0xF14, 'mhartid'),
- (0xF15, 'mentropy'), # crypto ext
- (0x7A9, 'mnoise'),
]
csrs32 = [