From patchwork Sat Feb 25 15:45:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 732387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vVsl04tbrz9s7v for ; Sun, 26 Feb 2017 02:46:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="k4UcyV1Q"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=o3K3leqSB6+PIFbz2nHwh10OO4YkFygbknncM+U/xU1T7O9NUzQSv +gO3pc3etWUsMIUMsHv0XBjGWoIMTk60eTO2v2ytTOsK9MJA6KmF1P7uSE4d/dPG B/JF1upuIqnpUvDoZ0B0Pjr0Neq7tA2UWFbvE41tZxOAYEzylNQW0E= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=0wdyUDkj0QdDWJNVxrWUAxgcalg=; b=k4UcyV1QVYUpGrdzhPRDdHzrL4tL BCId64/Tuez/v+HtnF/EzPrqB104MVzwlNVOdYSYJhwAMUql66jW1CIKhvW/pMl9 qQnY9WBCOqOICxoMG3iJaTA+VZ92PrSVgOhSTcyyxt3pNTM9wf2N0hEgMD6IvtJl VrlUVljU5Z9F/18= Received: (qmail 99218 invoked by alias); 25 Feb 2017 15:45:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 98770 invoked by uid 89); 25 Feb 2017 15:45:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=773, 1422, 963 X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH 3/3] Allow direct use of math_ldbl.h in testsuite. Date: Sat, 25 Feb 2017 10:45:21 -0500 Message-Id: <20170225154521.21953-4-zackw@panix.com> In-Reply-To: <20170225154521.21953-3-zackw@panix.com> References: <20170225154521.21953-1-zackw@panix.com> <20170225154521.21953-2-zackw@panix.com> <20170225154521.21953-3-zackw@panix.com> MIME-Version: 1.0 A few 'long double'-related tests include math_private.h just for their variety of math_ldbl.h, which contains macros for assembling and disassembling the binary representation of 'long double'. math_ldbl.h insists on being included from math_private.h, but if we relax this restriction (and fix some portability sloppiness) we can use it directly and not have to expose all of math_private.h to the testsuite. * sysdeps/generic/math_private.h: Use __BIG_ENDIAN and __LITTLE_ENDIAN, not BIG_ENDIAN and LITTLE_ENDIAN. * sysdeps/generic/math_ldbl.h * sysdeps/ia64/fpu/math_ldbl.h * sysdeps/ieee754/ldbl-128/math_ldbl.h * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h * sysdeps/ieee754/ldbl-96/math_ldbl.h * sysdeps/powerpc/fpu/math_ldbl.h * sysdeps/x86_64/fpu/math_ldbl.h: Allow direct inclusion. Use uintNN_t instead of u_intNN_t. Use __BIG_ENDIAN and __LITTLE_ENDIAN, not BIG_ENDIAN and LITTLE_ENDIAN. Include endian.h and/or stdint.h if necessary. Add copyright notices. * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h (ldbl_canonicalize_int): Don't use EXTRACT_WORDS64. * sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c * sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c * sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c * sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c: Include math_ldbl.h, not math_private.h. --- ChangeLog | 26 +++++++++++++ sysdeps/generic/math_ldbl.h | 10 +++-- sysdeps/generic/math_private.h | 4 +- sysdeps/ia64/fpu/math_ldbl.h | 40 +++++++++++++++----- sysdeps/ieee754/ldbl-128/math_ldbl.h | 44 ++++++++++++++++------ sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 37 +++++++++++++++--- .../ldbl-128ibm/test-canonical-ldbl-128ibm.c | 2 +- .../ldbl-128ibm/test-totalorderl-ldbl-128ibm.c | 2 +- sysdeps/ieee754/ldbl-96/math_ldbl.h | 40 +++++++++++++++----- sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c | 2 +- sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c | 2 +- sysdeps/powerpc/fpu/math_ldbl.h | 25 ++++++++++-- sysdeps/x86_64/fpu/math_ldbl.h | 31 ++++++++++++--- 13 files changed, 212 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2bc03ebe1..eeccfed101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,31 @@ 2017-02-25 Zack Weinberg + * sysdeps/generic/math_private.h: Use __BIG_ENDIAN and + __LITTLE_ENDIAN, not BIG_ENDIAN and LITTLE_ENDIAN. + + * sysdeps/generic/math_ldbl.h + * sysdeps/ia64/fpu/math_ldbl.h + * sysdeps/ieee754/ldbl-128/math_ldbl.h + * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h + * sysdeps/ieee754/ldbl-96/math_ldbl.h + * sysdeps/powerpc/fpu/math_ldbl.h + * sysdeps/x86_64/fpu/math_ldbl.h: + Allow direct inclusion. Use uintNN_t instead of u_intNN_t. + Use __BIG_ENDIAN and __LITTLE_ENDIAN, not BIG_ENDIAN and + LITTLE_ENDIAN. Include endian.h and/or stdint.h if necessary. + Add copyright notices. + + * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h (ldbl_canonicalize_int): + Don't use EXTRACT_WORDS64. + + * sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c + * sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c + * sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c + * sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c: + Include math_ldbl.h, not math_private.h. + +2017-02-25 Zack Weinberg + * include/libc-diag.h: New file. Define ignore_value, DIAG_PUSH_NEEDS_COMMENT, DIAG_POP_NEEDS_COMMENT, DIAG_IGNORE_NEEDS_COMMENT, and DIAG_IGNORE_Os_NEEDS_COMMENT here. diff --git a/sysdeps/generic/math_ldbl.h b/sysdeps/generic/math_ldbl.h index f0b97ef8f9..4e7ee7912e 100644 --- a/sysdeps/generic/math_ldbl.h +++ b/sysdeps/generic/math_ldbl.h @@ -1,5 +1,7 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 -/* This is empty. Any machine using long double type will override this header. */ +/* Any machine with a 'long double' distinct from 'double' must + override this header. */ + +#endif diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h index c0d4e3dbcd..be65b9487b 100644 --- a/sysdeps/generic/math_private.h +++ b/sysdeps/generic/math_private.h @@ -37,7 +37,7 @@ /* A union which permits us to convert between a double and two 32 bit ints. */ -#if __FLOAT_WORD_ORDER == BIG_ENDIAN +#if __FLOAT_WORD_ORDER == __BIG_ENDIAN typedef union { @@ -52,7 +52,7 @@ typedef union #endif -#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN +#if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN typedef union { diff --git a/sysdeps/ia64/fpu/math_ldbl.h b/sysdeps/ia64/fpu/math_ldbl.h index 475ca795fa..5dd9c350a1 100644 --- a/sysdeps/ia64/fpu/math_ldbl.h +++ b/sysdeps/ia64/fpu/math_ldbl.h @@ -1,11 +1,31 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 2000-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include +#include /* A union which permits us to convert between a long double and three 32 bit ints. */ -#if __FLOAT_WORD_ORDER == BIG_ENDIAN +#if __FLOAT_WORD_ORDER == __BIG_ENDIAN typedef union { @@ -15,22 +35,22 @@ typedef union unsigned int empty0:32; int sign_exponent:16; unsigned int empty1:16; - u_int32_t msw; - u_int32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_long_double_shape_type; #endif -#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN +#if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN typedef union { long double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; int sign_exponent:16; unsigned int empty1:16; unsigned int empty0:32; @@ -98,3 +118,5 @@ do { \ se_u.parts.sign_exponent = (exp); \ (d) = se_u.value; \ } while (0) + +#endif /* math_ldbl.h */ diff --git a/sysdeps/ieee754/ldbl-128/math_ldbl.h b/sysdeps/ieee754/ldbl-128/math_ldbl.h index c1980c9401..bb5cce2a36 100644 --- a/sysdeps/ieee754/ldbl-128/math_ldbl.h +++ b/sysdeps/ieee754/ldbl-128/math_ldbl.h @@ -1,41 +1,61 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 1999-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include +#include /* A union which permits us to convert between a long double and four 32 bit ints or two 64 bit ints. */ -#if __FLOAT_WORD_ORDER == BIG_ENDIAN +#if __FLOAT_WORD_ORDER == __BIG_ENDIAN typedef union { long double value; struct { - u_int64_t msw; - u_int64_t lsw; + uint64_t msw; + uint64_t lsw; } parts64; struct { - u_int32_t w0, w1, w2, w3; + uint32_t w0, w1, w2, w3; } parts32; } ieee854_long_double_shape_type; #endif -#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN +#if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN typedef union { long double value; struct { - u_int64_t lsw; - u_int64_t msw; + uint64_t lsw; + uint64_t msw; } parts64; struct { - u_int32_t w3, w2, w1, w0; + uint32_t w3, w2, w1, w0; } parts32; } ieee854_long_double_shape_type; @@ -96,3 +116,5 @@ do { \ */ #define _Float128 long double #define L(x) x##L + +#endif /* math_ldbl.h */ diff --git a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h index 625ce00e13..8f2984e924 100644 --- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h +++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h @@ -1,6 +1,23 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 2006-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 #include #include @@ -239,9 +256,15 @@ ldbl_nearbyint (double a) static inline void ldbl_canonicalize_int (double *a, double *aa) { - int64_t ax, aax; - EXTRACT_WORDS64 (ax, *a); - EXTRACT_WORDS64 (aax, *aa); + /* Previously we used EXTRACT_WORDS64 from math_private.h, but in order + to avoid including internal headers we duplicate that code here. */ + uint64_t ax, aax; + union { double value; uint64_t word; } extractor; + extractor.value = *a; + ax = extractor.word; + extractor.value = *aa; + aax = extractor.word; + int expdiff = ((ax >> 52) & 0x7ff) - ((aax >> 52) & 0x7ff); if (expdiff <= 53) { @@ -263,3 +286,5 @@ ldbl_canonicalize_int (double *a, double *aa) } } } + +#endif /* math_ldbl.h */ diff --git a/sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c b/sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c index 8be4499bd5..75735db18e 100644 --- a/sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c +++ b/sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c b/sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c index 86869aceda..eaada2f848 100644 --- a/sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c +++ b/sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c @@ -17,7 +17,7 @@ . */ #include -#include +#include #include #include diff --git a/sysdeps/ieee754/ldbl-96/math_ldbl.h b/sysdeps/ieee754/ldbl-96/math_ldbl.h index cca30657ce..ef897065b7 100644 --- a/sysdeps/ieee754/ldbl-96/math_ldbl.h +++ b/sysdeps/ieee754/ldbl-96/math_ldbl.h @@ -1,11 +1,31 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 1999-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include +#include /* A union which permits us to convert between a long double and three 32 bit ints. */ -#if __FLOAT_WORD_ORDER == BIG_ENDIAN +#if __FLOAT_WORD_ORDER == __BIG_ENDIAN typedef union { @@ -14,22 +34,22 @@ typedef union { int sign_exponent:16; unsigned int empty:16; - u_int32_t msw; - u_int32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_long_double_shape_type; #endif -#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN +#if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN typedef union { long double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; int sign_exponent:16; unsigned int empty:16; } parts; @@ -96,3 +116,5 @@ do { \ se_u.parts.sign_exponent = (exp); \ (d) = se_u.value; \ } while (0) + +#endif /* math_ldbl.h */ diff --git a/sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c b/sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c index db9db04367..3254097754 100644 --- a/sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c +++ b/sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c b/sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c index eb21956e4f..4e01f15aa9 100644 --- a/sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c +++ b/sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/sysdeps/powerpc/fpu/math_ldbl.h b/sysdeps/powerpc/fpu/math_ldbl.h index 36378c0239..05f51217bf 100644 --- a/sysdeps/powerpc/fpu/math_ldbl.h +++ b/sysdeps/powerpc/fpu/math_ldbl.h @@ -1,6 +1,23 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 2006-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_PPC_ +#define _MATH_LDBL_H_PPC_ 1 /* GCC does not optimize the default ldbl_pack code to not spill register in the stack. The following optimization tells gcc that pack/unpack @@ -34,3 +51,5 @@ ldbl_unpack_ppc (long double l, double *a, double *aa) #define ldbl_unpack ldbl_unpack_ppc #include + +#endif /* math_ldbl.h */ diff --git a/sysdeps/x86_64/fpu/math_ldbl.h b/sysdeps/x86_64/fpu/math_ldbl.h index b9ff8dadaf..6c5bc13455 100644 --- a/sysdeps/x86_64/fpu/math_ldbl.h +++ b/sysdeps/x86_64/fpu/math_ldbl.h @@ -1,6 +1,25 @@ -#ifndef _MATH_PRIVATE_H_ -#error "Never use directly; include instead." -#endif +/* Manipulation of the bit representation of 'long double' quantities. + Copyright (C) 2001-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include /* A union which permits us to convert between a long double and three 32 bit ints. */ @@ -10,8 +29,8 @@ typedef union long double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; int sign_exponent:16; unsigned int empty1:16; unsigned int empty0:32; @@ -77,3 +96,5 @@ do { \ se_u.parts.sign_exponent = (exp); \ (d) = se_u.value; \ } while (0) + +#endif /* math_ldbl.h */