Merge branch 'master' into update-isasim-encoding

hfyfpga · Nov 2, 2021 · c57fb21 · c57fb21
2 parents 70c120b + 1833ce7
commit c57fb21
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 = [