From patchwork Wed Jul 1 22:05:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 39876 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 542D2386185D; Wed, 1 Jul 2020 22:06:06 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 08EB83857007 for ; Wed, 1 Jul 2020 22:06:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 08EB83857007 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=joseph_myers@mentor.com IronPort-SDR: 4FtINgmwy6KxQG0OkH6Rn+sUEmHXMXAJPUhOdBKfFi1BLzjnzuItZuUqF03twzopEMcQ2tABG6 jzbeFGPrIa+T7N4iyPMSOmM3MbYvWzd4404rHeHO1bFGxS9cLXGmFdi+22exN9yGZd8H2B2rxI IEXQPE48HBHHwSH6uBUGBbReMcr1kEkhU9LKRVAl7QmvoMTOPn93d6nT7t07AxkWRAe6U2BjGl JOnFop8HH6PQuNOyoa10M6LScclPkke4T3JiL3NZL6M7oVcrcfhulhyxppJZc+Rd2IcQKEDVxV 76Q= X-IronPort-AV: E=Sophos;i="5.75,301,1589270400"; d="scan'208";a="50522461" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 01 Jul 2020 14:06:01 -0800 IronPort-SDR: 1GdZB0vP/dZjpf3p/Q4agueY9KRkiVZTdRSv7HBfVG32PCQllPnoNamR11FSb2VIKkOmIdHzEj Eg7mT2hY73oVnjTnrTz6wcdY4icpZmIlRlEV9IfE2gZ+gxkA+045cfY/GFemjNmHhwK4qA5jVX O+SxjqWPTpbLIPMnLLKV/GUucqOxTRn+FttuqpJdoQrSP9XfjSNiy05UONCYNhZSielFMtKguw Tn00UdFZce8AxcJCQPce+BLLA8Z3cH70CTO6P8U3lpur/sIMvyj3xpVxNkJsqZzQailok5s3Au uTg= Date: Wed, 1 Jul 2020 22:05:56 +0000 From: Joseph Myers X-X-Sender: jsm28@digraph.polyomino.org.uk To: Subject: Use C2x return value from getpayload of non-NaN (bug 26073) Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) X-Spam-Status: No, score=-3134.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" In TS 18661-1, getpayload had an unspecified return value for a non-NaN argument, while C2x requires the return value -1 in that case. This patch implements the return value of -1. I don't think this is worth having a new symbol version that's an alias of the old one, although occasionally we do that in such cases where the new function semantics are a refinement of the old ones (to avoid programs relying on the new semantics running on older glibc versions but not behaving as intended). Tested for x86_64 and x86; also ran math/ tests for aarch64 and powerpc. Reviewed-by: Carlos O'Donell --- Carlos, is this OK at the current slush development stage? diff --git a/manual/arith.texi b/manual/arith.texi index 89c2c064f1..75eaf67fe7 100644 --- a/manual/arith.texi +++ b/manual/arith.texi @@ -1895,9 +1895,10 @@ propagated from NaN inputs to the result of a floating-point operation. These functions, defined by TS 18661-1:2014 and TS 18661-3:2015, return the payload of the NaN pointed to by @var{x} (returned as a positive integer, or positive zero, represented as a -floating-point number); if @var{x} is not a NaN, they return an -unspecified value. They raise no floating-point exceptions even for -signaling NaNs. +floating-point number); if @var{x} is not a NaN, they return +@minus{}1. They raise no floating-point exceptions even for signaling +NaNs. (The return value of @minus{}1 for an argument that is not a +NaN is specified in C2x; the value was unspecified in TS 18661.) @end deftypefun @deftypefun int setpayload (double *@var{x}, double @var{payload}) diff --git a/math/libm-test-getpayload.inc b/math/libm-test-getpayload.inc index bd660471aa..72e3c19d1e 100644 --- a/math/libm-test-getpayload.inc +++ b/math/libm-test-getpayload.inc @@ -20,17 +20,17 @@ static const struct test_f_f_data getpayload_test_data[] = { - TEST_fp_f (getpayload, plus_infty, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, minus_infty, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, plus_zero, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, minus_zero, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, 1000, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, max_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, -max_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, min_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, -min_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, min_subnorm_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), - TEST_fp_f (getpayload, -min_subnorm_value, IGNORE, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, plus_infty, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, minus_infty, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, plus_zero, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, minus_zero, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, 1000, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, max_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, -max_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, min_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, -min_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, min_subnorm_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_fp_f (getpayload, -min_subnorm_value, -1.0, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN TEST_fp_f (getpayload, snan_value_pl ("0x0"), plus_zero, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), TEST_fp_f (getpayload, -snan_value_pl ("0x0"), plus_zero, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), diff --git a/sysdeps/ieee754/dbl-64/s_getpayload.c b/sysdeps/ieee754/dbl-64/s_getpayload.c index 3ab89ddd66..5a055be35a 100644 --- a/sysdeps/ieee754/dbl-64/s_getpayload.c +++ b/sysdeps/ieee754/dbl-64/s_getpayload.c @@ -27,6 +27,9 @@ __getpayload (const double *x) { uint32_t hx, lx; EXTRACT_WORDS (hx, lx, *x); + if ((hx & 0x7ff00000) != 0x7ff00000 + || ((hx & 0xfffff) | lx) == 0) + return -1; hx &= 0x7ffff; uint64_t ix = ((uint64_t) hx << 32) | lx; if (FIX_INT_FP_CONVERT_ZERO && ix == 0) diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c index 2c887b93b7..eba96d0c77 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c @@ -26,6 +26,9 @@ __getpayload (const double *x) { uint64_t ix; EXTRACT_WORDS64 (ix, *x); + if ((ix & 0x7ff0000000000000ULL) != 0x7ff0000000000000ULL + || (ix & 0xfffffffffffffULL) == 0) + return -1; ix &= 0x7ffffffffffffULL; return (double) ix; } diff --git a/sysdeps/ieee754/flt-32/s_getpayloadf.c b/sysdeps/ieee754/flt-32/s_getpayloadf.c index e1d22473ff..1baad4847e 100644 --- a/sysdeps/ieee754/flt-32/s_getpayloadf.c +++ b/sysdeps/ieee754/flt-32/s_getpayloadf.c @@ -27,6 +27,9 @@ __getpayloadf (const float *x) { uint32_t ix; GET_FLOAT_WORD (ix, *x); + if ((ix & 0x7f800000) != 0x7f800000 + || (ix & 0x7fffff) == 0) + return -1; ix &= 0x3fffff; if (FIX_INT_FP_CONVERT_ZERO && ix == 0) return 0.0f; diff --git a/sysdeps/ieee754/ldbl-128/s_getpayloadl.c b/sysdeps/ieee754/ldbl-128/s_getpayloadl.c index db55a00f66..1fbe704608 100644 --- a/sysdeps/ieee754/ldbl-128/s_getpayloadl.c +++ b/sysdeps/ieee754/ldbl-128/s_getpayloadl.c @@ -26,6 +26,9 @@ __getpayloadl (const _Float128 *x) { uint64_t hx, lx; GET_LDOUBLE_WORDS64 (hx, lx, *x); + if ((hx & 0x7fff000000000000ULL) != 0x7fff000000000000ULL + || ((hx & 0xffffffffffffULL) | lx) == 0) + return -1; hx &= 0x7fffffffffffULL; /* Construct the representation of the return value directly, since 128-bit integers may not be available. */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_getpayloadl.c b/sysdeps/ieee754/ldbl-128ibm/s_getpayloadl.c index 3b5a1a8414..abbd694eea 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_getpayloadl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_getpayloadl.c @@ -27,6 +27,9 @@ __getpayloadl (const long double *x) double xhi = ldbl_high (*x); uint64_t ix; EXTRACT_WORDS64 (ix, xhi); + if ((ix & 0x7ff0000000000000ULL) != 0x7ff0000000000000ULL + || (ix & 0xfffffffffffffULL) == 0) + return -1; ix &= 0x7ffffffffffffULL; if (FIX_INT_FP_CONVERT_ZERO && ix == 0) return 0.0L; diff --git a/sysdeps/ieee754/ldbl-96/s_getpayloadl.c b/sysdeps/ieee754/ldbl-96/s_getpayloadl.c index 8f09cb74c8..761bd69b58 100644 --- a/sysdeps/ieee754/ldbl-96/s_getpayloadl.c +++ b/sysdeps/ieee754/ldbl-96/s_getpayloadl.c @@ -27,6 +27,9 @@ __getpayloadl (const long double *x) uint16_t se __attribute__ ((unused)); uint32_t hx, lx; GET_LDOUBLE_WORDS (se, hx, lx, *x); + if ((se & 0x7fff) != 0x7fff + || ((hx & 0x7fffffff) | lx) == 0) + return -1; hx &= 0x3fffffff; uint64_t ix = ((uint64_t) hx << 32) | lx; return (long double) ix;