diff --git a/unratified/rv32_d_zfa b/rv32_d_zfa similarity index 100% rename from unratified/rv32_d_zfa rename to rv32_d_zfa diff --git a/rv32_zbb b/rv32_zbb index c1947251..bc23350d 100644 --- 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/unratified/rv64_q_zfa b/rv64_q_zfa similarity index 100% rename from unratified/rv64_q_zfa rename to rv64_q_zfa diff --git a/rv64_zbb b/rv64_zbb index 4a8b24af..c7e4e8c1 100644 --- 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_zbkb b/rv64_zbkb index ad2f4a90..b5e06061 100644 --- 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 index 0ebf71dc..891f48a4 100644 --- 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 index 0ebf71dc..891f48a4 100644 --- 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 index 6bbad27c..848a283d 100644 --- 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/unratified/rv_c_zihintntl b/rv_c_zihintntl similarity index 100% rename from unratified/rv_c_zihintntl rename to rv_c_zihintntl diff --git a/unratified/rv_d_zfa b/rv_d_zfa similarity index 100% rename from unratified/rv_d_zfa rename to rv_d_zfa diff --git a/unratified/rv_f_zfa b/rv_f_zfa similarity index 100% rename from unratified/rv_f_zfa rename to rv_f_zfa diff --git a/unratified/rv_q_zfa b/rv_q_zfa similarity index 100% rename from unratified/rv_q_zfa rename to rv_q_zfa diff --git a/rv_zbkb b/rv_zbkb index 1499d786..d3f2f8da 100644 --- 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_zbkx b/rv_zbkx index f6b64d94..12bc0b49 100644 --- a/rv_zbkx +++ b/rv_zbkx @@ -1,2 +1,2 @@ -$import rv_zbp::xperm4 -$import rv_zbp::xperm8 +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 diff --git a/unratified/rv_zfh_zfa b/rv_zfh_zfa similarity index 100% rename from unratified/rv_zfh_zfa rename to rv_zfh_zfa diff --git a/unratified/rv_zicond b/rv_zicond similarity index 100% rename from unratified/rv_zicond rename to rv_zicond diff --git a/unratified/rv_zihintntl b/rv_zihintntl similarity index 100% rename from unratified/rv_zihintntl rename to rv_zihintntl diff --git a/rv_zk b/rv_zk index c4dc854a..dc60ee5e 100644 --- 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 @@ -13,8 +13,8 @@ $import rv_zbc::clmul $import rv_zbc::clmulh #import zbkx -$import rv_zbp::xperm4 -$import rv_zbp::xperm8 +$import rv_zbkx::xperm4 +$import rv_zbkx::xperm8 #import zknh # Scalar SHA256 - RV32/RV64 diff --git a/rv_zkn b/rv_zkn index c4dc854a..dc60ee5e 100644 --- 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 @@ -13,8 +13,8 @@ $import rv_zbc::clmul $import rv_zbc::clmulh #import zbkx -$import rv_zbp::xperm4 -$import rv_zbp::xperm8 +$import rv_zbkx::xperm4 +$import rv_zbkx::xperm8 #import zknh # Scalar SHA256 - RV32/RV64 diff --git a/rv_zks b/rv_zks index f88a09b9..0a571151 100644 --- 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 @@ -13,8 +13,8 @@ $import rv_zbc::clmul $import rv_zbc::clmulh #import zbkx -$import rv_zbp::xperm4 -$import rv_zbp::xperm8 +$import rv_zbkx::xperm4 +$import rv_zbkx::xperm8 # Scalar SM4 - RV32, RV64 $import rv_zksed::sm4ed diff --git a/unratified/rv_zvbc b/rv_zvbc similarity index 100% rename from unratified/rv_zvbc rename to rv_zvbc diff --git a/unratified/rv64_zbe b/unratified/rv64_zbe deleted file mode 100644 index 185b2f0b..00000000 --- a/unratified/rv64_zbe +++ /dev/null @@ -1,2 +0,0 @@ -packw rd rs1 rs2 31..25=4 14..12=4 6..2=0x0E 1..0=3 - diff --git a/unratified/rv_zbe b/unratified/rv_zbe deleted file mode 100644 index 492e943c..00000000 --- a/unratified/rv_zbe +++ /dev/null @@ -1,3 +0,0 @@ -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 - diff --git a/unratified/rv_zbp b/unratified/rv_zbp index 61c47d3f..bd95dd26 100644 --- a/unratified/rv_zbp +++ b/unratified/rv_zbp @@ -1,3 +1 @@ -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