aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--disasm/disasm.cc4
-rw-r--r--riscv/encoding.h12
-rw-r--r--riscv/insns/vmandn_mm.h2
-rw-r--r--riscv/insns/vmandnot_mm.h2
-rw-r--r--riscv/insns/vmorn_mm.h2
-rw-r--r--riscv/insns/vmornot_mm.h2
-rw-r--r--riscv/riscv.mk.in4
7 files changed, 14 insertions, 14 deletions
diff --git a/disasm/disasm.cc b/disasm/disasm.cc
index 9e26f0f..53f71fa 100644
--- a/disasm/disasm.cc
+++ b/disasm/disasm.cc
@@ -1322,11 +1322,11 @@ disassembler_t::disassembler_t(int xlen)
DISASM_INSN("vcompress.vm", vcompress_vm, 0, {&vd, &vs2, &vs1});
- DISASM_OPIV_M___INSN(vmandnot, 1);
+ DISASM_OPIV_M___INSN(vmandn, 1);
DISASM_OPIV_M___INSN(vmand, 1);
DISASM_OPIV_M___INSN(vmor, 1);
DISASM_OPIV_M___INSN(vmxor, 1);
- DISASM_OPIV_M___INSN(vmornot, 1);
+ DISASM_OPIV_M___INSN(vmorn, 1);
DISASM_OPIV_M___INSN(vmnand, 1);
DISASM_OPIV_M___INSN(vmnor, 1);
DISASM_OPIV_M___INSN(vmxnor, 1);
diff --git a/riscv/encoding.h b/riscv/encoding.h
index c459498..1f2cc52 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -1899,16 +1899,16 @@
#define MASK_VSEXT_VF2 0xfc0ff07f
#define MATCH_VCOMPRESS_VM 0x5e002057
#define MASK_VCOMPRESS_VM 0xfe00707f
-#define MATCH_VMANDNOT_MM 0x60002057
-#define MASK_VMANDNOT_MM 0xfc00707f
+#define MATCH_VMANDN_MM 0x60002057
+#define MASK_VMANDN_MM 0xfc00707f
#define MATCH_VMAND_MM 0x64002057
#define MASK_VMAND_MM 0xfc00707f
#define MATCH_VMOR_MM 0x68002057
#define MASK_VMOR_MM 0xfc00707f
#define MATCH_VMXOR_MM 0x6c002057
#define MASK_VMXOR_MM 0xfc00707f
-#define MATCH_VMORNOT_MM 0x70002057
-#define MASK_VMORNOT_MM 0xfc00707f
+#define MATCH_VMORN_MM 0x70002057
+#define MASK_VMORN_MM 0xfc00707f
#define MATCH_VMNAND_MM 0x74002057
#define MASK_VMNAND_MM 0xfc00707f
#define MATCH_VMNOR_MM 0x78002057
@@ -3891,11 +3891,11 @@ DECLARE_INSN(vsext_vf4, MATCH_VSEXT_VF4, MASK_VSEXT_VF4)
DECLARE_INSN(vzext_vf2, MATCH_VZEXT_VF2, MASK_VZEXT_VF2)
DECLARE_INSN(vsext_vf2, MATCH_VSEXT_VF2, MASK_VSEXT_VF2)
DECLARE_INSN(vcompress_vm, MATCH_VCOMPRESS_VM, MASK_VCOMPRESS_VM)
-DECLARE_INSN(vmandnot_mm, MATCH_VMANDNOT_MM, MASK_VMANDNOT_MM)
+DECLARE_INSN(vmandn_mm, MATCH_VMANDN_MM, MASK_VMANDN_MM)
DECLARE_INSN(vmand_mm, MATCH_VMAND_MM, MASK_VMAND_MM)
DECLARE_INSN(vmor_mm, MATCH_VMOR_MM, MASK_VMOR_MM)
DECLARE_INSN(vmxor_mm, MATCH_VMXOR_MM, MASK_VMXOR_MM)
-DECLARE_INSN(vmornot_mm, MATCH_VMORNOT_MM, MASK_VMORNOT_MM)
+DECLARE_INSN(vmorn_mm, MATCH_VMORN_MM, MASK_VMORN_MM)
DECLARE_INSN(vmnand_mm, MATCH_VMNAND_MM, MASK_VMNAND_MM)
DECLARE_INSN(vmnor_mm, MATCH_VMNOR_MM, MASK_VMNOR_MM)
DECLARE_INSN(vmxnor_mm, MATCH_VMXNOR_MM, MASK_VMXNOR_MM)
diff --git a/riscv/insns/vmandn_mm.h b/riscv/insns/vmandn_mm.h
new file mode 100644
index 0000000..e9a87cf
--- /dev/null
+++ b/riscv/insns/vmandn_mm.h
@@ -0,0 +1,2 @@
+// vmandn.mm vd, vs2, vs1
+VI_LOOP_MASK(vs2 & ~vs1);
diff --git a/riscv/insns/vmandnot_mm.h b/riscv/insns/vmandnot_mm.h
deleted file mode 100644
index 4c26469..0000000
--- a/riscv/insns/vmandnot_mm.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// vmandnot.mm vd, vs2, vs1
-VI_LOOP_MASK(vs2 & ~vs1);
diff --git a/riscv/insns/vmorn_mm.h b/riscv/insns/vmorn_mm.h
new file mode 100644
index 0000000..23026f5
--- /dev/null
+++ b/riscv/insns/vmorn_mm.h
@@ -0,0 +1,2 @@
+// vmorn.mm vd, vs2, vs1
+VI_LOOP_MASK(vs2 | ~vs1);
diff --git a/riscv/insns/vmornot_mm.h b/riscv/insns/vmornot_mm.h
deleted file mode 100644
index bdc1d8b..0000000
--- a/riscv/insns/vmornot_mm.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// vmornot.mm vd, vs2, vs1
-VI_LOOP_MASK(vs2 | ~vs1);
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 2347ce6..5601466 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -500,7 +500,7 @@ riscv_insn_ext_v_alu_int = \
vmadd_vv \
vmadd_vx \
vmand_mm \
- vmandnot_mm \
+ vmandn_mm \
vmax_vv \
vmax_vx \
vmaxu_vv \
@@ -516,7 +516,7 @@ riscv_insn_ext_v_alu_int = \
vmnand_mm \
vmnor_mm \
vmor_mm \
- vmornot_mm \
+ vmorn_mm \
vmsbc_vv \
vmsbc_vx \
vmsbc_vvm \