From 996e0246aa614231a560f3e3e84793745470ca6f Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 28 Sep 2018 03:59:42 +0100
Subject: [PATCH] sv setvl as a csr not going to work, add getvl only

---
 riscv/encoding.h   | 35 +----------------------------------
 riscv/processor.cc | 25 +------------------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 6ec2564..9dcb0e6 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -893,40 +893,6 @@
 #define CSR_MHPMEVENT30 0x33e
 #define CSR_MHPMEVENT31 0x33f
 #define CSR_SVGETVL 0xcf0
-#define CSR_SVSETVL_BASE 0x4e0
-#define CSR_SVSETVL_MASK 0x1f
-#define CSR_SVSETVL_R0 0x4e0
-#define CSR_SVSETVL_R1 0x4e1
-#define CSR_SVSETVL_R2 0x4e2
-#define CSR_SVSETVL_R3 0x4e3
-#define CSR_SVSETVL_R4 0x4e4
-#define CSR_SVSETVL_R5 0x4e5
-#define CSR_SVSETVL_R6 0x4e6
-#define CSR_SVSETVL_R7 0x4e7
-#define CSR_SVSETVL_R8 0x4e8
-#define CSR_SVSETVL_R9 0x4e9
-#define CSR_SVSETVL_R10 0x4ea
-#define CSR_SVSETVL_R11 0x4eb
-#define CSR_SVSETVL_R12 0x4ec
-#define CSR_SVSETVL_R13 0x4ed
-#define CSR_SVSETVL_R14 0x4ee
-#define CSR_SVSETVL_R15 0x4ef
-#define CSR_SVSETVL_R16 0x4f0
-#define CSR_SVSETVL_R17 0x4f1
-#define CSR_SVSETVL_R18 0x4f2
-#define CSR_SVSETVL_R19 0x4f3
-#define CSR_SVSETVL_R20 0x4f4
-#define CSR_SVSETVL_R21 0x4f5
-#define CSR_SVSETVL_R22 0x4f6
-#define CSR_SVSETVL_R23 0x4f7
-#define CSR_SVSETVL_R24 0x4f8
-#define CSR_SVSETVL_R25 0x4f9
-#define CSR_SVSETVL_R26 0x4fa
-#define CSR_SVSETVL_R27 0x4fb
-#define CSR_SVSETVL_R28 0x4fc
-#define CSR_SVSETVL_R29 0x4fd
-#define CSR_SVSETVL_R30 0x4fe
-#define CSR_SVSETVL_R31 0x4ff
 #define CSR_MVENDORID 0xf11
 #define CSR_MARCHID 0xf12
 #define CSR_MIMPID 0xf13
@@ -1361,6 +1327,7 @@ DECLARE_CSR(dpc, CSR_DPC)
 DECLARE_CSR(dscratch, CSR_DSCRATCH)
 DECLARE_CSR(mcycle, CSR_MCYCLE)
 DECLARE_CSR(minstret, CSR_MINSTRET)
+DECLARE_CSR(svgetvl, CSR_SVGETVL)
 DECLARE_CSR(mhpmcounter3, CSR_MHPMCOUNTER3)
 DECLARE_CSR(mhpmcounter4, CSR_MHPMCOUNTER4)
 DECLARE_CSR(mhpmcounter5, CSR_MHPMCOUNTER5)
diff --git a/riscv/processor.cc b/riscv/processor.cc
index 237eedc..fd14f11 100644
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -333,31 +333,8 @@ void processor_t::set_csr(int which, reg_t val)
   reg_t delegable_ints = MIP_SSIP | MIP_STIP | MIP_SEIP
                        | ((ext != NULL) << IRQ_COP);
   reg_t all_ints = delegable_ints | MIP_MSIP | MIP_MTIP;
-#ifdef SPIKE_SIMPLEV
-  // SV SETVL includes the target register in the lower bits (0-31)
-  uint64_t sv_target = 0;
-  uint64_t sv_which = which & ~CSR_SVSETVL_MASK;
-  if (sv_which == CSR_SVSETVL_BASE)
-  {
-    sv_target = which & CSR_SVSETVL_MASK;
-    which = sv_which;
-  }
-#endif
   switch (which)
   {
-#ifdef SPIKE_SIMPLEV
-    case CSR_SVSETVL_BASE:
-      val = std::min((uint64_t)63,
-                 std::min((uint64_t)val,
-                           state.XPR[sv_target]));
-      // use CSR_SVSETVL_R0 to set VL to zero without side-effects
-      if (sv_target != 0)
-      {
-          state.XPR.write(sv_target, val);
-      }
-      state.vl = val;
-      break;
-#endif
     case CSR_FFLAGS:
       dirty_fp_state;
       state.fflags = val & (FSR_AEXC >> FSR_AEXC_SHIFT);
@@ -582,7 +559,7 @@ reg_t processor_t::get_csr(int which)
   switch (which)
   {
 #ifdef SPIKE_SIMPLEV
-    case CSR_SVGETV:
+    case CSR_SVGETVL:
       return state.vl;
 #endif
     case CSR_FFLAGS:
-- 
2.30.2