diff options
author | Zack Weinberg <zackw@panix.com> | 2016-11-20 20:46:30 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2017-02-25 10:40:48 -0500 |
commit | 963394a22b38c4ec92b6875a6c06d3b15d5c0d21 (patch) | |
tree | 3d02e071beb2a4adcaf61727ae78485091413aae /sysdeps/ieee754 | |
parent | e15f7de60c26bb75fe1923b17c5f0461164d1a41 (diff) | |
download | glibc-963394a22b38c4ec92b6875a6c06d3b15d5c0d21.tar.gz |
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.
Diffstat (limited to 'sysdeps/ieee754')
-rw-r--r-- | sysdeps/ieee754/ldbl-128/math_ldbl.h | 44 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 37 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-96/math_ldbl.h | 40 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c | 2 |
7 files changed, 99 insertions, 30 deletions
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 <math_ldbl.h> directly; include <math_private.h> 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 + <http://www.gnu.org/licenses/>. */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include <stdint.h> +#include <endian.h> /* 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 <math_ldbl.h> directly; include <math_private.h> 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 + <http://www.gnu.org/licenses/>. */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 #include <ieee754.h> #include <stdint.h> @@ -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 <float.h> #include <math.h> -#include <math_private.h> +#include <math_ldbl.h> #include <stdbool.h> #include <stdio.h> 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 @@ <http://www.gnu.org/licenses/>. */ #include <math.h> -#include <math_private.h> +#include <math_ldbl.h> #include <stdbool.h> #include <stdio.h> 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 <math_ldbl.h> directly; include <math_private.h> 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 + <http://www.gnu.org/licenses/>. */ + +#ifndef _MATH_LDBL_H_ +#define _MATH_LDBL_H_ 1 + +#include <stdint.h> +#include <endian.h> /* 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 <float.h> #include <math.h> -#include <math_private.h> +#include <math_ldbl.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> 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 <float.h> #include <math.h> -#include <math_private.h> +#include <math_ldbl.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> |