aboutsummaryrefslogtreecommitdiff
path: root/isa/rv64uf
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2016-12-06 17:04:14 -0800
committerAndrew Waterman <andrew@sifive.com>2016-12-06 17:04:14 -0800
commit56f46aa0f9688c87ce9ebd7658e19b884b018b6b (patch)
tree516d33de0c78bab0968f8548f7223160d8bba6fb /isa/rv64uf
parentb68b39031a730ecc155ed87fba2ed5f111d0ab07 (diff)
downloadriscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.zip
riscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.tar.gz
riscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.tar.bz2
avoid non-standard predefined macros
Diffstat (limited to 'isa/rv64uf')
-rw-r--r--isa/rv64uf/fcvt.S2
-rw-r--r--isa/rv64uf/fcvt_w.S8
2 files changed, 5 insertions, 5 deletions
diff --git a/isa/rv64uf/fcvt.S b/isa/rv64uf/fcvt.S
index a9a1b59..a41686e 100644
--- a/isa/rv64uf/fcvt.S
+++ b/isa/rv64uf/fcvt.S
@@ -23,7 +23,7 @@ RVTEST_CODE_BEGIN
TEST_INT_FP_OP_S( 4, fcvt.s.wu, 2.0, 2);
TEST_INT_FP_OP_S( 5, fcvt.s.wu, 4.2949673e9, -2);
-#ifndef __riscv32
+#if __riscv_xlen >= 64
TEST_INT_FP_OP_S( 6, fcvt.s.l, 2.0, 2);
TEST_INT_FP_OP_S( 7, fcvt.s.l, -2.0, -2);
diff --git a/isa/rv64uf/fcvt_w.S b/isa/rv64uf/fcvt_w.S
index bf7878a..cad5cba 100644
--- a/isa/rv64uf/fcvt_w.S
+++ b/isa/rv64uf/fcvt_w.S
@@ -35,7 +35,7 @@ RVTEST_CODE_BEGIN
TEST_FP_INT_OP_S(18, fcvt.wu.s, 0x10, 0, -3e9, rtz);
TEST_FP_INT_OP_S(19, fcvt.wu.s, 0x00, 3000000000, 3e9, rtz);
-#ifndef __riscv32
+#if __riscv_xlen >= 64
TEST_FP_INT_OP_S(22, fcvt.l.s, 0x01, -1, -1.1, rtz);
TEST_FP_INT_OP_S(23, fcvt.l.s, 0x00, -1, -1.0, rtz);
TEST_FP_INT_OP_S(24, fcvt.l.s, 0x01, 0, -0.9, rtz);
@@ -55,7 +55,7 @@ RVTEST_CODE_BEGIN
# test negative NaN, negative infinity conversion
TEST_CASE( 42, x1, 0x000000007fffffff, la x1, tdat ; flw f1, 0(x1); fcvt.w.s x1, f1)
TEST_CASE( 44, x1, 0xffffffff80000000, la x1, tdat ; flw f1, 8(x1); fcvt.w.s x1, f1)
-#ifndef __riscv32
+#if __riscv_xlen >= 64
TEST_CASE( 43, x1, 0x7fffffffffffffff, la x1, tdat ; flw f1, 0(x1); fcvt.l.s x1, f1)
TEST_CASE( 45, x1, 0x8000000000000000, la x1, tdat ; flw f1, 8(x1); fcvt.l.s x1, f1)
#endif
@@ -63,7 +63,7 @@ RVTEST_CODE_BEGIN
# test positive NaN, positive infinity conversion
TEST_CASE( 52, x1, 0x000000007fffffff, la x1, tdat ; flw f1, 4(x1); fcvt.w.s x1, f1)
TEST_CASE( 54, x1, 0x000000007fffffff, la x1, tdat ; flw f1, 12(x1); fcvt.w.s x1, f1)
-#ifndef __riscv32
+#if __riscv_xlen >= 64
TEST_CASE( 53, x1, 0x7fffffffffffffff, la x1, tdat ; flw f1, 4(x1); fcvt.l.s x1, f1)
TEST_CASE( 55, x1, 0x7fffffffffffffff, la x1, tdat ; flw f1, 12(x1); fcvt.l.s x1, f1)
#endif
@@ -73,7 +73,7 @@ RVTEST_CODE_BEGIN
TEST_CASE( 63, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 4(x1); fcvt.wu.s x1, f1)
TEST_CASE( 64, x1, 0, la x1, tdat ; flw f1, 8(x1); fcvt.wu.s x1, f1)
TEST_CASE( 65, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 12(x1); fcvt.wu.s x1, f1)
-#ifndef __riscv32
+#if __riscv_xlen >= 64
TEST_CASE( 66, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 0(x1); fcvt.lu.s x1, f1)
TEST_CASE( 67, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 4(x1); fcvt.lu.s x1, f1)
TEST_CASE( 68, x1, 0, la x1, tdat ; flw f1, 8(x1); fcvt.lu.s x1, f1)