From c9022d2f63f50388b2ab1192966f30dbe7819a59 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 1 Mar 2016 16:32:25 -0800 Subject: [PATCH] Negative float -> unsigned int conversions return 0 --- isa/rv64uf/fcvt_w.S | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/isa/rv64uf/fcvt_w.S b/isa/rv64uf/fcvt_w.S index e9744b2..7b78eec 100644 --- a/isa/rv64uf/fcvt_w.S +++ b/isa/rv64uf/fcvt_w.S @@ -26,13 +26,13 @@ RVTEST_CODE_BEGIN TEST_FP_INT_OP_S( 8, fcvt.w.s, 0x10, -1<<31, -3e9, rtz); TEST_FP_INT_OP_S( 9, fcvt.w.s, 0x10, (1<<31)-1, 3e9, rtz); - TEST_FP_INT_OP_S(12, fcvt.wu.s, 0x10, -1, -3.0, rtz); - TEST_FP_INT_OP_S(13, fcvt.wu.s, 0x10, -1, -1.0, rtz); + TEST_FP_INT_OP_S(12, fcvt.wu.s, 0x10, 0, -3.0, rtz); + TEST_FP_INT_OP_S(13, fcvt.wu.s, 0x10, 0, -1.0, rtz); TEST_FP_INT_OP_S(14, fcvt.wu.s, 0x01, 0, -0.9, rtz); TEST_FP_INT_OP_S(15, fcvt.wu.s, 0x01, 0, 0.9, rtz); TEST_FP_INT_OP_S(16, fcvt.wu.s, 0x00, 1, 1.0, rtz); TEST_FP_INT_OP_S(17, fcvt.wu.s, 0x01, 1, 1.1, rtz); - TEST_FP_INT_OP_S(18, fcvt.wu.s, 0x10, -1, -3e9, rtz); + 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); TEST_FP_INT_OP_S(22, fcvt.l.s, 0x01, -1, -1.1, rtz); @@ -42,13 +42,13 @@ RVTEST_CODE_BEGIN TEST_FP_INT_OP_S(26, fcvt.l.s, 0x00, 1, 1.0, rtz); TEST_FP_INT_OP_S(27, fcvt.l.s, 0x01, 1, 1.1, rtz); - TEST_FP_INT_OP_S(32, fcvt.lu.s, 0x10, -1, -3.0, rtz); - TEST_FP_INT_OP_S(33, fcvt.lu.s, 0x10, -1, -1.0, rtz); + TEST_FP_INT_OP_S(32, fcvt.lu.s, 0x10, 0, -3.0, rtz); + TEST_FP_INT_OP_S(33, fcvt.lu.s, 0x10, 0, -1.0, rtz); TEST_FP_INT_OP_S(34, fcvt.lu.s, 0x01, 0, -0.9, rtz); TEST_FP_INT_OP_S(35, fcvt.lu.s, 0x01, 0, 0.9, rtz); TEST_FP_INT_OP_S(36, fcvt.lu.s, 0x00, 1, 1.0, rtz); TEST_FP_INT_OP_S(37, fcvt.lu.s, 0x01, 1, 1.1, rtz); - TEST_FP_INT_OP_S(38, fcvt.lu.s, 0x10, -1, -3e9, rtz); + TEST_FP_INT_OP_S(38, fcvt.lu.s, 0x10, 0, -3e9, rtz); TEST_FP_INT_OP_D(42, fcvt.w.d, 0x01, -1, -1.1, rtz); TEST_FP_INT_OP_D(43, fcvt.w.d, 0x00, -1, -1.0, rtz); @@ -59,13 +59,13 @@ RVTEST_CODE_BEGIN TEST_FP_INT_OP_D(48, fcvt.w.d, 0x10, -1<<31, -3e9, rtz); TEST_FP_INT_OP_D(49, fcvt.w.d, 0x10, (1<<31)-1, 3e9, rtz); - TEST_FP_INT_OP_D(52, fcvt.wu.d, 0x10, -1, -3.0, rtz); - TEST_FP_INT_OP_D(53, fcvt.wu.d, 0x10, -1, -1.0, rtz); + TEST_FP_INT_OP_D(52, fcvt.wu.d, 0x10, 0, -3.0, rtz); + TEST_FP_INT_OP_D(53, fcvt.wu.d, 0x10, 0, -1.0, rtz); TEST_FP_INT_OP_D(54, fcvt.wu.d, 0x01, 0, -0.9, rtz); TEST_FP_INT_OP_D(55, fcvt.wu.d, 0x01, 0, 0.9, rtz); TEST_FP_INT_OP_D(56, fcvt.wu.d, 0x00, 1, 1.0, rtz); TEST_FP_INT_OP_D(57, fcvt.wu.d, 0x01, 1, 1.1, rtz); - TEST_FP_INT_OP_D(58, fcvt.wu.d, 0x10, -1, -3e9, rtz); + TEST_FP_INT_OP_D(58, fcvt.wu.d, 0x10, 0, -3e9, rtz); TEST_FP_INT_OP_D(59, fcvt.wu.d, 0x00, 0xffffffffb2d05e00, 3e9, rtz); TEST_FP_INT_OP_D(62, fcvt.l.d, 0x01, -1, -1.1, rtz); @@ -79,13 +79,13 @@ RVTEST_CODE_BEGIN TEST_FP_INT_OP_D(60, fcvt.l.d, 0x10, -1<<63,-3e19, rtz); TEST_FP_INT_OP_D(61, fcvt.l.d, 0x10, (1<<63)-1, 3e19, rtz); - TEST_FP_INT_OP_D(72, fcvt.lu.d, 0x10, -1, -3.0, rtz); - TEST_FP_INT_OP_D(73, fcvt.lu.d, 0x10, -1, -1.0, rtz); + TEST_FP_INT_OP_D(72, fcvt.lu.d, 0x10, 0, -3.0, rtz); + TEST_FP_INT_OP_D(73, fcvt.lu.d, 0x10, 0, -1.0, rtz); TEST_FP_INT_OP_D(74, fcvt.lu.d, 0x01, 0, -0.9, rtz); TEST_FP_INT_OP_D(75, fcvt.lu.d, 0x01, 0, 0.9, rtz); TEST_FP_INT_OP_D(76, fcvt.lu.d, 0x00, 1, 1.0, rtz); TEST_FP_INT_OP_D(77, fcvt.lu.d, 0x01, 1, 1.1, rtz); - TEST_FP_INT_OP_D(78, fcvt.lu.d, 0x10, -1, -3e9, rtz); + TEST_FP_INT_OP_D(78, fcvt.lu.d, 0x10, 0, -3e9, rtz); TEST_FP_INT_OP_D(79, fcvt.lu.d, 0x00, 3000000000, 3e9, rtz); # test negative NaN, negative infinity conversion @@ -110,23 +110,23 @@ RVTEST_CODE_BEGIN TEST_CASE( 94, x1, 0x000000007fffffff, la x1, tdat_d; fld f1, 24(x1); fcvt.w.d x1, f1) TEST_CASE( 95, x1, 0x7fffffffffffffff, la x1, tdat_d; fld f1, 24(x1); fcvt.l.d x1, f1) - # test NaN, infinity conversions to unsigned integer (always return MaxUInt) + # test NaN, infinity conversions to unsigned integer TEST_CASE( 96, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 0(x1); fcvt.wu.s x1, f1) TEST_CASE( 97, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 4(x1); fcvt.wu.s x1, f1) - TEST_CASE( 98, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 8(x1); fcvt.wu.s x1, f1) + TEST_CASE( 98, x1, 0, la x1, tdat ; flw f1, 8(x1); fcvt.wu.s x1, f1) TEST_CASE( 99, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 12(x1); fcvt.wu.s x1, f1) TEST_CASE(100, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 0(x1); fcvt.lu.s x1, f1) TEST_CASE(101, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 4(x1); fcvt.lu.s x1, f1) - TEST_CASE(102, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 8(x1); fcvt.lu.s x1, f1) + TEST_CASE(102, x1, 0, la x1, tdat ; flw f1, 8(x1); fcvt.lu.s x1, f1) TEST_CASE(103, x1, 0xffffffffffffffff, la x1, tdat ; flw f1, 12(x1); fcvt.lu.s x1, f1) TEST_CASE(104, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 0(x1); fcvt.wu.d x1, f1) TEST_CASE(105, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 8(x1); fcvt.wu.d x1, f1) - TEST_CASE(106, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 16(x1); fcvt.wu.d x1, f1) + TEST_CASE(106, x1, 0, la x1, tdat_d; fld f1, 16(x1); fcvt.wu.d x1, f1) TEST_CASE(107, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 24(x1); fcvt.wu.d x1, f1) TEST_CASE(108, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 0(x1); fcvt.lu.d x1, f1) TEST_CASE(109, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 8(x1); fcvt.lu.d x1, f1) - TEST_CASE(110, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 16(x1); fcvt.lu.d x1, f1) + TEST_CASE(110, x1, 0, la x1, tdat_d; fld f1, 16(x1); fcvt.lu.d x1, f1) TEST_CASE(111, x1, 0xffffffffffffffff, la x1, tdat_d; fld f1, 24(x1); fcvt.lu.d x1, f1) TEST_PASSFAIL -- 2.30.2