aboutsummaryrefslogtreecommitdiff
path: root/riscv
diff options
context:
space:
mode:
authorChih-Min Chao <chihmin.chao@sifive.com>2020-07-15 02:20:21 -0700
committerChih-Min Chao <chihmin.chao@sifive.com>2020-07-29 21:38:24 -0700
commit4d6086e094062290b6e0e40329c6a2e11a1fc009 (patch)
tree5f674beab5288f734fa6b8a5f1997d6ef72b983e /riscv
parentf2d6531ade46ebc0c960898564f83327141e3ac9 (diff)
downloadspike-4d6086e094062290b6e0e40329c6a2e11a1fc009.zip
spike-4d6086e094062290b6e0e40329c6a2e11a1fc009.tar.gz
spike-4d6086e094062290b6e0e40329c6a2e11a1fc009.tar.bz2
rvv: op: fix amo naming
The original name misses the 'i' in instruction mae vamoswape8 -> vamoswapei8 Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com>
Diffstat (limited to 'riscv')
-rw-r--r--riscv/encoding.h216
-rw-r--r--riscv/insns/vamoaddei16_v.h (renamed from riscv/insns/vamoadde16_v.h)0
-rw-r--r--riscv/insns/vamoaddei32_v.h (renamed from riscv/insns/vamoadde32_v.h)0
-rw-r--r--riscv/insns/vamoaddei64_v.h (renamed from riscv/insns/vamoadde64_v.h)0
-rw-r--r--riscv/insns/vamoaddei8_v.h (renamed from riscv/insns/vamoadde8_v.h)0
-rw-r--r--riscv/insns/vamoandei16_v.h (renamed from riscv/insns/vamoande16_v.h)0
-rw-r--r--riscv/insns/vamoandei32_v.h (renamed from riscv/insns/vamoande32_v.h)0
-rw-r--r--riscv/insns/vamoandei64_v.h (renamed from riscv/insns/vamoande64_v.h)0
-rw-r--r--riscv/insns/vamoandei8_v.h (renamed from riscv/insns/vamoande8_v.h)0
-rw-r--r--riscv/insns/vamomaxei16_v.h (renamed from riscv/insns/vamomaxe16_v.h)0
-rw-r--r--riscv/insns/vamomaxei32_v.h (renamed from riscv/insns/vamomaxe32_v.h)0
-rw-r--r--riscv/insns/vamomaxei64_v.h (renamed from riscv/insns/vamomaxe64_v.h)0
-rw-r--r--riscv/insns/vamomaxei8_v.h (renamed from riscv/insns/vamomaxe8_v.h)0
-rw-r--r--riscv/insns/vamomaxuei16_v.h (renamed from riscv/insns/vamomaxue16_v.h)0
-rw-r--r--riscv/insns/vamomaxuei32_v.h (renamed from riscv/insns/vamomaxue32_v.h)0
-rw-r--r--riscv/insns/vamomaxuei64_v.h (renamed from riscv/insns/vamomaxue64_v.h)0
-rw-r--r--riscv/insns/vamomaxuei8_v.h (renamed from riscv/insns/vamomaxue8_v.h)0
-rw-r--r--riscv/insns/vamominei16_v.h (renamed from riscv/insns/vamomine16_v.h)0
-rw-r--r--riscv/insns/vamominei32_v.h (renamed from riscv/insns/vamomine32_v.h)0
-rw-r--r--riscv/insns/vamominei64_v.h (renamed from riscv/insns/vamomine64_v.h)0
-rw-r--r--riscv/insns/vamominei8_v.h (renamed from riscv/insns/vamomine8_v.h)0
-rw-r--r--riscv/insns/vamominuei16_v.h (renamed from riscv/insns/vamominue16_v.h)0
-rw-r--r--riscv/insns/vamominuei32_v.h (renamed from riscv/insns/vamominue32_v.h)0
-rw-r--r--riscv/insns/vamominuei64_v.h (renamed from riscv/insns/vamominue64_v.h)0
-rw-r--r--riscv/insns/vamominuei8_v.h (renamed from riscv/insns/vamominue8_v.h)0
-rw-r--r--riscv/insns/vamoorei16_v.h (renamed from riscv/insns/vamoore16_v.h)0
-rw-r--r--riscv/insns/vamoorei32_v.h (renamed from riscv/insns/vamoore32_v.h)0
-rw-r--r--riscv/insns/vamoorei64_v.h (renamed from riscv/insns/vamoore64_v.h)0
-rw-r--r--riscv/insns/vamoorei8_v.h (renamed from riscv/insns/vamoore8_v.h)0
-rw-r--r--riscv/insns/vamoswapei16_v.h (renamed from riscv/insns/vamoswape16_v.h)0
-rw-r--r--riscv/insns/vamoswapei32_v.h (renamed from riscv/insns/vamoswape32_v.h)0
-rw-r--r--riscv/insns/vamoswapei64_v.h (renamed from riscv/insns/vamoswape64_v.h)0
-rw-r--r--riscv/insns/vamoswapei8_v.h (renamed from riscv/insns/vamoswape8_v.h)0
-rw-r--r--riscv/insns/vamoxorei16_v.h (renamed from riscv/insns/vamoxore16_v.h)0
-rw-r--r--riscv/insns/vamoxorei32_v.h (renamed from riscv/insns/vamoxore32_v.h)0
-rw-r--r--riscv/insns/vamoxorei64_v.h (renamed from riscv/insns/vamoxore64_v.h)0
-rw-r--r--riscv/insns/vamoxorei8_v.h (renamed from riscv/insns/vamoxore8_v.h)0
-rw-r--r--riscv/riscv.mk.in72
38 files changed, 144 insertions, 144 deletions
diff --git a/riscv/encoding.h b/riscv/encoding.h
index be66895..83eebc7 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -1728,78 +1728,78 @@
#define MASK_VWMACCUS_VX 0xfc00707f
#define MATCH_VWMACCSU_VX 0xfc006057
#define MASK_VWMACCSU_VX 0xfc00707f
-#define MATCH_VAMOSWAPE8_V 0x800002f
-#define MASK_VAMOSWAPE8_V 0xf800707f
-#define MATCH_VAMOADDE8_V 0x2f
-#define MASK_VAMOADDE8_V 0xf800707f
-#define MATCH_VAMOXORE8_V 0x2000002f
-#define MASK_VAMOXORE8_V 0xf800707f
-#define MATCH_VAMOANDE8_V 0x6000002f
-#define MASK_VAMOANDE8_V 0xf800707f
-#define MATCH_VAMOORE8_V 0x4000002f
-#define MASK_VAMOORE8_V 0xf800707f
-#define MATCH_VAMOMINE8_V 0x8000002f
-#define MASK_VAMOMINE8_V 0xf800707f
-#define MATCH_VAMOMAXE8_V 0xa000002f
-#define MASK_VAMOMAXE8_V 0xf800707f
-#define MATCH_VAMOMINUE8_V 0xc000002f
-#define MASK_VAMOMINUE8_V 0xf800707f
-#define MATCH_VAMOMAXUE8_V 0xe000002f
-#define MASK_VAMOMAXUE8_V 0xf800707f
-#define MATCH_VAMOSWAPE16_V 0x800502f
-#define MASK_VAMOSWAPE16_V 0xf800707f
-#define MATCH_VAMOADDE16_V 0x502f
-#define MASK_VAMOADDE16_V 0xf800707f
-#define MATCH_VAMOXORE16_V 0x2000502f
-#define MASK_VAMOXORE16_V 0xf800707f
-#define MATCH_VAMOANDE16_V 0x6000502f
-#define MASK_VAMOANDE16_V 0xf800707f
-#define MATCH_VAMOORE16_V 0x4000502f
-#define MASK_VAMOORE16_V 0xf800707f
-#define MATCH_VAMOMINE16_V 0x8000502f
-#define MASK_VAMOMINE16_V 0xf800707f
-#define MATCH_VAMOMAXE16_V 0xa000502f
-#define MASK_VAMOMAXE16_V 0xf800707f
-#define MATCH_VAMOMINUE16_V 0xc000502f
-#define MASK_VAMOMINUE16_V 0xf800707f
-#define MATCH_VAMOMAXUE16_V 0xe000502f
-#define MASK_VAMOMAXUE16_V 0xf800707f
-#define MATCH_VAMOSWAPE32_V 0x800602f
-#define MASK_VAMOSWAPE32_V 0xf800707f
-#define MATCH_VAMOADDE32_V 0x602f
-#define MASK_VAMOADDE32_V 0xf800707f
-#define MATCH_VAMOXORE32_V 0x2000602f
-#define MASK_VAMOXORE32_V 0xf800707f
-#define MATCH_VAMOANDE32_V 0x6000602f
-#define MASK_VAMOANDE32_V 0xf800707f
-#define MATCH_VAMOORE32_V 0x4000602f
-#define MASK_VAMOORE32_V 0xf800707f
-#define MATCH_VAMOMINE32_V 0x8000602f
-#define MASK_VAMOMINE32_V 0xf800707f
-#define MATCH_VAMOMAXE32_V 0xa000602f
-#define MASK_VAMOMAXE32_V 0xf800707f
-#define MATCH_VAMOMINUE32_V 0xc000602f
-#define MASK_VAMOMINUE32_V 0xf800707f
-#define MATCH_VAMOMAXUE32_V 0xe000602f
-#define MASK_VAMOMAXUE32_V 0xf800707f
-#define MATCH_VAMOSWAPE64_V 0x800702f
-#define MASK_VAMOSWAPE64_V 0xf800707f
-#define MATCH_VAMOADDE64_V 0x702f
-#define MASK_VAMOADDE64_V 0xf800707f
-#define MATCH_VAMOXORE64_V 0x2000702f
-#define MASK_VAMOXORE64_V 0xf800707f
-#define MATCH_VAMOANDE64_V 0x6000702f
-#define MASK_VAMOANDE64_V 0xf800707f
-#define MATCH_VAMOORE64_V 0x4000702f
-#define MASK_VAMOORE64_V 0xf800707f
-#define MATCH_VAMOMINE64_V 0x8000702f
-#define MASK_VAMOMINE64_V 0xf800707f
-#define MATCH_VAMOMAXE64_V 0xa000702f
-#define MASK_VAMOMAXE64_V 0xf800707f
-#define MATCH_VAMOMINUE64_V 0xc000702f
-#define MASK_VAMOMINUE64_V 0xf800707f
-#define MATCH_VAMOMAXUE64_V 0xe000702f
-#define MASK_VAMOMAXUE64_V 0xf800707f
+#define MATCH_VAMOSWAPEI8_V 0x800002f
+#define MASK_VAMOSWAPEI8_V 0xf800707f
+#define MATCH_VAMOADDEI8_V 0x2f
+#define MASK_VAMOADDEI8_V 0xf800707f
+#define MATCH_VAMOXOREI8_V 0x2000002f
+#define MASK_VAMOXOREI8_V 0xf800707f
+#define MATCH_VAMOANDEI8_V 0x6000002f
+#define MASK_VAMOANDEI8_V 0xf800707f
+#define MATCH_VAMOOREI8_V 0x4000002f
+#define MASK_VAMOOREI8_V 0xf800707f
+#define MATCH_VAMOMINEI8_V 0x8000002f
+#define MASK_VAMOMINEI8_V 0xf800707f
+#define MATCH_VAMOMAXEI8_V 0xa000002f
+#define MASK_VAMOMAXEI8_V 0xf800707f
+#define MATCH_VAMOMINUEI8_V 0xc000002f
+#define MASK_VAMOMINUEI8_V 0xf800707f
+#define MATCH_VAMOMAXUEI8_V 0xe000002f
+#define MASK_VAMOMAXUEI8_V 0xf800707f
+#define MATCH_VAMOSWAPEI16_V 0x800502f
+#define MASK_VAMOSWAPEI16_V 0xf800707f
+#define MATCH_VAMOADDEI16_V 0x502f
+#define MASK_VAMOADDEI16_V 0xf800707f
+#define MATCH_VAMOXOREI16_V 0x2000502f
+#define MASK_VAMOXOREI16_V 0xf800707f
+#define MATCH_VAMOANDEI16_V 0x6000502f
+#define MASK_VAMOANDEI16_V 0xf800707f
+#define MATCH_VAMOOREI16_V 0x4000502f
+#define MASK_VAMOOREI16_V 0xf800707f
+#define MATCH_VAMOMINEI16_V 0x8000502f
+#define MASK_VAMOMINEI16_V 0xf800707f
+#define MATCH_VAMOMAXEI16_V 0xa000502f
+#define MASK_VAMOMAXEI16_V 0xf800707f
+#define MATCH_VAMOMINUEI16_V 0xc000502f
+#define MASK_VAMOMINUEI16_V 0xf800707f
+#define MATCH_VAMOMAXUEI16_V 0xe000502f
+#define MASK_VAMOMAXUEI16_V 0xf800707f
+#define MATCH_VAMOSWAPEI32_V 0x800602f
+#define MASK_VAMOSWAPEI32_V 0xf800707f
+#define MATCH_VAMOADDEI32_V 0x602f
+#define MASK_VAMOADDEI32_V 0xf800707f
+#define MATCH_VAMOXOREI32_V 0x2000602f
+#define MASK_VAMOXOREI32_V 0xf800707f
+#define MATCH_VAMOANDEI32_V 0x6000602f
+#define MASK_VAMOANDEI32_V 0xf800707f
+#define MATCH_VAMOOREI32_V 0x4000602f
+#define MASK_VAMOOREI32_V 0xf800707f
+#define MATCH_VAMOMINEI32_V 0x8000602f
+#define MASK_VAMOMINEI32_V 0xf800707f
+#define MATCH_VAMOMAXEI32_V 0xa000602f
+#define MASK_VAMOMAXEI32_V 0xf800707f
+#define MATCH_VAMOMINUEI32_V 0xc000602f
+#define MASK_VAMOMINUEI32_V 0xf800707f
+#define MATCH_VAMOMAXUEI32_V 0xe000602f
+#define MASK_VAMOMAXUEI32_V 0xf800707f
+#define MATCH_VAMOSWAPEI64_V 0x800702f
+#define MASK_VAMOSWAPEI64_V 0xf800707f
+#define MATCH_VAMOADDEI64_V 0x702f
+#define MASK_VAMOADDEI64_V 0xf800707f
+#define MATCH_VAMOXOREI64_V 0x2000702f
+#define MASK_VAMOXOREI64_V 0xf800707f
+#define MATCH_VAMOANDEI64_V 0x6000702f
+#define MASK_VAMOANDEI64_V 0xf800707f
+#define MATCH_VAMOOREI64_V 0x4000702f
+#define MASK_VAMOOREI64_V 0xf800707f
+#define MATCH_VAMOMINEI64_V 0x8000702f
+#define MASK_VAMOMINEI64_V 0xf800707f
+#define MATCH_VAMOMAXEI64_V 0xa000702f
+#define MASK_VAMOMAXEI64_V 0xf800707f
+#define MATCH_VAMOMINUEI64_V 0xc000702f
+#define MASK_VAMOMINUEI64_V 0xf800707f
+#define MATCH_VAMOMAXUEI64_V 0xe000702f
+#define MASK_VAMOMAXUEI64_V 0xf800707f
#define MATCH_VMVNFR_V 0x9e003057
#define MASK_VMVNFR_V 0xfe00707f
#define CSR_FFLAGS 0x1
@@ -2821,42 +2821,42 @@ DECLARE_INSN(vwmaccu_vx, MATCH_VWMACCU_VX, MASK_VWMACCU_VX)
DECLARE_INSN(vwmacc_vx, MATCH_VWMACC_VX, MASK_VWMACC_VX)
DECLARE_INSN(vwmaccus_vx, MATCH_VWMACCUS_VX, MASK_VWMACCUS_VX)
DECLARE_INSN(vwmaccsu_vx, MATCH_VWMACCSU_VX, MASK_VWMACCSU_VX)
-DECLARE_INSN(vamoswape8_v, MATCH_VAMOSWAPE8_V, MASK_VAMOSWAPE8_V)
-DECLARE_INSN(vamoadde8_v, MATCH_VAMOADDE8_V, MASK_VAMOADDE8_V)
-DECLARE_INSN(vamoxore8_v, MATCH_VAMOXORE8_V, MASK_VAMOXORE8_V)
-DECLARE_INSN(vamoande8_v, MATCH_VAMOANDE8_V, MASK_VAMOANDE8_V)
-DECLARE_INSN(vamoore8_v, MATCH_VAMOORE8_V, MASK_VAMOORE8_V)
-DECLARE_INSN(vamomine8_v, MATCH_VAMOMINE8_V, MASK_VAMOMINE8_V)
-DECLARE_INSN(vamomaxe8_v, MATCH_VAMOMAXE8_V, MASK_VAMOMAXE8_V)
-DECLARE_INSN(vamominue8_v, MATCH_VAMOMINUE8_V, MASK_VAMOMINUE8_V)
-DECLARE_INSN(vamomaxue8_v, MATCH_VAMOMAXUE8_V, MASK_VAMOMAXUE8_V)
-DECLARE_INSN(vamoswape16_v, MATCH_VAMOSWAPE16_V, MASK_VAMOSWAPE16_V)
-DECLARE_INSN(vamoadde16_v, MATCH_VAMOADDE16_V, MASK_VAMOADDE16_V)
-DECLARE_INSN(vamoxore16_v, MATCH_VAMOXORE16_V, MASK_VAMOXORE16_V)
-DECLARE_INSN(vamoande16_v, MATCH_VAMOANDE16_V, MASK_VAMOANDE16_V)
-DECLARE_INSN(vamoore16_v, MATCH_VAMOORE16_V, MASK_VAMOORE16_V)
-DECLARE_INSN(vamomine16_v, MATCH_VAMOMINE16_V, MASK_VAMOMINE16_V)
-DECLARE_INSN(vamomaxe16_v, MATCH_VAMOMAXE16_V, MASK_VAMOMAXE16_V)
-DECLARE_INSN(vamominue16_v, MATCH_VAMOMINUE16_V, MASK_VAMOMINUE16_V)
-DECLARE_INSN(vamomaxue16_v, MATCH_VAMOMAXUE16_V, MASK_VAMOMAXUE16_V)
-DECLARE_INSN(vamoswape32_v, MATCH_VAMOSWAPE32_V, MASK_VAMOSWAPE32_V)
-DECLARE_INSN(vamoadde32_v, MATCH_VAMOADDE32_V, MASK_VAMOADDE32_V)
-DECLARE_INSN(vamoxore32_v, MATCH_VAMOXORE32_V, MASK_VAMOXORE32_V)
-DECLARE_INSN(vamoande32_v, MATCH_VAMOANDE32_V, MASK_VAMOANDE32_V)
-DECLARE_INSN(vamoore32_v, MATCH_VAMOORE32_V, MASK_VAMOORE32_V)
-DECLARE_INSN(vamomine32_v, MATCH_VAMOMINE32_V, MASK_VAMOMINE32_V)
-DECLARE_INSN(vamomaxe32_v, MATCH_VAMOMAXE32_V, MASK_VAMOMAXE32_V)
-DECLARE_INSN(vamominue32_v, MATCH_VAMOMINUE32_V, MASK_VAMOMINUE32_V)
-DECLARE_INSN(vamomaxue32_v, MATCH_VAMOMAXUE32_V, MASK_VAMOMAXUE32_V)
-DECLARE_INSN(vamoswape64_v, MATCH_VAMOSWAPE64_V, MASK_VAMOSWAPE64_V)
-DECLARE_INSN(vamoadde64_v, MATCH_VAMOADDE64_V, MASK_VAMOADDE64_V)
-DECLARE_INSN(vamoxore64_v, MATCH_VAMOXORE64_V, MASK_VAMOXORE64_V)
-DECLARE_INSN(vamoande64_v, MATCH_VAMOANDE64_V, MASK_VAMOANDE64_V)
-DECLARE_INSN(vamoore64_v, MATCH_VAMOORE64_V, MASK_VAMOORE64_V)
-DECLARE_INSN(vamomine64_v, MATCH_VAMOMINE64_V, MASK_VAMOMINE64_V)
-DECLARE_INSN(vamomaxe64_v, MATCH_VAMOMAXE64_V, MASK_VAMOMAXE64_V)
-DECLARE_INSN(vamominue64_v, MATCH_VAMOMINUE64_V, MASK_VAMOMINUE64_V)
-DECLARE_INSN(vamomaxue64_v, MATCH_VAMOMAXUE64_V, MASK_VAMOMAXUE64_V)
+DECLARE_INSN(vamoswapei8_v, MATCH_VAMOSWAPEI8_V, MASK_VAMOSWAPEI8_V)
+DECLARE_INSN(vamoaddei8_v, MATCH_VAMOADDEI8_V, MASK_VAMOADDEI8_V)
+DECLARE_INSN(vamoxorei8_v, MATCH_VAMOXOREI8_V, MASK_VAMOXOREI8_V)
+DECLARE_INSN(vamoandei8_v, MATCH_VAMOANDEI8_V, MASK_VAMOANDEI8_V)
+DECLARE_INSN(vamoorei8_v, MATCH_VAMOOREI8_V, MASK_VAMOOREI8_V)
+DECLARE_INSN(vamominei8_v, MATCH_VAMOMINEI8_V, MASK_VAMOMINEI8_V)
+DECLARE_INSN(vamomaxei8_v, MATCH_VAMOMAXEI8_V, MASK_VAMOMAXEI8_V)
+DECLARE_INSN(vamominuei8_v, MATCH_VAMOMINUEI8_V, MASK_VAMOMINUEI8_V)
+DECLARE_INSN(vamomaxuei8_v, MATCH_VAMOMAXUEI8_V, MASK_VAMOMAXUEI8_V)
+DECLARE_INSN(vamoswapei16_v, MATCH_VAMOSWAPEI16_V, MASK_VAMOSWAPEI16_V)
+DECLARE_INSN(vamoaddei16_v, MATCH_VAMOADDEI16_V, MASK_VAMOADDEI16_V)
+DECLARE_INSN(vamoxorei16_v, MATCH_VAMOXOREI16_V, MASK_VAMOXOREI16_V)
+DECLARE_INSN(vamoandei16_v, MATCH_VAMOANDEI16_V, MASK_VAMOANDEI16_V)
+DECLARE_INSN(vamoorei16_v, MATCH_VAMOOREI16_V, MASK_VAMOOREI16_V)
+DECLARE_INSN(vamominei16_v, MATCH_VAMOMINEI16_V, MASK_VAMOMINEI16_V)
+DECLARE_INSN(vamomaxei16_v, MATCH_VAMOMAXEI16_V, MASK_VAMOMAXEI16_V)
+DECLARE_INSN(vamominuei16_v, MATCH_VAMOMINUEI16_V, MASK_VAMOMINUEI16_V)
+DECLARE_INSN(vamomaxuei16_v, MATCH_VAMOMAXUEI16_V, MASK_VAMOMAXUEI16_V)
+DECLARE_INSN(vamoswapei32_v, MATCH_VAMOSWAPEI32_V, MASK_VAMOSWAPEI32_V)
+DECLARE_INSN(vamoaddei32_v, MATCH_VAMOADDEI32_V, MASK_VAMOADDEI32_V)
+DECLARE_INSN(vamoxorei32_v, MATCH_VAMOXOREI32_V, MASK_VAMOXOREI32_V)
+DECLARE_INSN(vamoandei32_v, MATCH_VAMOANDEI32_V, MASK_VAMOANDEI32_V)
+DECLARE_INSN(vamoorei32_v, MATCH_VAMOOREI32_V, MASK_VAMOOREI32_V)
+DECLARE_INSN(vamominei32_v, MATCH_VAMOMINEI32_V, MASK_VAMOMINEI32_V)
+DECLARE_INSN(vamomaxei32_v, MATCH_VAMOMAXEI32_V, MASK_VAMOMAXEI32_V)
+DECLARE_INSN(vamominuei32_v, MATCH_VAMOMINUEI32_V, MASK_VAMOMINUEI32_V)
+DECLARE_INSN(vamomaxuei32_v, MATCH_VAMOMAXUEI32_V, MASK_VAMOMAXUEI32_V)
+DECLARE_INSN(vamoswapei64_v, MATCH_VAMOSWAPEI64_V, MASK_VAMOSWAPEI64_V)
+DECLARE_INSN(vamoaddei64_v, MATCH_VAMOADDEI64_V, MASK_VAMOADDEI64_V)
+DECLARE_INSN(vamoxorei64_v, MATCH_VAMOXOREI64_V, MASK_VAMOXOREI64_V)
+DECLARE_INSN(vamoandei64_v, MATCH_VAMOANDEI64_V, MASK_VAMOANDEI64_V)
+DECLARE_INSN(vamoorei64_v, MATCH_VAMOOREI64_V, MASK_VAMOOREI64_V)
+DECLARE_INSN(vamominei64_v, MATCH_VAMOMINEI64_V, MASK_VAMOMINEI64_V)
+DECLARE_INSN(vamomaxei64_v, MATCH_VAMOMAXEI64_V, MASK_VAMOMAXEI64_V)
+DECLARE_INSN(vamominuei64_v, MATCH_VAMOMINUEI64_V, MASK_VAMOMINUEI64_V)
+DECLARE_INSN(vamomaxuei64_v, MATCH_VAMOMAXUEI64_V, MASK_VAMOMAXUEI64_V)
DECLARE_INSN(vmvnfr_v, MATCH_VMVNFR_V, MASK_VMVNFR_V)
#endif
#ifdef DECLARE_CSR
diff --git a/riscv/insns/vamoadde16_v.h b/riscv/insns/vamoaddei16_v.h
index 3cb3db7..3cb3db7 100644
--- a/riscv/insns/vamoadde16_v.h
+++ b/riscv/insns/vamoaddei16_v.h
diff --git a/riscv/insns/vamoadde32_v.h b/riscv/insns/vamoaddei32_v.h
index 2bd77fc..2bd77fc 100644
--- a/riscv/insns/vamoadde32_v.h
+++ b/riscv/insns/vamoaddei32_v.h
diff --git a/riscv/insns/vamoadde64_v.h b/riscv/insns/vamoaddei64_v.h
index 79ca748..79ca748 100644
--- a/riscv/insns/vamoadde64_v.h
+++ b/riscv/insns/vamoaddei64_v.h
diff --git a/riscv/insns/vamoadde8_v.h b/riscv/insns/vamoaddei8_v.h
index 06b8c79..06b8c79 100644
--- a/riscv/insns/vamoadde8_v.h
+++ b/riscv/insns/vamoaddei8_v.h
diff --git a/riscv/insns/vamoande16_v.h b/riscv/insns/vamoandei16_v.h
index be11949..be11949 100644
--- a/riscv/insns/vamoande16_v.h
+++ b/riscv/insns/vamoandei16_v.h
diff --git a/riscv/insns/vamoande32_v.h b/riscv/insns/vamoandei32_v.h
index 7150670..7150670 100644
--- a/riscv/insns/vamoande32_v.h
+++ b/riscv/insns/vamoandei32_v.h
diff --git a/riscv/insns/vamoande64_v.h b/riscv/insns/vamoandei64_v.h
index 3efae3b..3efae3b 100644
--- a/riscv/insns/vamoande64_v.h
+++ b/riscv/insns/vamoandei64_v.h
diff --git a/riscv/insns/vamoande8_v.h b/riscv/insns/vamoandei8_v.h
index c47645d..c47645d 100644
--- a/riscv/insns/vamoande8_v.h
+++ b/riscv/insns/vamoandei8_v.h
diff --git a/riscv/insns/vamomaxe16_v.h b/riscv/insns/vamomaxei16_v.h
index ca67893..ca67893 100644
--- a/riscv/insns/vamomaxe16_v.h
+++ b/riscv/insns/vamomaxei16_v.h
diff --git a/riscv/insns/vamomaxe32_v.h b/riscv/insns/vamomaxei32_v.h
index b6823cd..b6823cd 100644
--- a/riscv/insns/vamomaxe32_v.h
+++ b/riscv/insns/vamomaxei32_v.h
diff --git a/riscv/insns/vamomaxe64_v.h b/riscv/insns/vamomaxei64_v.h
index 46e8a3b..46e8a3b 100644
--- a/riscv/insns/vamomaxe64_v.h
+++ b/riscv/insns/vamomaxei64_v.h
diff --git a/riscv/insns/vamomaxe8_v.h b/riscv/insns/vamomaxei8_v.h
index 9697b3a..9697b3a 100644
--- a/riscv/insns/vamomaxe8_v.h
+++ b/riscv/insns/vamomaxei8_v.h
diff --git a/riscv/insns/vamomaxue16_v.h b/riscv/insns/vamomaxuei16_v.h
index e05971d..e05971d 100644
--- a/riscv/insns/vamomaxue16_v.h
+++ b/riscv/insns/vamomaxuei16_v.h
diff --git a/riscv/insns/vamomaxue32_v.h b/riscv/insns/vamomaxuei32_v.h
index 9b87354..9b87354 100644
--- a/riscv/insns/vamomaxue32_v.h
+++ b/riscv/insns/vamomaxuei32_v.h
diff --git a/riscv/insns/vamomaxue64_v.h b/riscv/insns/vamomaxuei64_v.h
index bbfbc9f..bbfbc9f 100644
--- a/riscv/insns/vamomaxue64_v.h
+++ b/riscv/insns/vamomaxuei64_v.h
diff --git a/riscv/insns/vamomaxue8_v.h b/riscv/insns/vamomaxuei8_v.h
index 357ba24..357ba24 100644
--- a/riscv/insns/vamomaxue8_v.h
+++ b/riscv/insns/vamomaxuei8_v.h
diff --git a/riscv/insns/vamomine16_v.h b/riscv/insns/vamominei16_v.h
index 9d1ecac..9d1ecac 100644
--- a/riscv/insns/vamomine16_v.h
+++ b/riscv/insns/vamominei16_v.h
diff --git a/riscv/insns/vamomine32_v.h b/riscv/insns/vamominei32_v.h
index 6cb8475..6cb8475 100644
--- a/riscv/insns/vamomine32_v.h
+++ b/riscv/insns/vamominei32_v.h
diff --git a/riscv/insns/vamomine64_v.h b/riscv/insns/vamominei64_v.h
index 9ef3d4e..9ef3d4e 100644
--- a/riscv/insns/vamomine64_v.h
+++ b/riscv/insns/vamominei64_v.h
diff --git a/riscv/insns/vamomine8_v.h b/riscv/insns/vamominei8_v.h
index 5c035ea..5c035ea 100644
--- a/riscv/insns/vamomine8_v.h
+++ b/riscv/insns/vamominei8_v.h
diff --git a/riscv/insns/vamominue16_v.h b/riscv/insns/vamominuei16_v.h
index d4a8f89..d4a8f89 100644
--- a/riscv/insns/vamominue16_v.h
+++ b/riscv/insns/vamominuei16_v.h
diff --git a/riscv/insns/vamominue32_v.h b/riscv/insns/vamominuei32_v.h
index 16296c5..16296c5 100644
--- a/riscv/insns/vamominue32_v.h
+++ b/riscv/insns/vamominuei32_v.h
diff --git a/riscv/insns/vamominue64_v.h b/riscv/insns/vamominuei64_v.h
index fd850fd..fd850fd 100644
--- a/riscv/insns/vamominue64_v.h
+++ b/riscv/insns/vamominuei64_v.h
diff --git a/riscv/insns/vamominue8_v.h b/riscv/insns/vamominuei8_v.h
index 3749d05..3749d05 100644
--- a/riscv/insns/vamominue8_v.h
+++ b/riscv/insns/vamominuei8_v.h
diff --git a/riscv/insns/vamoore16_v.h b/riscv/insns/vamoorei16_v.h
index a5ba1ca..a5ba1ca 100644
--- a/riscv/insns/vamoore16_v.h
+++ b/riscv/insns/vamoorei16_v.h
diff --git a/riscv/insns/vamoore32_v.h b/riscv/insns/vamoorei32_v.h
index 94e4458..94e4458 100644
--- a/riscv/insns/vamoore32_v.h
+++ b/riscv/insns/vamoorei32_v.h
diff --git a/riscv/insns/vamoore64_v.h b/riscv/insns/vamoorei64_v.h
index 84e0394..84e0394 100644
--- a/riscv/insns/vamoore64_v.h
+++ b/riscv/insns/vamoorei64_v.h
diff --git a/riscv/insns/vamoore8_v.h b/riscv/insns/vamoorei8_v.h
index 364035d..364035d 100644
--- a/riscv/insns/vamoore8_v.h
+++ b/riscv/insns/vamoorei8_v.h
diff --git a/riscv/insns/vamoswape16_v.h b/riscv/insns/vamoswapei16_v.h
index 31ff021..31ff021 100644
--- a/riscv/insns/vamoswape16_v.h
+++ b/riscv/insns/vamoswapei16_v.h
diff --git a/riscv/insns/vamoswape32_v.h b/riscv/insns/vamoswapei32_v.h
index a574192..a574192 100644
--- a/riscv/insns/vamoswape32_v.h
+++ b/riscv/insns/vamoswapei32_v.h
diff --git a/riscv/insns/vamoswape64_v.h b/riscv/insns/vamoswapei64_v.h
index 58bd035..58bd035 100644
--- a/riscv/insns/vamoswape64_v.h
+++ b/riscv/insns/vamoswapei64_v.h
diff --git a/riscv/insns/vamoswape8_v.h b/riscv/insns/vamoswapei8_v.h
index af37c8c..af37c8c 100644
--- a/riscv/insns/vamoswape8_v.h
+++ b/riscv/insns/vamoswapei8_v.h
diff --git a/riscv/insns/vamoxore16_v.h b/riscv/insns/vamoxorei16_v.h
index 61e8c32..61e8c32 100644
--- a/riscv/insns/vamoxore16_v.h
+++ b/riscv/insns/vamoxorei16_v.h
diff --git a/riscv/insns/vamoxore32_v.h b/riscv/insns/vamoxorei32_v.h
index d48d951..d48d951 100644
--- a/riscv/insns/vamoxore32_v.h
+++ b/riscv/insns/vamoxorei32_v.h
diff --git a/riscv/insns/vamoxore64_v.h b/riscv/insns/vamoxorei64_v.h
index f7a3ca4..f7a3ca4 100644
--- a/riscv/insns/vamoxore64_v.h
+++ b/riscv/insns/vamoxorei64_v.h
diff --git a/riscv/insns/vamoxore8_v.h b/riscv/insns/vamoxorei8_v.h
index 4b6c798..4b6c798 100644
--- a/riscv/insns/vamoxore8_v.h
+++ b/riscv/insns/vamoxorei8_v.h
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 73c4cef..0ac77f2 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -655,42 +655,42 @@ riscv_insn_ext_v_alu_fp = \
vmfne_vv \
riscv_insn_ext_v_amo = \
- vamoswape8_v \
- vamoadde8_v \
- vamoande8_v \
- vamomaxe8_v \
- vamomaxue8_v \
- vamomine8_v \
- vamominue8_v \
- vamoore8_v \
- vamoxore8_v \
- vamoswape16_v \
- vamoadde16_v \
- vamoande16_v \
- vamomaxe16_v \
- vamomaxue16_v \
- vamomine16_v \
- vamominue16_v \
- vamoore16_v \
- vamoxore16_v \
- vamoswape32_v \
- vamoadde32_v \
- vamoande32_v \
- vamomaxe32_v \
- vamomaxue32_v \
- vamomine32_v \
- vamominue32_v \
- vamoore32_v \
- vamoxore32_v \
- vamoswape64_v \
- vamoadde64_v \
- vamoande64_v \
- vamomaxe64_v \
- vamomaxue64_v \
- vamomine64_v \
- vamominue64_v \
- vamoore64_v \
- vamoxore64_v \
+ vamoswapei8_v \
+ vamoaddei8_v \
+ vamoandei8_v \
+ vamomaxei8_v \
+ vamomaxuei8_v \
+ vamominei8_v \
+ vamominuei8_v \
+ vamoorei8_v \
+ vamoxorei8_v \
+ vamoswapei16_v \
+ vamoaddei16_v \
+ vamoandei16_v \
+ vamomaxei16_v \
+ vamomaxuei16_v \
+ vamominei16_v \
+ vamominuei16_v \
+ vamoorei16_v \
+ vamoxorei16_v \
+ vamoswapei32_v \
+ vamoaddei32_v \
+ vamoandei32_v \
+ vamomaxei32_v \
+ vamomaxuei32_v \
+ vamominei32_v \
+ vamominuei32_v \
+ vamoorei32_v \
+ vamoxorei32_v \
+ vamoswapei64_v \
+ vamoaddei64_v \
+ vamoandei64_v \
+ vamomaxei64_v \
+ vamomaxuei64_v \
+ vamominei64_v \
+ vamominuei64_v \
+ vamoorei64_v \
+ vamoxorei64_v \
riscv_insn_ext_v_ldst = \
vle8_v \