From 6597bec74ffdff6671ab444e08d9fbac424567b7 Mon Sep 17 00:00:00 2001
From: marcfedorow <mark.fedorov@cloudbear.ru>
Date: Thu, 25 Nov 2021 15:38:02 +0300
Subject: [PATCH] Fix RVTEST_FP_ENABLE macro

Reset fcsr before every testset.
Fixes #223
---
 riscv-test-suite/env/arch_test.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/riscv-test-suite/env/arch_test.h b/riscv-test-suite/env/arch_test.h
index 26f918716..ab255fca1 100644
--- 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);\