From: Andrew Waterman <andrew@sifive.com>
Date: Wed, 15 Feb 2017 11:06:34 +0000 (-0800)
Subject: sfence.vm -> sfence.vma
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d50376557741aec308b508214acf05f9f4631609;p=riscv-isa-sim.git

sfence.vm -> sfence.vma
---

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 3ab9c6b..d205761 100644
--- 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
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
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 552187a..17479dc 100644
--- 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 \