From 6a13d49c62c57ecc88d709118b2b8014f8906d2d Mon Sep 17 00:00:00 2001 From: "Markku-Juhani O. Saarinen" Date: Mon, 1 Nov 2021 12:23:29 +0000 Subject: Zbkx renames xperm.n and xperm.b as xperm4 and xperm8. Others for consistency. --- opcodes-rv32b | 6 +++--- opcodes-rv64b | 2 +- 2 files changed, 4 insertions(+), 4 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 -- cgit v1.1 From c08650229cb7a055378c8a2dbf6370a59f03dea0 Mon Sep 17 00:00:00 2001 From: "Markku-Juhani O. Saarinen" Date: Mon, 1 Nov 2021 14:51:08 +0000 Subject: Change entropy source CSR name and address (seed). --- opcodes-rvk | 4 ---- parse_opcodes | 3 +-- 2 files changed, 1 insertion(+), 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..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 = [ -- cgit v1.1