Use NaN macros

diff --git a/isa/rv64ud/fadd.S b/isa/rv64ud/fadd.S
index 4a314da0d7d7edf668374351c8b0f5b7c6caa639..71e7f8249bcfe21ea45427cef210eea92ed2b7a9 100644 (file)
--- a/isa/rv64ud/fadd.S
+++ b/isa/rv64ud/fadd.S
@@ -30,7 +30,7 @@ RVTEST_CODE_BEGIN
   TEST_FP_OP2_D(10,  fmul.d, 1,      3.14159265e-8, 3.14159265, 0.00000001 );
 
   # Is the canonical NaN generated for Inf - Inf?
-  TEST_FP_OP2_D(11,  fsub.d, 0x10, 0d:7ff8000000000000, Inf, Inf);
+  TEST_FP_OP2_D(11,  fsub.d, 0x10, qNaN, Inf, Inf);
 
   TEST_PASSFAIL
 

diff --git a/isa/rv64ud/fcmp.S b/isa/rv64ud/fcmp.S
index 13bd39bc69d69b20b27169a0f612697b126697b1..39e6023a2b360da6b3c94dedbc3c2d29b65b4029 100644 (file)
--- a/isa/rv64ud/fcmp.S
+++ b/isa/rv64ud/fcmp.S
@@ -28,15 +28,15 @@ RVTEST_CODE_BEGIN
   # Only sNaN should signal invalid for feq.
   TEST_FP_CMP_OP_D( 8, feq.d, 0x00, 0, NaN, 0)
   TEST_FP_CMP_OP_D( 9, feq.d, 0x00, 0, NaN, NaN)
-  TEST_FP_CMP_OP_D(10, feq.d, 0x10, 0, 0d:7ff0000000000001, 0)
+  TEST_FP_CMP_OP_D(10, feq.d, 0x10, 0, sNaN, 0)
 
   # qNaN should signal invalid for fle/flt.
   TEST_FP_CMP_OP_D(11, flt.d, 0x10, 0, NaN, 0)
   TEST_FP_CMP_OP_D(12, flt.d, 0x10, 0, NaN, NaN)
-  TEST_FP_CMP_OP_D(13, flt.d, 0x10, 0, 0d:7ff0000000000001, 0)
+  TEST_FP_CMP_OP_D(13, flt.d, 0x10, 0, sNaN, 0)
   TEST_FP_CMP_OP_D(14, fle.d, 0x10, 0, NaN, 0)
   TEST_FP_CMP_OP_D(15, fle.d, 0x10, 0, NaN, NaN)
-  TEST_FP_CMP_OP_D(16, fle.d, 0x10, 0, 0d:7ff0000000000001, 0)
+  TEST_FP_CMP_OP_D(16, fle.d, 0x10, 0, sNaN, 0)
 
   TEST_PASSFAIL
 

diff --git a/isa/rv64uf/fadd.S b/isa/rv64uf/fadd.S
index 800dc8ceaeee70d938daf0eebab3b2f781e6667d..b6259df64af6fa98d171010561f3372192161b9a 100644 (file)
--- a/isa/rv64uf/fadd.S
+++ b/isa/rv64uf/fadd.S
@@ -30,7 +30,7 @@ RVTEST_CODE_BEGIN
   TEST_FP_OP2_S(10,  fmul.s, 1,      3.14159265e-8, 3.14159265, 0.00000001 );
 
   # Is the canonical NaN generated for Inf - Inf?
-  TEST_FP_OP2_S(11,  fsub.s, 0x10,         0f:7fc00000, Inf, Inf);
+  TEST_FP_OP2_S(11,  fsub.s, 0x10, qNaNf, Inf, Inf);
 
   TEST_PASSFAIL
 

diff --git a/isa/rv64uf/fcmp.S b/isa/rv64uf/fcmp.S
index e77ca527894ab8abebdd4eb2337803e07ddc6ad7..2d7fcc243e27689c6917ccce21660dae51b81eab 100644 (file)
--- a/isa/rv64uf/fcmp.S
+++ b/isa/rv64uf/fcmp.S
@@ -28,15 +28,15 @@ RVTEST_CODE_BEGIN
   # Only sNaN should signal invalid for feq.
   TEST_FP_CMP_OP_S( 8, feq.s, 0x00, 0, NaN, 0)
   TEST_FP_CMP_OP_S( 9, feq.s, 0x00, 0, NaN, NaN)
-  TEST_FP_CMP_OP_S(10, feq.s, 0x10, 0, 0f:7f800001, 0)
+  TEST_FP_CMP_OP_S(10, feq.s, 0x10, 0, sNaNf, 0)
 
   # qNaN should signal invalid for fle/flt.
   TEST_FP_CMP_OP_S(11, flt.s, 0x10, 0, NaN, 0)
   TEST_FP_CMP_OP_S(12, flt.s, 0x10, 0, NaN, NaN)
-  TEST_FP_CMP_OP_S(13, flt.s, 0x10, 0, 0f:7f800001, 0)
+  TEST_FP_CMP_OP_S(13, flt.s, 0x10, 0, sNaNf, 0)
   TEST_FP_CMP_OP_S(14, fle.s, 0x10, 0, NaN, 0)
   TEST_FP_CMP_OP_S(15, fle.s, 0x10, 0, NaN, NaN)
-  TEST_FP_CMP_OP_S(16, fle.s, 0x10, 0, 0f:7f800001, 0)
+  TEST_FP_CMP_OP_S(16, fle.s, 0x10, 0, sNaNf, 0)
 
   TEST_PASSFAIL