From 963394a22b38c4ec92b6875a6c06d3b15d5c0d21 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sun, 20 Nov 2016 20:46:30 -0500 Subject: Allow direct use of math_ldbl.h in testsuite. 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. --- sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 37 +++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'sysdeps/ieee754/ldbl-128ibm/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 */ -- cgit 1.4.1