system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow direct use of math_ldbl.h in testsuite.

Browse Source 
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.
This commit is contained in:
Zack Weinberg 2016-11-20 20:46:30 -05:00
parent e15f7de60c
commit 963394a22b
13 changed files with 212 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2017-02-25 Zack Weinberg <zackw@panix.com>
* 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 <zackw@panix.com> 2017-02-25 Zack Weinberg <zackw@panix.com>
* include/libc-diag.h: New file. Define ignore_value, * include/libc-diag.h: New file. Define ignore_value,

10
sysdeps/generic/math_ldbl.h
View File

@ -1,5 +1,7 @@
#ifndef _MATH_PRIVATE_H_ #ifndef _MATH_LDBL_H_
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." #define _MATH_LDBL_H_ 1
#endif
/* 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

4
sysdeps/generic/math_private.h
View File

@ -37,7 +37,7 @@
/* A union which permits us to convert between a double and two 32 bit /* A union which permits us to convert between a double and two 32 bit
ints. */ ints. */
#if __FLOAT_WORD_ORDER == BIG_ENDIAN #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
typedef union typedef union
{ {
@ -52,7 +52,7 @@ typedef union
#endif #endif
#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN #if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN
typedef union typedef union
{ {

40
sysdeps/ia64/fpu/math_ldbl.h
View File

@ -1,11 +1,31 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 2000-2017 Free Software Foundation, Inc.
#endif 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 /* A union which permits us to convert between a long double and
three 32 bit ints. */ three 32 bit ints. */
#if __FLOAT_WORD_ORDER == BIG_ENDIAN #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
typedef union typedef union
{ {
@ -15,22 +35,22 @@ typedef union
unsigned int empty0:32; unsigned int empty0:32;
int sign_exponent:16; int sign_exponent:16;
unsigned int empty1:16; unsigned int empty1:16;
u_int32_t msw; uint32_t msw;
u_int32_t lsw; uint32_t lsw;
} parts; } parts;
} ieee_long_double_shape_type; } ieee_long_double_shape_type;
#endif #endif
#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN #if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN
typedef union typedef union
{ {
long double value; long double value;
struct struct
{ {
u_int32_t lsw; uint32_t lsw;
u_int32_t msw; uint32_t msw;
int sign_exponent:16; int sign_exponent:16;
unsigned int empty1:16; unsigned int empty1:16;
unsigned int empty0:32; unsigned int empty0:32;
@ -98,3 +118,5 @@ do { \
se_u.parts.sign_exponent = (exp); \ se_u.parts.sign_exponent = (exp); \
(d) = se_u.value; \ (d) = se_u.value; \
} while (0) } while (0)
#endif /* math_ldbl.h */

44
sysdeps/ieee754/ldbl-128/math_ldbl.h
View File

@ -1,41 +1,61 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 1999-2017 Free Software Foundation, Inc.
#endif 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 /* A union which permits us to convert between a long double and
four 32 bit ints or two 64 bit ints. */ four 32 bit ints or two 64 bit ints. */
#if __FLOAT_WORD_ORDER == BIG_ENDIAN #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
typedef union typedef union
{ {
long double value; long double value;
struct struct
{ {
u_int64_t msw; uint64_t msw;
u_int64_t lsw; uint64_t lsw;
} parts64; } parts64;
struct struct
{ {
u_int32_t w0, w1, w2, w3; uint32_t w0, w1, w2, w3;
} parts32; } parts32;
} ieee854_long_double_shape_type; } ieee854_long_double_shape_type;
#endif #endif
#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN #if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN
typedef union typedef union
{ {
long double value; long double value;
struct struct
{ {
u_int64_t lsw; uint64_t lsw;
u_int64_t msw; uint64_t msw;
} parts64; } parts64;
struct struct
{ {
u_int32_t w3, w2, w1, w0; uint32_t w3, w2, w1, w0;
} parts32; } parts32;
} ieee854_long_double_shape_type; } ieee854_long_double_shape_type;
@ -96,3 +116,5 @@ do { \
*/ */
#define _Float128 long double #define _Float128 long double
#define L(x) x##L #define L(x) x##L
#endif /* math_ldbl.h */

37
sysdeps/ieee754/ldbl-128ibm/math_ldbl.h
View File

@ -1,6 +1,23 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 2006-2017 Free Software Foundation, Inc.
#endif 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 <ieee754.h>
#include <stdint.h> #include <stdint.h>
@ -239,9 +256,15 @@ ldbl_nearbyint (double a)
static inline void static inline void
ldbl_canonicalize_int (double *a, double *aa) ldbl_canonicalize_int (double *a, double *aa)
{ {
int64_t ax, aax; /* Previously we used EXTRACT_WORDS64 from math_private.h, but in order
EXTRACT_WORDS64 (ax, *a); to avoid including internal headers we duplicate that code here. */
EXTRACT_WORDS64 (aax, *aa); 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); int expdiff = ((ax >> 52) & 0x7ff) - ((aax >> 52) & 0x7ff);
if (expdiff <= 53) if (expdiff <= 53)
{ {
@ -263,3 +286,5 @@ ldbl_canonicalize_int (double *a, double *aa)
} }
} }
} }
#endif /* math_ldbl.h */

2
sysdeps/ieee754/ldbl-128ibm/test-canonical-ldbl-128ibm.c
View File

@ -18,7 +18,7 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <math_private.h> #include <math_ldbl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>

2
sysdeps/ieee754/ldbl-128ibm/test-totalorderl-ldbl-128ibm.c
View File

@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <math.h> #include <math.h>
#include <math_private.h> #include <math_ldbl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>

40
sysdeps/ieee754/ldbl-96/math_ldbl.h
View File

@ -1,11 +1,31 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 1999-2017 Free Software Foundation, Inc.
#endif 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 /* A union which permits us to convert between a long double and
three 32 bit ints. */ three 32 bit ints. */
#if __FLOAT_WORD_ORDER == BIG_ENDIAN #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
typedef union typedef union
{ {
@ -14,22 +34,22 @@ typedef union
{ {
int sign_exponent:16; int sign_exponent:16;
unsigned int empty:16; unsigned int empty:16;
u_int32_t msw; uint32_t msw;
u_int32_t lsw; uint32_t lsw;
} parts; } parts;
} ieee_long_double_shape_type; } ieee_long_double_shape_type;
#endif #endif
#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN #if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN
typedef union typedef union
{ {
long double value; long double value;
struct struct
{ {
u_int32_t lsw; uint32_t lsw;
u_int32_t msw; uint32_t msw;
int sign_exponent:16; int sign_exponent:16;
unsigned int empty:16; unsigned int empty:16;
} parts; } parts;
@ -96,3 +116,5 @@ do { \
se_u.parts.sign_exponent = (exp); \ se_u.parts.sign_exponent = (exp); \
(d) = se_u.value; \ (d) = se_u.value; \
} while (0) } while (0)
#endif /* math_ldbl.h */

2
sysdeps/ieee754/ldbl-96/test-canonical-ldbl-96.c
View File

@ -18,7 +18,7 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <math_private.h> #include <math_ldbl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>

2
sysdeps/ieee754/ldbl-96/test-totalorderl-ldbl-96.c
View File

@ -18,7 +18,7 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <math_private.h> #include <math_ldbl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>

25
sysdeps/powerpc/fpu/math_ldbl.h
View File

@ -1,6 +1,23 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 2006-2017 Free Software Foundation, Inc.
#endif 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_PPC_
#define _MATH_LDBL_H_PPC_ 1
/* GCC does not optimize the default ldbl_pack code to not spill register /* GCC does not optimize the default ldbl_pack code to not spill register
in the stack. The following optimization tells gcc that pack/unpack 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 #define ldbl_unpack ldbl_unpack_ppc
#include <sysdeps/ieee754/ldbl-128ibm/math_ldbl.h> #include <sysdeps/ieee754/ldbl-128ibm/math_ldbl.h>
#endif /* math_ldbl.h */

31
sysdeps/x86_64/fpu/math_ldbl.h
View File

@ -1,6 +1,25 @@
#ifndef _MATH_PRIVATE_H_ /* Manipulation of the bit representation of 'long double' quantities.
#error "Never use <math_ldbl.h> directly; include <math_private.h> instead." Copyright (C) 2001-2017 Free Software Foundation, Inc.
#endif 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>
/* A union which permits us to convert between a long double and /* A union which permits us to convert between a long double and
three 32 bit ints. */ three 32 bit ints. */
@ -10,8 +29,8 @@ typedef union
long double value; long double value;
struct struct
{ {
u_int32_t lsw; uint32_t lsw;
u_int32_t msw; uint32_t msw;
int sign_exponent:16; int sign_exponent:16;
unsigned int empty1:16; unsigned int empty1:16;
unsigned int empty0:32; unsigned int empty0:32;
@ -77,3 +96,5 @@ do { \
se_u.parts.sign_exponent = (exp); \ se_u.parts.sign_exponent = (exp); \
(d) = se_u.value; \ (d) = se_u.value; \
} while (0) } while (0)
#endif /* math_ldbl.h */