AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use math_narrow_eval more consistently.

Browse Source 
Where glibc code needs to avoid excess range and precision in
floating-point arithmetic, code variously uses either asms or volatile
to force the results of that arithmetic to memory; mostly this is
conditional on FLT_EVAL_METHOD, but in the case of lrint / llrint
functions some use of volatile is unconditional (and is present
unnecessarily in versions for long double).  This patch make such code
use the recently-added math_narrow_eval macro consistently, removing
the unnecessary uses of volatile in long double lrint / llrint
implementations completely.

Tested for x86_64, x86, mips64 and powerpc.

	* 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.
This commit is contained in:
Joseph Myers 2015-09-23 18:14:57 +00:00
parent 5df386a549
commit 54142c44e9
29 changed files with 109 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ChangeLog
View File

@ -1,3 +1,50 @@
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> 2015-09-22 H.J. Lu <hongjiu.lu@intel.com>
* nptl/Versions: Remove ignored symbols. * nptl/Versions: Remove ignored symbols.

5
math/s_nexttowardf.c
View File

@ -59,10 +59,7 @@ float __nexttowardf(float x, long double y)
} }
hy = hx&0x7f800000; hy = hx&0x7f800000;
if(hy>=0x7f800000) { if(hy>=0x7f800000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0)
/* Force conversion to float. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00800000) { if(hy<0x00800000) {

13
stdlib/strtod_l.c
View File

@ -57,6 +57,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
#include "../locale/localeinfo.h" #include "../locale/localeinfo.h"
#include <locale.h> #include <locale.h>
#include <math.h> #include <math.h>
#include <math_private.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
@ -181,10 +182,8 @@ static FLOAT
overflow_value (int negative) overflow_value (int negative)
{ {
__set_errno (ERANGE); __set_errno (ERANGE);
#if FLT_EVAL_METHOD != 0 FLOAT result = math_narrow_eval ((negative ? -MAX_VALUE : MAX_VALUE)
volatile * MAX_VALUE);
#endif
FLOAT result = (negative ? -MAX_VALUE : MAX_VALUE) * MAX_VALUE;
return result; return result;
} }
@ -195,10 +194,8 @@ static FLOAT
underflow_value (int negative) underflow_value (int negative)
{ {
__set_errno (ERANGE); __set_errno (ERANGE);
#if FLT_EVAL_METHOD != 0 FLOAT result = math_narrow_eval ((negative ? -MIN_VALUE : MIN_VALUE)
volatile * MIN_VALUE);
#endif
FLOAT result = (negative ? -MIN_VALUE : MIN_VALUE) * MIN_VALUE;
return result; return result;
} }

5
sysdeps/i386/fpu/s_nexttoward.c
View File

@ -73,10 +73,7 @@ double __nexttoward(double x, long double y)
} }
hy = hx&0x7ff00000; hy = hx&0x7ff00000;
if(hy>=0x7ff00000) { if(hy>=0x7ff00000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to double. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00100000) { if(hy<0x00100000) {

5
sysdeps/i386/fpu/s_nexttowardf.c
View File

@ -61,10 +61,7 @@ float __nexttowardf(float x, long double y)
} }
hy = hx&0x7f800000; hy = hx&0x7f800000;
if(hy>=0x7f800000) { if(hy>=0x7f800000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0)
/* Force conversion to float. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00800000) { if(hy<0x00800000) {

20
sysdeps/ieee754/dbl-64/e_gamma_r.c
View File

@ -76,11 +76,7 @@ gamma_positive (double x, int *exp2_adj)
/* Adjust into the range for applying Stirling's /* Adjust into the range for applying Stirling's
approximation. */ approximation. */
double n = __ceil (12.0 - x); double n = __ceil (12.0 - x);
#if FLT_EVAL_METHOD != 0 x_adj = math_narrow_eval (x + n);
volatile
#endif
double x_tmp = x + n;
x_adj = x_tmp;
x_eps = (x - (x_adj - n)); x_eps = (x - (x_adj - n));
prod = __gamma_product (x_adj - n, x_eps, n, &eps); prod = __gamma_product (x_adj - n, x_eps, n, &eps);
} }
@ -119,9 +115,6 @@ __ieee754_gamma_r (double x, int *signgamp)
{ {
int32_t hx; int32_t hx;
u_int32_t lx; u_int32_t lx;
#if FLT_EVAL_METHOD != 0
volatile
#endif
double ret; double ret;
EXTRACT_WORDS (hx, lx, x); EXTRACT_WORDS (hx, lx, x);
@ -157,7 +150,7 @@ __ieee754_gamma_r (double x, int *signgamp)
{ {
/* Overflow. */ /* Overflow. */
*signgamp = 0; *signgamp = 0;
ret = DBL_MAX * DBL_MAX; ret = math_narrow_eval (DBL_MAX * DBL_MAX);
return ret; return ret;
} }
else else
@ -201,27 +194,28 @@ __ieee754_gamma_r (double x, int *signgamp)
} }
} }
} }
ret = math_narrow_eval (ret);
} }
if (isinf (ret) && x != 0) if (isinf (ret) && x != 0)
{ {
if (*signgamp < 0) if (*signgamp < 0)
{ {
ret = -__copysign (DBL_MAX, ret) * DBL_MAX; ret = math_narrow_eval (-__copysign (DBL_MAX, ret) * DBL_MAX);
ret = -ret; ret = -ret;
} }
else else
ret = __copysign (DBL_MAX, ret) * DBL_MAX; ret = math_narrow_eval (__copysign (DBL_MAX, ret) * DBL_MAX);
return ret; return ret;
} }
else if (ret == 0) else if (ret == 0)
{ {
if (*signgamp < 0) if (*signgamp < 0)
{ {
ret = -__copysign (DBL_MIN, ret) * DBL_MIN; ret = math_narrow_eval (-__copysign (DBL_MIN, ret) * DBL_MIN);
ret = -ret; ret = -ret;
} }
else else
ret = __copysign (DBL_MIN, ret) * DBL_MIN; ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN);
return ret; return ret;
} }
else else

5
sysdeps/ieee754/dbl-64/gamma_productf.c
View File

@ -36,10 +36,7 @@ __gamma_productf (float x, float x_eps, int n, float *eps)
for (int i = 1; i < n; i++) for (int i = 1; i < n; i++)
ret *= x_full + i; ret *= x_full + i;
#if FLT_EVAL_METHOD != 0 float fret = math_narrow_eval ((float) ret);
volatile
#endif
float fret = ret;
*eps = (ret - fret) / fret; *eps = (ret - fret) / fret;
return fret; return fret;

19
sysdeps/ieee754/dbl-64/k_rem_pio2.c
View File

@ -315,34 +315,25 @@ recompute:
break; break;
case 1: case 1:
case 2:; case 2:;
#if __FLT_EVAL_METHOD__ != 0
volatile
#endif
double fv = 0.0; double fv = 0.0;
for (i = jz; i >= 0; i--) for (i = jz; i >= 0; i--)
fv += fq[i]; fv = math_narrow_eval (fv + fq[i]);
y[0] = (ih == 0) ? fv : -fv; y[0] = (ih == 0) ? fv : -fv;
fv = fq[0] - fv; fv = math_narrow_eval (fq[0] - fv);
for (i = 1; i <= jz; i++) for (i = 1; i <= jz; i++)
fv += fq[i]; fv = math_narrow_eval (fv + fq[i]);
y[1] = (ih == 0) ? fv : -fv; y[1] = (ih == 0) ? fv : -fv;
break; break;
case 3: /* painful */ case 3: /* painful */
for (i = jz; i > 0; i--) for (i = jz; i > 0; i--)
{ {
#if __FLT_EVAL_METHOD__ != 0 double fv = math_narrow_eval (fq[i - 1] + fq[i]);
volatile
#endif
double fv = (double) (fq[i - 1] + fq[i]);
fq[i] += fq[i - 1] - fv; fq[i] += fq[i - 1] - fv;
fq[i - 1] = fv; fq[i - 1] = fv;
} }
for (i = jz; i > 1; i--) for (i = jz; i > 1; i--)
{ {
#if __FLT_EVAL_METHOD__ != 0 double fv = math_narrow_eval (fq[i - 1] + fq[i]);
volatile
#endif
double fv = (double) (fq[i - 1] + fq[i]);
fq[i] += fq[i - 1] - fv; fq[i] += fq[i - 1] - fv;
fq[i - 1] = fv; fq[i - 1] = fv;
} }

24
sysdeps/ieee754/dbl-64/lgamma_neg.c
View File

@ -330,17 +330,9 @@ __lgamma_neg (double x, int *signgamp)
} }
double log_gamma_ratio; double log_gamma_ratio;
#if FLT_EVAL_METHOD != 0 double y0 = math_narrow_eval (1 - x0_hi);
volatile
#endif
double y0_tmp = 1 - x0_hi;
double y0 = y0_tmp;
double y0_eps = -x0_hi + (1 - y0) - x0_lo; double y0_eps = -x0_hi + (1 - y0) - x0_lo;
#if FLT_EVAL_METHOD != 0 double y = math_narrow_eval (1 - x);
volatile
#endif
double y_tmp = 1 - x;
double y = y_tmp;
double y_eps = -x + (1 - y); double y_eps = -x + (1 - y);
/* We now wish to compute LOG_GAMMA_RATIO /* We now wish to compute LOG_GAMMA_RATIO
= log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF = log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF
@ -353,19 +345,11 @@ __lgamma_neg (double x, int *signgamp)
{ {
int n_up = (7 - i) / 2; int n_up = (7 - i) / 2;
double ny0, ny0_eps, ny, ny_eps; double ny0, ny0_eps, ny, ny_eps;
#if FLT_EVAL_METHOD != 0 ny0 = math_narrow_eval (y0 + n_up);
volatile
#endif
double y0_tmp = y0 + n_up;
ny0 = y0_tmp;
ny0_eps = y0 - (ny0 - n_up) + y0_eps; ny0_eps = y0 - (ny0 - n_up) + y0_eps;
y0 = ny0; y0 = ny0;
y0_eps = ny0_eps; y0_eps = ny0_eps;
#if FLT_EVAL_METHOD != 0 ny = math_narrow_eval (y + n_up);
volatile
#endif
double y_tmp = y + n_up;
ny = y_tmp;
ny_eps = y - (ny - n_up) + y_eps; ny_eps = y - (ny - n_up) + y_eps;
y = ny; y = ny;
y_eps = ny_eps; y_eps = ny_eps;

5
sysdeps/ieee754/dbl-64/s_erf.c
View File

@ -402,10 +402,7 @@ __erfc (double x)
__ieee754_exp ((z - x) * (z + x) + R / S); __ieee754_exp ((z - x) * (z + x) + R / S);
if (hx > 0) if (hx > 0)
{ {
#if FLT_EVAL_METHOD != 0 double ret = math_narrow_eval (r / x);
volatile
#endif
double ret = r / x;
if (ret == 0) if (ret == 0)
__set_errno (ERANGE); __set_errno (ERANGE);
return ret; return ret;

6
sysdeps/ieee754/dbl-64/s_llrint.c
View File

@ -35,7 +35,7 @@ __llrint (double x)
int32_t j0; int32_t j0;
u_int32_t i1, i0; u_int32_t i1, i0;
long long int result; long long int result;
volatile double w; double w;
double t; double t;
int sx; int sx;
@ -47,7 +47,7 @@ __llrint (double x)
if (j0 < 20) if (j0 < 20)
{ {
w = two52[sx] + x; w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx]; t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t); EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
@ -62,7 +62,7 @@ __llrint (double x)
result = (((long long int) i0 << 32) | i1) << (j0 - 52); result = (((long long int) i0 << 32) | i1) << (j0 - 52);
else else
{ {
w = two52[sx] + x; w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx]; t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t); EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;

6
sysdeps/ieee754/dbl-64/s_lrint.c
View File

@ -34,7 +34,7 @@ __lrint (double x)
{ {
int32_t j0; int32_t j0;
u_int32_t i0, i1; u_int32_t i0, i1;
volatile double w; double w;
double t; double t;
long int result; long int result;
int sx; int sx;
@ -47,7 +47,7 @@ __lrint (double x)
if (j0 < 20) if (j0 < 20)
{ {
w = two52[sx] + x; w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx]; t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t); EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
@ -62,7 +62,7 @@ __lrint (double x)
result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52)); result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
else else
{ {
w = two52[sx] + x; w = math_narrow_eval (two52[sx] + x);
t = w - two52[sx]; t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t); EXTRACT_WORDS (i0, i1, t);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;

20
sysdeps/ieee754/flt-32/e_gammaf_r.c
View File

@ -69,11 +69,7 @@ gammaf_positive (float x, int *exp2_adj)
/* Adjust into the range for applying Stirling's /* Adjust into the range for applying Stirling's
approximation. */ approximation. */
float n = __ceilf (4.0f - x); float n = __ceilf (4.0f - x);
#if FLT_EVAL_METHOD != 0 x_adj = math_narrow_eval (x + n);
volatile
#endif
float x_tmp = x + n;
x_adj = x_tmp;
x_eps = (x - (x_adj - n)); x_eps = (x - (x_adj - n));
prod = __gamma_productf (x_adj - n, x_eps, n, &eps); prod = __gamma_productf (x_adj - n, x_eps, n, &eps);
} }
@ -111,9 +107,6 @@ float
__ieee754_gammaf_r (float x, int *signgamp) __ieee754_gammaf_r (float x, int *signgamp)
{ {
int32_t hx; int32_t hx;
#if FLT_EVAL_METHOD != 0
volatile
#endif
float ret; float ret;
GET_FLOAT_WORD (hx, x); GET_FLOAT_WORD (hx, x);
@ -149,7 +142,7 @@ __ieee754_gammaf_r (float x, int *signgamp)
{ {
/* Overflow. */ /* Overflow. */
*signgamp = 0; *signgamp = 0;
ret = FLT_MAX * FLT_MAX; ret = math_narrow_eval (FLT_MAX * FLT_MAX);
return ret; return ret;
} }
else else
@ -193,27 +186,28 @@ __ieee754_gammaf_r (float x, int *signgamp)
} }
} }
} }
ret = math_narrow_eval (ret);
} }
if (isinf (ret) && x != 0) if (isinf (ret) && x != 0)
{ {
if (*signgamp < 0) if (*signgamp < 0)
{ {
ret = -__copysignf (FLT_MAX, ret) * FLT_MAX; ret = math_narrow_eval (-__copysignf (FLT_MAX, ret) * FLT_MAX);
ret = -ret; ret = -ret;
} }
else else
ret = __copysignf (FLT_MAX, ret) * FLT_MAX; ret = math_narrow_eval (__copysignf (FLT_MAX, ret) * FLT_MAX);
return ret; return ret;
} }
else if (ret == 0) else if (ret == 0)
{ {
if (*signgamp < 0) if (*signgamp < 0)
{ {
ret = -__copysignf (FLT_MIN, ret) * FLT_MIN; ret = math_narrow_eval (-__copysignf (FLT_MIN, ret) * FLT_MIN);
ret = -ret; ret = -ret;
} }
else else
ret = __copysignf (FLT_MIN, ret) * FLT_MIN; ret = math_narrow_eval (__copysignf (FLT_MIN, ret) * FLT_MIN);
return ret; return ret;
} }
else else

19
sysdeps/ieee754/flt-32/k_rem_pio2f.c
View File

@ -167,30 +167,21 @@ recompute:
break; break;
case 1: case 1:
case 2:; case 2:;
#if __FLT_EVAL_METHOD__ != 0
volatile
#endif
float fv = 0.0; 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; 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]; for (i=1;i<=jz;i++) fv = math_narrow_eval (fv + fq[i]);
y[1] = (ih==0)? fv: -fv; y[1] = (ih==0)? fv: -fv;
break; break;
case 3: /* painful */ case 3: /* painful */
for (i=jz;i>0;i--) { for (i=jz;i>0;i--) {
#if __FLT_EVAL_METHOD__ != 0 float fv = math_narrow_eval (fq[i-1]+fq[i]);
volatile
#endif
float fv = fq[i-1]+fq[i];
fq[i] += fq[i-1]-fv; fq[i] += fq[i-1]-fv;
fq[i-1] = fv; fq[i-1] = fv;
} }
for (i=jz;i>1;i--) { for (i=jz;i>1;i--) {
#if __FLT_EVAL_METHOD__ != 0 float fv = math_narrow_eval (fq[i-1]+fq[i]);
volatile
#endif
float fv = fq[i-1]+fq[i];
fq[i] += fq[i-1]-fv; fq[i] += fq[i-1]-fv;
fq[i-1] = fv; fq[i-1] = fv;
} }

12
sysdeps/ieee754/flt-32/lgamma_negf.c
View File

@ -245,17 +245,9 @@ __lgamma_negf (float x, int *signgamp)
} }
float log_gamma_ratio; float log_gamma_ratio;
#if FLT_EVAL_METHOD != 0 float y0 = math_narrow_eval (1 - x0_hi);
volatile
#endif
float y0_tmp = 1 - x0_hi;
float y0 = y0_tmp;
float y0_eps = -x0_hi + (1 - y0) - x0_lo; float y0_eps = -x0_hi + (1 - y0) - x0_lo;
#if FLT_EVAL_METHOD != 0 float y = math_narrow_eval (1 - x);
volatile
#endif
float y_tmp = 1 - x;
float y = y_tmp;
float y_eps = -x + (1 - y); float y_eps = -x + (1 - y);
/* We now wish to compute LOG_GAMMA_RATIO /* We now wish to compute LOG_GAMMA_RATIO
= log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF = log (gamma (Y0 + Y0_EPS) / gamma (Y + Y_EPS)). XDIFF

5
sysdeps/ieee754/flt-32/s_erff.c
View File

@ -213,10 +213,7 @@ float __erfcf(float x)
r = __ieee754_expf(-z*z-(float)0.5625)* r = __ieee754_expf(-z*z-(float)0.5625)*
__ieee754_expf((z-x)*(z+x)+R/S); __ieee754_expf((z-x)*(z+x)+R/S);
if(hx>0) { if(hx>0) {
#if FLT_EVAL_METHOD != 0 float ret = math_narrow_eval (r/x);
volatile
#endif
float ret = r/x;
if (ret == 0) if (ret == 0)
__set_errno (ERANGE); __set_errno (ERANGE);
return ret; return ret;

4
sysdeps/ieee754/flt-32/s_llrintf.c
View File

@ -34,7 +34,7 @@ __llrintf (float x)
{ {
int32_t j0; int32_t j0;
u_int32_t i0; u_int32_t i0;
volatile float w; float w;
float t; float t;
long long int result; long long int result;
int sx; int sx;
@ -52,7 +52,7 @@ __llrintf (float x)
result = (long long int) i0 << (j0 - 23); result = (long long int) i0 << (j0 - 23);
else else
{ {
w = two23[sx] + x; w = math_narrow_eval (two23[sx] + x);
t = w - two23[sx]; t = w - two23[sx];
GET_FLOAT_WORD (i0, t); GET_FLOAT_WORD (i0, t);
j0 = ((i0 >> 23) & 0xff) - 0x7f; j0 = ((i0 >> 23) & 0xff) - 0x7f;

4
sysdeps/ieee754/flt-32/s_lrintf.c
View File

@ -34,7 +34,7 @@ __lrintf (float x)
{ {
int32_t j0; int32_t j0;
u_int32_t i0; u_int32_t i0;
volatile float w; float w;
float t; float t;
long int result; long int result;
int sx; int sx;
@ -52,7 +52,7 @@ __lrintf (float x)
result = (long int) i0 << (j0 - 23); result = (long int) i0 << (j0 - 23);
else else
{ {
w = two23[sx] + x; w = math_narrow_eval (two23[sx] + x);
t = w - two23[sx]; t = w - two23[sx];
GET_FLOAT_WORD (i0, t); GET_FLOAT_WORD (i0, t);
j0 = ((i0 >> 23) & 0xff) - 0x7f; j0 = ((i0 >> 23) & 0xff) - 0x7f;

2
sysdeps/ieee754/ldbl-128/s_llrintl.c
View File

@ -34,7 +34,7 @@ __llrintl (long double x)
{ {
int32_t j0; int32_t j0;
u_int64_t i0,i1; u_int64_t i0,i1;
volatile long double w; long double w;
long double t; long double t;
long long int result; long long int result;
int sx; int sx;

2
sysdeps/ieee754/ldbl-128/s_lrintl.c
View File

@ -34,7 +34,7 @@ __lrintl (long double x)
{ {
int32_t j0; int32_t j0;
u_int64_t i0,i1; u_int64_t i0,i1;
volatile long double w; long double w;
long double t; long double t;
long int result; long int result;
int sx; int sx;

5
sysdeps/ieee754/ldbl-128/s_nexttoward.c
View File

@ -73,10 +73,7 @@ double __nexttoward(double x, long double y)
} }
hy = hx&0x7ff00000; hy = hx&0x7ff00000;
if(hy>=0x7ff00000) { if(hy>=0x7ff00000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to double. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00100000) { if(hy<0x00100000) {

5
sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c
View File

@ -74,10 +74,7 @@ double __nexttoward(double x, long double y)
} }
hy = hx&0x7ff00000; hy = hx&0x7ff00000;
if(hy>=0x7ff00000) { if(hy>=0x7ff00000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to double. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00100000) { if(hy<0x00100000) {

5
sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c
View File

@ -63,10 +63,7 @@ float __nexttowardf(float x, long double y)
} }
hy = hx&0x7f800000; hy = hx&0x7f800000;
if(hy>=0x7f800000) { if(hy>=0x7f800000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0)
/* Force conversion to float. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00800000) { /* underflow */ if(hy<0x00800000) { /* underflow */

5
sysdeps/ieee754/ldbl-96/gamma_product.c
View File

@ -36,10 +36,7 @@ __gamma_product (double x, double x_eps, int n, double *eps)
for (int i = 1; i < n; i++) for (int i = 1; i < n; i++)
ret *= x_full + i; ret *= x_full + i;
#if FLT_EVAL_METHOD != 0 double fret = math_narrow_eval ((double) ret);
volatile
#endif
double fret = ret;
*eps = (ret - fret) / fret; *eps = (ret - fret) / fret;
return fret; return fret;

2
sysdeps/ieee754/ldbl-96/s_llrintl.c
View File

@ -35,7 +35,7 @@ __llrintl (long double x)
int32_t se,j0; int32_t se,j0;
u_int32_t i0, i1; u_int32_t i0, i1;
long long int result; long long int result;
volatile long double w; long double w;
long double t; long double t;
int sx; int sx;

2
sysdeps/ieee754/ldbl-96/s_lrintl.c
View File

@ -35,7 +35,7 @@ __lrintl (long double x)
int32_t se,j0; int32_t se,j0;
u_int32_t i0, i1; u_int32_t i0, i1;
long int result; long int result;
volatile long double w; long double w;
long double t; long double t;
int sx; int sx;

5
sysdeps/ieee754/ldbl-96/s_nexttoward.c
View File

@ -70,10 +70,7 @@ double __nexttoward(double x, long double y)
} }
hy = hx&0x7ff00000; hy = hx&0x7ff00000;
if(hy>=0x7ff00000) { if(hy>=0x7ff00000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to double. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00100000) { if(hy<0x00100000) {

5
sysdeps/ieee754/ldbl-96/s_nexttowardf.c
View File

@ -58,10 +58,7 @@ float __nexttowardf(float x, long double y)
} }
hy = hx&0x7f800000; hy = hx&0x7f800000;
if(hy>=0x7f800000) { if(hy>=0x7f800000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0)
/* Force conversion to float. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00800000) { if(hy<0x00800000) {

5
sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
View File

@ -62,10 +62,7 @@ float __nldbl_nexttowardf(float x, double y)
} }
hy = hx&0x7f800000; hy = hx&0x7f800000;
if(hy>=0x7f800000) { if(hy>=0x7f800000) {
x = x+x; /* overflow */ x = math_narrow_eval (x+x); /* overflow */
if (FLT_EVAL_METHOD != 0)
/* Force conversion to float. */
asm ("" : "+m"(x));
return x; return x;
} }
if(hy<0x00800000) { if(hy<0x00800000) {