Fix RVTEST_FP_ENABLE macro

Reset fcsr before every testset. Fixes #223
riscv-non-isa · Nov 25, 2021 · 6597bec · 6597bec
1 parent c0d882b
commit 6597bec
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/riscv-test-suite/env/arch_test.h b/riscv-test-suite/env/arch_test.h
@@ -548,11 +548,10 @@
 
 #define RVTEST_CASE(_PNAME,_DSTR,...) 
 
-#define RVTEST_FP_ENABLE()\
- LI x2, MSTATUS_FS;\
- csrrs x3, mstatus,x0;\
- or x2, x3, x2;\
- csrrw x0,mstatus,x2; 
+#define RVTEST_FP_ENABLE() \
+ li a0, MSTATUS_FS & (MSTATUS_FS >> 1); \
+ csrs mstatus, a0; \
+ csrwi fcsr, 0
 
 #define RVTEST_SIGBASE(_R,_TAG) \
  LA(_R,_TAG);\