From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 29 Sep 2018 00:51:45 +0000 (+0100)
Subject: Revert "manually add svsetvl instruction"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=452095644a3abe15df63e28f7396553fbf0d73f1;p=riscv-isa-sim.git

Revert "manually add svsetvl instruction"

This reverts commit b3e60c2c6e722bc181369d48642834422fa1082c.
---

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 12c7ce1..9dcb0e6 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -322,8 +322,6 @@
 #define MASK_SW  0x707f
 #define MATCH_SD 0x3023
 #define MASK_SD  0x707f
-#define MATCH_SVSETVL 0x4023
-#define MASK_SVSETVL  0x707f
 #define MATCH_FENCE 0xf
 #define MASK_FENCE  0x707f
 #define MATCH_FENCE_I 0x100f
@@ -1028,7 +1026,6 @@ DECLARE_INSN(sb, MATCH_SB, MASK_SB)
 DECLARE_INSN(sh, MATCH_SH, MASK_SH)
 DECLARE_INSN(sw, MATCH_SW, MASK_SW)
 DECLARE_INSN(sd, MATCH_SD, MASK_SD)
-DECLARE_INSN(svsetvl, MATCH_SVSETVL, MASK_SVSETVL)
 DECLARE_INSN(fence, MATCH_FENCE, MASK_FENCE)
 DECLARE_INSN(fence_i, MATCH_FENCE_I, MASK_FENCE_I)
 DECLARE_INSN(mul, MATCH_MUL, MASK_MUL)
diff --git a/riscv/insns/svsetvl.h b/riscv/insns/svsetvl.h
deleted file mode 100644
index 9517f18..0000000
--- a/riscv/insns/svsetvl.h
+++ /dev/null
@@ -1,4 +0,0 @@
-p->get_state()->vl = std::min((uint64_t)63,
-                     std::min((uint64_t)insn.i_imm(),
-                              RS1));
-WRITE_RD(p->get_state()->vl);
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 7e1a2a8..045d58a 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -287,7 +287,6 @@ riscv_insn_list = \
 	srlw \
 	sub \
 	subw \
-	svsetvl \
 	sw \
 	wfi \
 	xor \