use RVTEST_RV64UF macro for FPU tests

[riscv-tests.git] / env / p / riscv_test.h

diff --git a/env/p/riscv_test.h b/env/p/riscv_test.h
index 35154f0d94d31197a6d0d43b077df381d7ec1565..a537fb2494add1af1c8503476805c81c995d910d 100644 (file)
--- a/env/p/riscv_test.h
+++ b/env/p/riscv_test.h
@@ -7,6 +7,10 @@
 
 #define RVTEST_RV64U                                                    \
 
+#define RVTEST_RV64UF                                                   \
+  RVTEST_RV64U;                                                         \
+  RVTEST_FP_ENABLE
+
 #define RVTEST_RV32U                                                    \
   clearpcr cr0, 0x80
 
@@ -16,9 +20,9 @@
   setpcr cr0, 2;                                                        \
   mfpcr a0, cr0;                                                        \
   and   a0, a0, 2;                                                      \
-  beqz  a0, 1f;                                                         \
-  mtfsr x0;                                                             \
-1:
+  bnez  a0, 2f;                                                         \
+  RVTEST_PASS;                                                          \
+2:mtfsr x0;                                                             \
 
 #define RVTEST_VEC_ENABLE                                               \
   mfpcr a0, cr0;                                                        \