mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-05 03:01:05 +00:00
b4d5b8b021
This patch continues the math_private.h cleanup by stopping math_private.h from including math-barriers.h and making the users of the barrier macros include the latter header directly. No attempt is made to remove any math_private.h includes that are now unused, except in strtod_l.c where that is done to avoid line number changes in assertions, so that installed stripped shared libraries can be compared before and after the patch. (I think the floating-point environment support in math_private.h should also move out - some architectures already have fenv_private.h as an architecture-internal header included from their math_private.h - and after moving that out might be a better time to identify unused math_private.h includes.) Tested for x86_64 and x86, and tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by the patch. * sysdeps/generic/math_private.h: Do not include <math-barriers.h>. * stdlib/strtod_l.c: Include <math-barriers.h> instead of <math_private.h>. * math/fromfp.h: Include <math-barriers.h>. * math/math-narrow.h: Likewise. * math/s_nextafter.c: Likewise. * math/s_nexttowardf.c: Likewise. * sysdeps/aarch64/fpu/s_llrint.c: Likewise. * sysdeps/aarch64/fpu/s_llrintf.c: Likewise. * sysdeps/aarch64/fpu/s_lrint.c: Likewise. * sysdeps/aarch64/fpu/s_lrintf.c: Likewise. * sysdeps/i386/fpu/s_nextafterl.c: Likewise. * sysdeps/i386/fpu/s_nexttoward.c: Likewise. * sysdeps/i386/fpu/s_nexttowardf.c: Likewise. * sysdeps/ieee754/dbl-64/e_atan2.c: Likewise. * sysdeps/ieee754/dbl-64/e_atanh.c: Likewise. * sysdeps/ieee754/dbl-64/e_exp.c: Likewise. * sysdeps/ieee754/dbl-64/e_exp2.c: Likewise. * sysdeps/ieee754/dbl-64/e_j0.c: Likewise. * sysdeps/ieee754/dbl-64/e_sqrt.c: Likewise. * sysdeps/ieee754/dbl-64/s_expm1.c: Likewise. * sysdeps/ieee754/dbl-64/s_fma.c: Likewise. * sysdeps/ieee754/dbl-64/s_fmaf.c: Likewise. * sysdeps/ieee754/dbl-64/s_log1p.c: Likewise. * sysdeps/ieee754/dbl-64/s_nearbyint.c: Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c: Likewise. * sysdeps/ieee754/flt-32/e_atanhf.c: Likewise. * sysdeps/ieee754/flt-32/e_j0f.c: Likewise. * sysdeps/ieee754/flt-32/s_expm1f.c: Likewise. * sysdeps/ieee754/flt-32/s_log1pf.c: Likewise. * sysdeps/ieee754/flt-32/s_nearbyintf.c: Likewise. * sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise. * sysdeps/ieee754/k_standardl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_asinl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_expl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_powl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nearbyintl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nextafterl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/e_asinl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. * sysdeps/ieee754/ldbl-96/e_atanhl.c: Likewise. * sysdeps/ieee754/ldbl-96/e_j0l.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fma.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-96/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-96/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_nextafterl.c: Likewise.
110 lines
2.7 KiB
C
110 lines
2.7 KiB
C
/* s_nextafterl.c -- long double version of s_nextafter.c.
|
|
* Conversion to long double by Ulrich Drepper,
|
|
* Cygnus Support, drepper@cygnus.com.
|
|
* Fixed for m68k by Andreas Schwab <schwab@suse.de>.
|
|
*/
|
|
|
|
/*
|
|
* ====================================================
|
|
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
|
|
*
|
|
* Developed at SunPro, a Sun Microsystems, Inc. business.
|
|
* Permission to use, copy, modify, and distribute this
|
|
* software is freely granted, provided that this notice
|
|
* is preserved.
|
|
* ====================================================
|
|
*/
|
|
|
|
#if defined(LIBM_SCCS) && !defined(lint)
|
|
static char rcsid[] = "$NetBSD: $";
|
|
#endif
|
|
|
|
/* IEEE functions
|
|
* nextafterl(x,y)
|
|
* return the next machine floating-point number of x in the
|
|
* direction toward y.
|
|
* Special cases:
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <math.h>
|
|
#include <math-barriers.h>
|
|
#include <math_private.h>
|
|
|
|
long double __nextafterl(long double x, long double y)
|
|
{
|
|
int32_t ix,iy,esx,esy;
|
|
uint32_t hx,hy,lx,ly;
|
|
|
|
GET_LDOUBLE_WORDS(esx,hx,lx,x);
|
|
GET_LDOUBLE_WORDS(esy,hy,ly,y);
|
|
ix = esx&0x7fff; /* |x| */
|
|
iy = esy&0x7fff; /* |y| */
|
|
|
|
if(((ix==0x7fff)&&((hx&0x7fffffff)|lx)!=0) || /* x is nan */
|
|
((iy==0x7fff)&&((hy&0x7fffffff)|ly)!=0)) /* y is nan */
|
|
return x+y;
|
|
if(x==y) return y; /* x=y, return y */
|
|
if((ix|hx|lx)==0) { /* x == 0 */
|
|
SET_LDOUBLE_WORDS(x,esy&0x8000,0,1);/* return +-minsubnormal */
|
|
y = x*x;
|
|
math_force_eval (y); /* raise underflow flag */
|
|
return x;
|
|
}
|
|
if(esx>=0) { /* x > 0 */
|
|
if(esx>esy||((esx==esy) && (hx>hy||((hx==hy)&&(lx>ly))))) {
|
|
/* x > y, x -= ulp */
|
|
if(lx==0) {
|
|
if (ix != 0 && hx == 0x80000000) hx = 0;
|
|
if (hx==0) esx -= 1;
|
|
hx -= 1;
|
|
}
|
|
lx -= 1;
|
|
} else { /* x < y, x += ulp */
|
|
lx += 1;
|
|
if(lx==0) {
|
|
hx += 1;
|
|
if (hx==0) {
|
|
hx = 0x80000000;
|
|
esx += 1;
|
|
}
|
|
}
|
|
}
|
|
} else { /* x < 0 */
|
|
if(esy>=0||esx>esy||((esx==esy) && (hx>hy||((hx==hy)&&(lx>ly))))){
|
|
/* x < y, x -= ulp */
|
|
if(lx==0) {
|
|
if (ix != 0 && hx == 0x80000000) hx = 0;
|
|
if (hx==0) esx -= 1;
|
|
hx -= 1;
|
|
}
|
|
lx -= 1;
|
|
} else { /* x > y, x += ulp */
|
|
lx += 1;
|
|
if(lx==0) {
|
|
hx += 1;
|
|
if (hx==0) {
|
|
hx = 0x80000000;
|
|
esx += 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
esy = esx&0x7fff;
|
|
if(esy==0x7fff) {
|
|
long double u = x + x; /* overflow */
|
|
math_force_eval (u);
|
|
__set_errno (ERANGE);
|
|
}
|
|
if(esy==0 && (hx & 0x80000000) == 0) { /* underflow */
|
|
y = x*x;
|
|
math_force_eval (y); /* raise underflow flag */
|
|
__set_errno (ERANGE);
|
|
}
|
|
SET_LDOUBLE_WORDS(x,esx,hx,lx);
|
|
return x;
|
|
}
|
|
weak_alias (__nextafterl, nextafterl)
|
|
strong_alias (__nextafterl, __nexttowardl)
|
|
weak_alias (__nextafterl, nexttowardl)
|