1 files changed, 1 insertions, 83 deletions

diff --git a/v/riscv_test.h b/v/riscv_test.h
index 1b38b5a..6734713 100644
--- a/v/riscv_test.h
+++ b/v/riscv_test.h
@@ -12,10 +12,6 @@
 #undef RVTEST_FP_ENABLE
 #define RVTEST_FP_ENABLE fssr x0
 
-#undef RVTEST_RV64UV
-#define RVTEST_RV64UV                                                   \
-        RVTEST_RV64UF
-
 #undef RVTEST_CODE_BEGIN
 #define RVTEST_CODE_BEGIN                                               \
         .text;                                                          \
@@ -48,92 +44,16 @@ userstart:                                                              \
 // Supervisor mode definitions and macros
 //-----------------------------------------------------------------------
 
-#define dword_bit_cmd(dw) ((dw >> 32) & 0x1)
-#define dword_bit_cnt(dw) (!dword_bit_cmd(dw))
-#define dword_bit_imm1(dw) ((dw >> 35) & 0x1)
-#define dword_bit_imm2(dw) ((dw >> 34) & 0x1)
-#define dword_bit_pf(dw) ((dw >> 36) & 0x1)
-
-#define fence() ({ \
-          asm volatile ("fence" ::: "memory"); })
-
-#define vxcptkill() ({ \
-          asm volatile ("vxcptkill"); })
-
-#define vxcpthold(addr) ({ \
-          asm volatile ("vxcpthold %0" : : "r"(addr)); })
-
-#define venqcmd(bits, pf) ({ \
-          asm volatile ("venqcmd %0,%1" : : "r"(bits), "r"(pf)); })
-
-#define venqimm1(bits, pf) ({ \
-          asm volatile ("venqimm1 %0,%1" : : "r"(bits), "r"(pf)); })
-
-#define venqimm2(bits, pf) ({ \
-          asm volatile ("venqimm2 %0,%1" : : "r"(bits), "r"(pf)); })
- 
-#define venqcnt(bits, pf) ({ \
-          asm volatile ("venqcnt %0,%1" :: "r"(bits), "r"(pf)); })
-
 #define MAX_TEST_PAGES 63 // this must be the period of the LFSR below
 #define LFSR_NEXT(x) (((((x)^((x)>>1)) & 1) << 5) | ((x) >> 1))
 
 #define PGSHIFT 12
 #define PGSIZE (1UL << PGSHIFT)
 
-#define SIZEOF_TRAPFRAME_T 20776
-#define SIZEOF_TRAPFRAME_T_SCALAR 296
+#define SIZEOF_TRAPFRAME_T 288
 
 #ifndef __ASSEMBLER__
 
-static inline void vsetcfg(long cfg)
-{
-  asm volatile ("vsetcfg %0" : : "r"(cfg));
-}
-
-static inline void vsetvl(long vl)
-{
-  long __tmp;
-  asm volatile ("vsetvl %0,%1" : "=r"(__tmp) : "r"(vl));
-}
-
-static inline long vgetcfg()
-{
-  int cfg;
-  asm volatile ("vgetcfg %0" : "=r"(cfg) :);
-  return cfg;
-}
-
-static inline long vgetvl()
-{
-  int vl;
-  asm volatile ("vgetvl %0" : "=r"(vl) :);
-}
-
-static inline long vxcptaux()
-{
-  long aux;
-  asm volatile ("vxcptaux %0" : "=r"(aux) :);
-  return aux;
-}
-
-static inline long vxcptcause()
-{
-  long cause;
-  asm volatile ("vxcptcause %0" : "=r"(cause) :);
-  return cause;
-}
-
-static inline void vxcptrestore(long* mem)
-{
-  asm volatile("vxcptrestore %0" : : "r"(mem) : "memory");
-}
-
-static inline void vxcptevac(long* mem)
-{
-  asm volatile ("vxcptevac %0" : : "r"(mem));
-}
-
 typedef unsigned long pte_t;
 #define LEVELS (sizeof(pte_t) == sizeof(uint64_t) ? 3 : 2)
 #define PTIDXBITS (PGSHIFT - (sizeof(pte_t) == 8 ? 3 : 2))
@@ -149,8 +69,6 @@ typedef struct
   long epc;
   long badvaddr;
   long cause;
-  long hwacha_cause;
-  long hwacha_opaque[2560];
 } trapframe_t;
 #endif