Update Zbkb - remove Zbe

riscv · May 5, 2024 · 8a5bc8b · 8a5bc8b
1 parent 4bbd012
commit 8a5bc8b
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 19 deletions.
diff --git a/rv32_zbb b/rv32_zbb
@@ -1,3 +1,3 @@
-$pseudo_op rv_zbe::pack     zext.h.rv32 rd rs1 31..25=0x04 24..20=0 14..12=0x4 6..0=0x33
+$pseudo_op rv_zbkb::pack     zext.h.rv32 rd rs1 31..25=0x04 24..20=0 14..12=0x4 6..0=0x33
 $pseudo_op rv64_zbp::grevi  rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13
 $pseudo_op rv64_zbb::rori   rori.rv32 rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
diff --git a/rv64_zbb b/rv64_zbb
@@ -5,5 +5,5 @@ rolw  rd rs1 rs2                            31..25=0x30 14..12=1 6..2=0x0E 1..0=
 rorw  rd rs1 rs2                            31..25=0x30 14..12=5 6..2=0x0E 1..0=3
 roriw rd rs1                                31..25=0x30 shamtw 14..12=5 6..2=0x06 1..0=3
 rori  rd rs1                                31..26=0x18 shamtd 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbe::packw zext.h rd rs1    31..25=0x04 24..20=0 14..12=0x4 6..2=0xE 1..0=0x3 
+$pseudo_op rv64_zbkb::packw zext.h rd rs1    31..25=0x04 24..20=0 14..12=0x4 6..2=0xE 1..0=0x3 
 $pseudo_op rv64_zbp::grevi rev8 rd rs1      31..20=0x6B8 14..12=5 6..0=0x13
diff --git a/rv64_zbe b/rv64_zbe
diff --git a/rv64_zbkb b/rv64_zbkb
@@ -3,4 +3,4 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+packw      rd rs1 rs2 31..25=4  14..12=4 6..2=0x0E 1..0=3
diff --git a/rv64_zk b/rv64_zk
@@ -4,7 +4,7 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
 
 #import zkne
 # Scalar AES - RV64

diff --git a/rv64_zkn b/rv64_zkn
@@ -4,7 +4,7 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
 
 #import zkne
 # Scalar AES - RV64

diff --git a/rv64_zks b/rv64_zks
@@ -4,4 +4,4 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
diff --git a/rv_zbe b/rv_zbe
diff --git a/rv_zbkb b/rv_zbkb
@@ -3,6 +3,6 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+pack       rd rs1 rs2 31..25=4  14..12=4 6..2=0x0C 1..0=3
+packh      rd rs1 rs2 31..25=4  14..12=7 6..2=0x0C 1..0=3
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
diff --git a/rv_zk b/rv_zk
@@ -4,8 +4,8 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc

diff --git a/rv_zkn b/rv_zkn
@@ -4,8 +4,8 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc

diff --git a/rv_zks b/rv_zks
@@ -4,8 +4,8 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc