mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-28 23:34:53 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			97 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* @(#)s_nextafter.c 5.1 93/09/24 */
 | |
| /*
 | |
|  * ====================================================
 | |
|  * 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: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp $";
 | |
| #endif
 | |
| 
 | |
| /* IEEE functions
 | |
|  *	nextafter(x,y)
 | |
|  *	return the next machine floating-point number of x in the
 | |
|  *	direction toward y.
 | |
|  *   Special cases:
 | |
|  */
 | |
| 
 | |
| /* Ugly hack so that the aliasing works.  */
 | |
| #define __nexttoward __internal___nexttoward
 | |
| #define nexttoward __internal_nexttoward
 | |
| 
 | |
| #include <errno.h>
 | |
| #include <math.h>
 | |
| #include <math-barriers.h>
 | |
| #include <math_private.h>
 | |
| #include <float.h>
 | |
| #include <libm-alias-double.h>
 | |
| 
 | |
| double __nextafter(double x, double y)
 | |
| {
 | |
| 	int32_t hx,hy,ix,iy;
 | |
| 	uint32_t lx,ly;
 | |
| 
 | |
| 	EXTRACT_WORDS(hx,lx,x);
 | |
| 	EXTRACT_WORDS(hy,ly,y);
 | |
| 	ix = hx&0x7fffffff;		/* |x| */
 | |
| 	iy = hy&0x7fffffff;		/* |y| */
 | |
| 
 | |
| 	if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) ||   /* x is nan */
 | |
| 	   ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))     /* y is nan */
 | |
| 	   return x+y;
 | |
| 	if(x==y) return y;		/* x=y, return y */
 | |
| 	if((ix|lx)==0) {			/* x == 0 */
 | |
| 	    double u;
 | |
| 	    INSERT_WORDS(x,hy&0x80000000,1);	/* return +-minsubnormal */
 | |
| 	    u = math_opt_barrier (x);
 | |
| 	    u = u*u;
 | |
| 	    math_force_eval (u);		/* raise underflow flag */
 | |
| 	    return x;
 | |
| 	}
 | |
| 	if(hx>=0) {				/* x > 0 */
 | |
| 	    if(hx>hy||((hx==hy)&&(lx>ly))) {	/* x > y, x -= ulp */
 | |
| 		if(lx==0) hx -= 1;
 | |
| 		lx -= 1;
 | |
| 	    } else {				/* x < y, x += ulp */
 | |
| 		lx += 1;
 | |
| 		if(lx==0) hx += 1;
 | |
| 	    }
 | |
| 	} else {				/* x < 0 */
 | |
| 	    if(hy>=0||hx>hy||((hx==hy)&&(lx>ly))){/* x < y, x -= ulp */
 | |
| 		if(lx==0) hx -= 1;
 | |
| 		lx -= 1;
 | |
| 	    } else {				/* x > y, x += ulp */
 | |
| 		lx += 1;
 | |
| 		if(lx==0) hx += 1;
 | |
| 	    }
 | |
| 	}
 | |
| 	hy = hx&0x7ff00000;
 | |
| 	if(hy>=0x7ff00000) {
 | |
| 	  double u = x+x;	/* overflow  */
 | |
| 	  math_force_eval (u);
 | |
| 	  __set_errno (ERANGE);
 | |
| 	}
 | |
| 	if(hy<0x00100000) {
 | |
| 	    double u = x*x;			/* underflow */
 | |
| 	    math_force_eval (u);		/* raise underflow flag */
 | |
| 	  __set_errno (ERANGE);
 | |
| 	}
 | |
| 	INSERT_WORDS(x,hx,lx);
 | |
| 	return x;
 | |
| }
 | |
| libm_alias_double (__nextafter, nextafter)
 | |
| #ifdef NO_LONG_DOUBLE
 | |
| strong_alias (__nextafter, __nexttowardl)
 | |
| weak_alias (__nexttowardl, nexttowardl)
 | |
| #undef __nexttoward
 | |
| strong_alias (__nextafter, __nexttoward)
 | |
| #undef nexttoward
 | |
| weak_alias (__nextafter, nexttoward)
 | |
| #endif
 |