Add `.rv32` on rv32_zbs and rv32_zbb instructions (#220)

* Add .rv32 on rv32_zbs instructions

to be consistent with slli, srli, and srai.

Signed-off-by: Hiroo HAYASHI <24754036+hirooih@users.noreply.github.com>

* Add .rv32 on rv32_zbb instructions

- zext.h.rv32, rev8.rv32, and rori.rev32

-  rev8.rv32, and rori.rev32 are also aliased in rv32_{zk,zkn,zks,zbkb}
  - only rv32_zks is shown in the extension field

Signed-off-by: Hiroo HAYASHI <24754036+hirooih@users.noreply.github.com>

---------

Signed-off-by: Hiroo HAYASHI <24754036+hirooih@users.noreply.github.com>

7 files changed, 22 insertions, 15 deletions

diff --git a/constants.py b/constants.py
index 0f4e777..8e88658 100644
--- a/constants.py
+++ b/constants.py
@@ -220,4 +220,11 @@ emitted_pseudo_ops = [
     'mop_rr_7',
     'sspush_x1',
     'sspush_x5',
+    'bclri.rv32',
+    'bexti.rv32',
+    'binvi.rv32',
+    'bseti.rv32',
+    'zext.h.rv32',
+    'rev8.h.rv32',
+    'rori.rv32',
 ]
diff --git a/rv32_zbb b/rv32_zbb
index cadea09..c194725 100644
--- a/rv32_zbb
+++ b/rv32_zbb
@@ -1,3 +1,3 @@
-$pseudo_op rv_zbe::pack     zext.h rd rs1 31..25=0x04 24..20=0 14..12=0x4 6..0=0x33 
-$pseudo_op rv64_zbp::grevi  rev8 rd rs1   31..20=0x698 14..12=5 6..0=0x13
-$pseudo_op rv64_zbb::rori   rori rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=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 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/rv32_zbkb b/rv32_zbkb
index f791453..e302531 100644
--- a/rv32_zbkb
+++ b/rv32_zbkb
@@ -1,4 +1,4 @@
 $pseudo_op rv64_zbp::shfli    zip rd rs1 31..25=4 24..20=15 14..12=1 6..2=4 1..0=3 
 $pseudo_op rv64_zbp::unshfli  unzip rd rs1 31..25=4 24..20=15 14..12=5 6..2=4 1..0=3 
-$pseudo_op rv64_zbb::rori     rori rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbp::grevi    rev8 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
+$pseudo_op rv64_zbp::grevi    rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13
diff --git a/rv32_zbs b/rv32_zbs
index 14ac441..a7ff752 100644
--- a/rv32_zbs
+++ b/rv32_zbs
@@ -1,5 +1,5 @@
-$pseudo_op rv64_zbs::bclri bclri rd rs1 31..25=0x24 shamtw 14..12=1 6..2=0x04 1..0=3
-$pseudo_op rv64_zbs::bexti bexti rd rs1 31..25=0x24 shamtw 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbs::binvi binvi rd rs1 31..25=0x34 shamtw 14..12=1 6..2=0x04 1..0=3
-$pseudo_op rv64_zbs::bseti bseti rd rs1 31..25=0x14 shamtw 14..12=1 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::bclri bclri.rv32 rd rs1 31..25=0x24 shamtw 14..12=1 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::bexti bexti.rv32 rd rs1 31..25=0x24 shamtw 14..12=5 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::binvi binvi.rv32 rd rs1 31..25=0x34 shamtw 14..12=1 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::bseti bseti.rv32 rd rs1 31..25=0x14 shamtw 14..12=1 6..2=0x04 1..0=3
 
diff --git a/rv32_zk b/rv32_zk
index e491103..0bd9443 100644
--- a/rv32_zk
+++ b/rv32_zk
@@ -1,8 +1,8 @@
 #import zbkb
 $pseudo_op rv64_zbp::shfli    zip rd rs1 31..25=4 24..20=15 14..12=1 6..2=4 1..0=3 
 $pseudo_op rv64_zbp::unshfli  unzip rd rs1 31..25=4 24..20=15 14..12=5 6..2=4 1..0=3 
-$pseudo_op rv64_zbb::rori     rori rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbp::grevi    rev8 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
+$pseudo_op rv64_zbp::grevi    rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13
 
 #import zkne
 $import rv32_zkne::aes32esmi
diff --git a/rv32_zkn b/rv32_zkn
index e491103..0bd9443 100644
--- a/rv32_zkn
+++ b/rv32_zkn
@@ -1,8 +1,8 @@
 #import zbkb
 $pseudo_op rv64_zbp::shfli    zip rd rs1 31..25=4 24..20=15 14..12=1 6..2=4 1..0=3 
 $pseudo_op rv64_zbp::unshfli  unzip rd rs1 31..25=4 24..20=15 14..12=5 6..2=4 1..0=3 
-$pseudo_op rv64_zbb::rori     rori rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbp::grevi    rev8 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
+$pseudo_op rv64_zbp::grevi    rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13
 
 #import zkne
 $import rv32_zkne::aes32esmi
diff --git a/rv32_zks b/rv32_zks
index 034c532..b1be874 100644
--- a/rv32_zks
+++ b/rv32_zks
@@ -1,6 +1,6 @@
 #import zbkb
 $pseudo_op rv64_zbp::shfli    zip rd rs1 31..25=4 24..20=15 14..12=1 6..2=4 1..0=3 
 $pseudo_op rv64_zbp::unshfli  unzip rd rs1 31..25=4 24..20=15 14..12=5 6..2=4 1..0=3 
-$pseudo_op rv64_zbb::rori     rori rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbp::grevi    rev8 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
+$pseudo_op rv64_zbp::grevi    rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13