sfence.vm -> sfence.vma

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 3ab9c6b49c3ad7ac8ca6aa9d15c80e17da52da11..d205761b3eef43d83c2070a731971d2fe23ebdf3 100644 (file)
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -411,8 +411,8 @@
 #define MASK_MRET  0xffffffff
 #define MATCH_DRET 0x7b200073
 #define MASK_DRET  0xffffffff
-#define MATCH_SFENCE_VM 0x10400073
-#define MASK_SFENCE_VM  0xfff07fff
+#define MATCH_SFENCE_VMA 0x12000073
+#define MASK_SFENCE_VMA  0xfe007fff
 #define MATCH_WFI 0x10500073
 #define MASK_WFI  0xffffffff
 #define MATCH_CSRRW 0x1073
@@ -1049,7 +1049,7 @@ DECLARE_INSN(sret, MATCH_SRET, MASK_SRET)
 DECLARE_INSN(hret, MATCH_HRET, MASK_HRET)
 DECLARE_INSN(mret, MATCH_MRET, MASK_MRET)
 DECLARE_INSN(dret, MATCH_DRET, MASK_DRET)
-DECLARE_INSN(sfence_vm, MATCH_SFENCE_VM, MASK_SFENCE_VM)
+DECLARE_INSN(sfence_vma, MATCH_SFENCE_VMA, MASK_SFENCE_VMA)
 DECLARE_INSN(wfi, MATCH_WFI, MASK_WFI)
 DECLARE_INSN(csrrw, MATCH_CSRRW, MASK_CSRRW)
 DECLARE_INSN(csrrs, MATCH_CSRRS, MASK_CSRRS)

diff --git a/riscv/insns/sfence_vm.h b/riscv/insns/sfence_vm.h
deleted file mode 100644 (file)
index 35ff5dd..0000000
--- a/riscv/insns/sfence_vm.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_privilege(PRV_S);
-MMU.flush_tlb();

diff --git a/riscv/insns/sfence_vma.h b/riscv/insns/sfence_vma.h
new file mode 100644 (file)
index 0000000..35ff5dd
--- /dev/null
+++ b/riscv/insns/sfence_vma.h
@@ -0,0 +1,2 @@
+require_privilege(PRV_S);
+MMU.flush_tlb();

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 552187ab19d077a833c416aaf41c8638140b480f..17479dce558847a06d7e9fdb8cdc60ea21b55965 100644 (file)
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -227,7 +227,7 @@ riscv_insn_list = \
        sc_d \
        sc_w \
        sd \
-       sfence_vm \
+       sfence_vma \
        sh \
        sll \
        slli \