aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Johnson <scott.johnson@arilinc.com>2021-11-02 13:17:35 -0700
committerScott Johnson <scott.johnson@arilinc.com>2021-11-02 13:17:35 -0700
commitc57fb2122ff0fc5cee4a4148d3b2f7f6bef75154 (patch)
treed57c013d03c0b2c9aba385bc077718c59ea6ebef
parent70c120b5464d0a77491f07e5d66c4523d63a86a4 (diff)
parent1833ce76db92b553fa37ab9d634c7af5080db292 (diff)
downloadriscv-opcodes-c57fb2122ff0fc5cee4a4148d3b2f7f6bef75154.zip
riscv-opcodes-c57fb2122ff0fc5cee4a4148d3b2f7f6bef75154.tar.gz
riscv-opcodes-c57fb2122ff0fc5cee4a4148d3b2f7f6bef75154.tar.bz2
Merge branch 'master' into update-isasim-encoding
-rw-r--r--opcodes-rv32b6
-rw-r--r--opcodes-rv64b2
-rwxr-xr-xparse_opcodes2
3 files changed, 5 insertions, 5 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/parse_opcodes b/parse_opcodes
index d40155f..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,7 +299,6 @@ csrs = [
(0xF12, 'marchid'),
(0xF13, 'mimpid'),
(0xF14, 'mhartid'),
- (0x546, 'sentropy'), # crypto ext
]
csrs32 = [