Merge pull request #224 from marcfedorow/patch-1

Fix RVTEST_FP_ENABLE macro
riscv-non-isa · Dec 6, 2021 · 307c77b · 307c77b
2 parents c0d882b + 748d6c3
commit 307c77b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [2.6.1] - 2021-11-25
+ - Fixed RVTEST_FP_ENABLE macro for the issue #223
+
 ## [2.6.0] - 2021-10-21
  - Added rv64d tests, references, coverage files and data propagation reports
  - removed unwated re-assignment of macros for RV64F combination in `arch_test.h`

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);\