mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +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.
118 lines
3.1 KiB
C
118 lines
3.1 KiB
C
/* s_log1pf.c -- float version of s_log1p.c.
|
|
* Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
|
|
*/
|
|
|
|
/*
|
|
* ====================================================
|
|
* 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.
|
|
* ====================================================
|
|
*/
|
|
|
|
#include <float.h>
|
|
#include <math.h>
|
|
#include <math-barriers.h>
|
|
#include <math_private.h>
|
|
#include <math-underflow.h>
|
|
#include <libc-diag.h>
|
|
|
|
static const float
|
|
ln2_hi = 6.9313812256e-01, /* 0x3f317180 */
|
|
ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */
|
|
two25 = 3.355443200e+07, /* 0x4c000000 */
|
|
Lp1 = 6.6666668653e-01, /* 3F2AAAAB */
|
|
Lp2 = 4.0000000596e-01, /* 3ECCCCCD */
|
|
Lp3 = 2.8571429849e-01, /* 3E924925 */
|
|
Lp4 = 2.2222198546e-01, /* 3E638E29 */
|
|
Lp5 = 1.8183572590e-01, /* 3E3A3325 */
|
|
Lp6 = 1.5313838422e-01, /* 3E1CD04F */
|
|
Lp7 = 1.4798198640e-01; /* 3E178897 */
|
|
|
|
static const float zero = 0.0;
|
|
|
|
float
|
|
__log1pf(float x)
|
|
{
|
|
float hfsq,f,c,s,z,R,u;
|
|
int32_t k,hx,hu,ax;
|
|
|
|
GET_FLOAT_WORD(hx,x);
|
|
ax = hx&0x7fffffff;
|
|
|
|
k = 1;
|
|
if (hx < 0x3ed413d7) { /* x < 0.41422 */
|
|
if(ax>=0x3f800000) { /* x <= -1.0 */
|
|
if(x==(float)-1.0) return -two25/zero; /* log1p(-1)=-inf */
|
|
else return (x-x)/(x-x); /* log1p(x<-1)=NaN */
|
|
}
|
|
if(ax<0x31000000) { /* |x| < 2**-29 */
|
|
math_force_eval(two25+x); /* raise inexact */
|
|
if (ax<0x24800000) /* |x| < 2**-54 */
|
|
{
|
|
math_check_force_underflow (x);
|
|
return x;
|
|
}
|
|
else
|
|
return x - x*x*(float)0.5;
|
|
}
|
|
if(hx>0||hx<=((int32_t)0xbe95f61f)) {
|
|
k=0;f=x;hu=1;} /* -0.2929<x<0.41422 */
|
|
}
|
|
if (hx >= 0x7f800000) return x+x;
|
|
if(k!=0) {
|
|
if(hx<0x5a000000) {
|
|
u = (float)1.0+x;
|
|
GET_FLOAT_WORD(hu,u);
|
|
k = (hu>>23)-127;
|
|
/* correction term */
|
|
c = (k>0)? (float)1.0-(u-x):x-(u-(float)1.0);
|
|
c /= u;
|
|
} else {
|
|
u = x;
|
|
GET_FLOAT_WORD(hu,u);
|
|
k = (hu>>23)-127;
|
|
c = 0;
|
|
}
|
|
hu &= 0x007fffff;
|
|
if(hu<0x3504f7) {
|
|
SET_FLOAT_WORD(u,hu|0x3f800000);/* normalize u */
|
|
} else {
|
|
k += 1;
|
|
SET_FLOAT_WORD(u,hu|0x3f000000); /* normalize u/2 */
|
|
hu = (0x00800000-hu)>>2;
|
|
}
|
|
f = u-(float)1.0;
|
|
}
|
|
hfsq=(float)0.5*f*f;
|
|
if(hu==0) { /* |f| < 2**-20 */
|
|
if(f==zero) {
|
|
if(k==0) return zero;
|
|
else {c += k*ln2_lo; return k*ln2_hi+c;}
|
|
}
|
|
R = hfsq*((float)1.0-(float)0.66666666666666666*f);
|
|
if(k==0) return f-R; else
|
|
return k*ln2_hi-((R-(k*ln2_lo+c))-f);
|
|
}
|
|
s = f/((float)2.0+f);
|
|
z = s*s;
|
|
R = z*(Lp1+z*(Lp2+z*(Lp3+z*(Lp4+z*(Lp5+z*(Lp6+z*Lp7))))));
|
|
if (k == 0)
|
|
return f - (hfsq - s * (hfsq + R));
|
|
else
|
|
{
|
|
/* With GCC 7 when compiling with -Os the compiler warns
|
|
that c might be used uninitialized. This can't be true
|
|
because k must be 0 for c to be uninitialized and we
|
|
handled that computation earlier without using c. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
|
|
return k * ln2_hi - ((hfsq - (s * (hfsq + R)
|
|
+ (k * ln2_lo + c))) - f);
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
}
|
|
}
|