+2015-09-23 Joseph Myers <joseph@codesourcery.com>
+
+ * math/s_nexttowardf.c (__nexttowardf): Use math_narrow_eval.
+ * stdlib/strtod_l.c: Include <math_private.h>.
+ (overflow_value): Use math_narrow_eval.
+ (underflow_value): Likewise.
+ * sysdeps/i386/fpu/s_nexttoward.c (__nexttoward): Likewise.
+ * sysdeps/i386/fpu/s_nexttowardf.c (__nexttowardf): Likewise.
+ * sysdeps/ieee754/dbl-64/e_gamma_r.c (gamma_positive): Likewise.
+ (__ieee754_gamma_r): Likewise.
+ * sysdeps/ieee754/dbl-64/gamma_productf.c (__gamma_productf):
+ Likewise.
+ * sysdeps/ieee754/dbl-64/k_rem_pio2.c (__kernel_rem_pio2):
+ Likewise.
+ * sysdeps/ieee754/dbl-64/lgamma_neg.c (__lgamma_neg): Likewise.
+ * sysdeps/ieee754/dbl-64/s_erf.c (__erfc): Likewise.
+ * sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Likewise.
+ * sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise.
+ * sysdeps/ieee754/flt-32/e_gammaf_r.c (gammaf_positive): Likewise.
+ (__ieee754_gammaf_r): Likewise.
+ * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+ Likewise.
+ * sysdeps/ieee754/flt-32/lgamma_negf.c (__lgamma_negf): Likewise.
+ * sysdeps/ieee754/flt-32/s_erff.c (__erfcf): Likewise.
+ * sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise.
+ * sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise.
+ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Do not use
+ volatile.
+ * sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
+ * sysdeps/ieee754/ldbl-128/s_nexttoward.c (__nexttoward): Use
+ math_narrow_eval.
+ * sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c (__nexttoward):
+ Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c (__nexttowardf):
+ Likewise.
+ * sysdeps/ieee754/ldbl-96/gamma_product.c (__gamma_product):
+ Likewise.
+ * sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Do not use
+ volatile.
+ * sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise.
+ * sysdeps/ieee754/ldbl-96/s_nexttoward.c (__nexttoward): Use
+ math_narrow_eval.
+ * sysdeps/ieee754/ldbl-96/s_nexttowardf.c (__nexttowardf):
+ Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c (__nldbl_nexttowardf):
+ Likewise.
+
2015-09-22 H.J. Lu <hongjiu.lu@intel.com>
* nptl/Versions: Remove ignored symbols.
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0)
- /* Force conversion to float. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00800000) {
#include "../locale/localeinfo.h"
#include <locale.h>
#include <math.h>
+#include <math_private.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
overflow_value (int negative)
{
__set_errno (ERANGE);
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- FLOAT result = (negative ? -MAX_VALUE : MAX_VALUE) * MAX_VALUE;
+ FLOAT result = math_narrow_eval ((negative ? -MAX_VALUE : MAX_VALUE)
+ * MAX_VALUE);
return result;
}
underflow_value (int negative)
{
__set_errno (ERANGE);
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- FLOAT result = (negative ? -MIN_VALUE : MIN_VALUE) * MIN_VALUE;
+ FLOAT result = math_narrow_eval ((negative ? -MIN_VALUE : MIN_VALUE)
+ * MIN_VALUE);
return result;
}
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
- /* Force conversion to double. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00100000) {
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0)
- /* Force conversion to float. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00800000) {
/* Adjust into the range for applying Stirling's
approximation. */
double n = __ceil (12.0 - x);
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double x_tmp = x + n;
- x_adj = x_tmp;
+ x_adj = math_narrow_eval (x + n);
x_eps = (x - (x_adj - n));
prod = __gamma_product (x_adj - n, x_eps, n, &eps);
}
{
int32_t hx;
u_int32_t lx;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
double ret;
EXTRACT_WORDS (hx, lx, x);
{
/* Overflow. */
*signgamp = 0;
- ret = DBL_MAX * DBL_MAX;
+ ret = math_narrow_eval (DBL_MAX * DBL_MAX);
return ret;
}
else
}
}
}
+ ret = math_narrow_eval (ret);
}
if (isinf (ret) && x != 0)
{
if (*signgamp < 0)
{
- ret = -__copysign (DBL_MAX, ret) * DBL_MAX;
+ ret = math_narrow_eval (-__copysign (DBL_MAX, ret) * DBL_MAX);
ret = -ret;
}
else
- ret = __copysign (DBL_MAX, ret) * DBL_MAX;
+ ret = math_narrow_eval (__copysign (DBL_MAX, ret) * DBL_MAX);
return ret;
}
else if (ret == 0)
{
if (*signgamp < 0)
{
- ret = -__copysign (DBL_MIN, ret) * DBL_MIN;
+ ret = math_narrow_eval (-__copysign (DBL_MIN, ret) * DBL_MIN);
ret = -ret;
}
else
- ret = __copysign (DBL_MIN, ret) * DBL_MIN;
+ ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN);
return ret;
}
else
for (int i = 1; i < n; i++)
ret *= x_full + i;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- float fret = ret;
+ float fret = math_narrow_eval ((float) ret);
*eps = (ret - fret) / fret;
return fret;
break;
case 1:
case 2:;
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
double fv = 0.0;
for (i = jz; i >= 0; i--)
- fv += fq[i];
+ fv = math_narrow_eval (fv + fq[i]);
y[0] = (ih == 0) ? fv : -fv;
- fv = fq[0] - fv;
+ fv = math_narrow_eval (fq[0] - fv);
for (i = 1; i <= jz; i++)
- fv += fq[i];
+ fv = math_narrow_eval (fv + fq[i]);
y[1] = (ih == 0) ? fv : -fv;
break;
case 3: /* painful */
for (i = jz; i > 0; i--)
{
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
- double fv = (double) (fq[i - 1] + fq[i]);
+ double fv = math_narrow_eval (fq[i - 1] + fq[i]);
fq[i] += fq[i - 1] - fv;
fq[i - 1] = fv;
}
for (i = jz; i > 1; i--)
{
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
- double fv = (double) (fq[i - 1] + fq[i]);
+ double fv = math_narrow_eval (fq[i - 1] + fq[i]);
fq[i] += fq[i - 1] - fv;
fq[i - 1] = fv;
}
}
double log_gamma_ratio;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double y0_tmp = 1 - x0_hi;
- double y0 = y0_tmp;
+ double y0 = math_narrow_eval (1 - x0_hi);
double y0_eps = -x0_hi + (1 - y0) - x0_lo;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double y_tmp = 1 - x;
- double y = y_tmp;
+ double y = math_narrow_eval (1 - x);
double y_eps = -x + (1 - y);
/* We now wish to compute LOG_GAMMA_RATIO
= log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF
{
int n_up = (7 - i) / 2;
double ny0, ny0_eps, ny, ny_eps;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double y0_tmp = y0 + n_up;
- ny0 = y0_tmp;
+ ny0 = math_narrow_eval (y0 + n_up);
ny0_eps = y0 - (ny0 - n_up) + y0_eps;
y0 = ny0;
y0_eps = ny0_eps;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double y_tmp = y + n_up;
- ny = y_tmp;
+ ny = math_narrow_eval (y + n_up);
ny_eps = y - (ny - n_up) + y_eps;
y = ny;
y_eps = ny_eps;
__ieee754_exp ((z - x) * (z + x) + R / S);
if (hx > 0)
{
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double ret = r / x;
+ double ret = math_narrow_eval (r / x);
if (ret == 0)
__set_errno (ERANGE);
return ret;
int32_t j0;
u_int32_t i1, i0;
long long int result;
- volatile double w;
+ double w;
double t;
int sx;
if (j0 < 20)
{
- w = two52[sx] + x;
+ w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
result = (((long long int) i0 << 32) | i1) << (j0 - 52);
else
{
- w = two52[sx] + x;
+ w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
{
int32_t j0;
u_int32_t i0, i1;
- volatile double w;
+ double w;
double t;
long int result;
int sx;
if (j0 < 20)
{
- w = two52[sx] + x;
+ w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
else
{
- w = two52[sx] + x;
+ w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
/* Adjust into the range for applying Stirling's
approximation. */
float n = __ceilf (4.0f - x);
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- float x_tmp = x + n;
- x_adj = x_tmp;
+ x_adj = math_narrow_eval (x + n);
x_eps = (x - (x_adj - n));
prod = __gamma_productf (x_adj - n, x_eps, n, &eps);
}
__ieee754_gammaf_r (float x, int *signgamp)
{
int32_t hx;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
float ret;
GET_FLOAT_WORD (hx, x);
{
/* Overflow. */
*signgamp = 0;
- ret = FLT_MAX * FLT_MAX;
+ ret = math_narrow_eval (FLT_MAX * FLT_MAX);
return ret;
}
else
}
}
}
+ ret = math_narrow_eval (ret);
}
if (isinf (ret) && x != 0)
{
if (*signgamp < 0)
{
- ret = -__copysignf (FLT_MAX, ret) * FLT_MAX;
+ ret = math_narrow_eval (-__copysignf (FLT_MAX, ret) * FLT_MAX);
ret = -ret;
}
else
- ret = __copysignf (FLT_MAX, ret) * FLT_MAX;
+ ret = math_narrow_eval (__copysignf (FLT_MAX, ret) * FLT_MAX);
return ret;
}
else if (ret == 0)
{
if (*signgamp < 0)
{
- ret = -__copysignf (FLT_MIN, ret) * FLT_MIN;
+ ret = math_narrow_eval (-__copysignf (FLT_MIN, ret) * FLT_MIN);
ret = -ret;
}
else
- ret = __copysignf (FLT_MIN, ret) * FLT_MIN;
+ ret = math_narrow_eval (__copysignf (FLT_MIN, ret) * FLT_MIN);
return ret;
}
else
break;
case 1:
case 2:;
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
float fv = 0.0;
- for (i=jz;i>=0;i--) fv += fq[i];
+ for (i=jz;i>=0;i--) fv = math_narrow_eval (fv + fq[i]);
y[0] = (ih==0)? fv: -fv;
- fv = fq[0]-fv;
- for (i=1;i<=jz;i++) fv += fq[i];
+ fv = math_narrow_eval (fq[0]-fv);
+ for (i=1;i<=jz;i++) fv = math_narrow_eval (fv + fq[i]);
y[1] = (ih==0)? fv: -fv;
break;
case 3: /* painful */
for (i=jz;i>0;i--) {
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
- float fv = fq[i-1]+fq[i];
+ float fv = math_narrow_eval (fq[i-1]+fq[i]);
fq[i] += fq[i-1]-fv;
fq[i-1] = fv;
}
for (i=jz;i>1;i--) {
-#if __FLT_EVAL_METHOD__ != 0
- volatile
-#endif
- float fv = fq[i-1]+fq[i];
+ float fv = math_narrow_eval (fq[i-1]+fq[i]);
fq[i] += fq[i-1]-fv;
fq[i-1] = fv;
}
}
float log_gamma_ratio;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- float y0_tmp = 1 - x0_hi;
- float y0 = y0_tmp;
+ float y0 = math_narrow_eval (1 - x0_hi);
float y0_eps = -x0_hi + (1 - y0) - x0_lo;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- float y_tmp = 1 - x;
- float y = y_tmp;
+ float y = math_narrow_eval (1 - x);
float y_eps = -x + (1 - y);
/* We now wish to compute LOG_GAMMA_RATIO
= log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF
r = __ieee754_expf(-z*z-(float)0.5625)*
__ieee754_expf((z-x)*(z+x)+R/S);
if(hx>0) {
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- float ret = r/x;
+ float ret = math_narrow_eval (r/x);
if (ret == 0)
__set_errno (ERANGE);
return ret;
{
int32_t j0;
u_int32_t i0;
- volatile float w;
+ float w;
float t;
long long int result;
int sx;
result = (long long int) i0 << (j0 - 23);
else
{
- w = two23[sx] + x;
+ w = math_narrow_eval (two23[sx] + x);
t = w - two23[sx];
GET_FLOAT_WORD (i0, t);
j0 = ((i0 >> 23) & 0xff) - 0x7f;
{
int32_t j0;
u_int32_t i0;
- volatile float w;
+ float w;
float t;
long int result;
int sx;
result = (long int) i0 << (j0 - 23);
else
{
- w = two23[sx] + x;
+ w = math_narrow_eval (two23[sx] + x);
t = w - two23[sx];
GET_FLOAT_WORD (i0, t);
j0 = ((i0 >> 23) & 0xff) - 0x7f;
{
int32_t j0;
u_int64_t i0,i1;
- volatile long double w;
+ long double w;
long double t;
long long int result;
int sx;
{
int32_t j0;
u_int64_t i0,i1;
- volatile long double w;
+ long double w;
long double t;
long int result;
int sx;
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
- /* Force conversion to double. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00100000) {
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
- /* Force conversion to double. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00100000) {
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0)
- /* Force conversion to float. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00800000) { /* underflow */
for (int i = 1; i < n; i++)
ret *= x_full + i;
-#if FLT_EVAL_METHOD != 0
- volatile
-#endif
- double fret = ret;
+ double fret = math_narrow_eval ((double) ret);
*eps = (ret - fret) / fret;
return fret;
int32_t se,j0;
u_int32_t i0, i1;
long long int result;
- volatile long double w;
+ long double w;
long double t;
int sx;
int32_t se,j0;
u_int32_t i0, i1;
long int result;
- volatile long double w;
+ long double w;
long double t;
int sx;
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
- /* Force conversion to double. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00100000) {
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0)
- /* Force conversion to float. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00800000) {
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
- x = x+x; /* overflow */
- if (FLT_EVAL_METHOD != 0)
- /* Force conversion to float. */
- asm ("" : "+m"(x));
+ x = math_narrow_eval (x+x); /* overflow */
return x;
}
if(hy<0x00800000) {
projects / thirdparty / glibc.git / commitdiff
