diff options
author | Wilco Dijkstra <wdijkstr@arm.com> | 2015-09-18 20:51:52 +0100 |
---|---|---|
committer | Wilco Dijkstra <wdijkstr@arm.com> | 2015-09-18 20:51:52 +0100 |
commit | fe8c2b33aed067282ecac0cc3fdff1feef88548b (patch) | |
tree | 71aad7a4af771bfa194fd13b83d2af62a9ae9051 /sysdeps/ieee754/flt-32 | |
parent | 6565fcb6e189d67b5a3f321453daebb805056d73 (diff) | |
download | glibc-fe8c2b33aed067282ecac0cc3fdff1feef88548b.zip glibc-fe8c2b33aed067282ecac0cc3fdff1feef88548b.tar.gz glibc-fe8c2b33aed067282ecac0cc3fdff1feef88548b.tar.bz2 |
Since we now inline isinf, isnan and isfinite in math.h, replace uses of __isinf_ns(l/f)
with isinf, and remove the unused inlines __isinf_ns(l/f), __isnan(f) and __finite(f).
2015-09-18 Wilco Dijkstra <wdijkstr@arm.com>
* include/math.h: Remove __isinf_ns, __isinf_nsf, __isinf_nsl.
* math/Makefile: Remove isinf_ns.c.
* math/divtc3.c (__divtc3): Replace __isinf_nsl with isinf.
* math/multc3.c (__multc3): Likewise.
* math/s_casin.c (__casin): Likewise.
* math/s_casinf.c (__casinf): Likewise.
* math/s_casinl.c (__casinl): Likewise.
* math/s_cproj.c (__cproj): Likewise.
* math/s_cprojf.c (__cprojf): Likewise.
* math/s_cprojl.c (__cprofl): Likewise.
* math/s_ctan.c (__ctan): Likewise.
* math/s_ctanf.c (__ctanf): Likewise.
* math/s_ctanh.c (__ctanh): Likewise.
* math/s_ctanhf.c (__ctanhf): Likewise.
* math/s_ctanhl.c (__ctanhl): Likewise.
* math/s_ctanl.c (__ctanl): Likewise.
* math/w_fmod.c (__fmod): Likewise.
* math/w_fmodf.c (__fmodf): Likewise.
* math/w_fmodl.c (_fmodl): Likewise.
* math/w_remainder.c (__remainder): Likewise.
* math/w_remainderf.c (__remainderf): Likewise.
* math/w_remainderl.c (__remainderl): Likewise.
* math/w_scalb.c (__scalb): Likewise.
* math/w_scalbf.c (__scalbf): Likewise.
* math/w_scalbl.c (__scalbl): Likewise.
* sysdeps/ieee754/dbl-64/s_isinf_ns.c: Deleted file.
* sysdeps/ieee754/dbl-64/s_sincos.c (__sincos): Replace __isinf_ns
with isinf.
* sysdeps/ieee754/dbl-64/wordsize-64/math_private.h: Deleted file.
* sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c: Deleted file.
* sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Replace
__isinf_nsf with isinf.
* sysdeps/ieee754/flt-32/math_private.h: Deleted file.
* sysdeps/ieee754/flt-32/s_isinf_nsf.c: Deleted file.
* sysdeps/ieee754/ldbl-128/s_isinf_nsl.c: Deleted file.
* sysdeps/ieee754/ldbl-128/s_sincosl.c (__sincosl): Replace __isinf_nsl
with isinf.
* sysdeps/ieee754/ldbl-128ibm/s_cprojl.c(__cprojll): Replace
__isinf_nsl with isinf.
* sysdeps/ieee754/ldbl-128ibm/s_ctanl.c(__ctanl): Replace __isinf_nsl
with isinf.
* sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c: Deleted file.
* sysdeps/ieee754/ldbl-128ibm/s_sincosl.c (__sincosl): Replace
__isinf_nsl with isinf.
* sysdeps/ieee754/ldbl-96/s_isinf_nsl.c: Deleted file.
* sysdeps/ieee754/ldbl-96/s_sincosl.c (__sincosl): Replace __isinf_nsl
with isinf.
Diffstat (limited to 'sysdeps/ieee754/flt-32')
-rw-r--r-- | sysdeps/ieee754/flt-32/e_exp2f.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/math_private.h | 35 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/s_isinf_nsf.c | 20 |
3 files changed, 1 insertions, 56 deletions
diff --git a/sysdeps/ieee754/flt-32/e_exp2f.c b/sysdeps/ieee754/flt-32/e_exp2f.c index bc62042..170c565 100644 --- a/sysdeps/ieee754/flt-32/e_exp2f.c +++ b/sysdeps/ieee754/flt-32/e_exp2f.c @@ -122,7 +122,7 @@ __ieee754_exp2f (float x) /* Exceptional cases: */ else if (isless (x, himark)) { - if (__isinf_nsf (x)) + if (isinf (x)) /* e^-inf == 0, with no error. */ return 0; else diff --git a/sysdeps/ieee754/flt-32/math_private.h b/sysdeps/ieee754/flt-32/math_private.h deleted file mode 100644 index e33db02..0000000 --- a/sysdeps/ieee754/flt-32/math_private.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _MATH_PRIVATE_H_ - -#include_next <math_private.h> - -#ifndef __isnanf -extern __always_inline int -__isnanf (float d) -{ - u_int32_t di; - GET_FLOAT_WORD (di, d); - return (di & 0x7fffffff) > 0x7f800000; -} -#endif - -#ifndef __isinf_nsf -extern __always_inline int -__isinf_nsf (float d) -{ - u_int32_t di; - GET_FLOAT_WORD (di, d); - return (di & 0x7fffffff) == 0x7f800000; -} -#endif - -#ifndef __finitef -extern __always_inline int -__finitef (float d) -{ - u_int32_t di; - GET_FLOAT_WORD (di, d); - return (di & 0x7fffffff) < 0x7f800000; -} -#endif - -#endif /* _MATH_PRIVATE_H_ */ diff --git a/sysdeps/ieee754/flt-32/s_isinf_nsf.c b/sysdeps/ieee754/flt-32/s_isinf_nsf.c deleted file mode 100644 index 284d619..0000000 --- a/sysdeps/ieee754/flt-32/s_isinf_nsf.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Written by Ulrich Drepper <drepper@gmail.com>. - */ - -/* - * __isinf_nsf(x) returns != 0 if x is ±inf, else 0; - * no branching! - */ - -#include <math.h> -#include <math_private.h> - -#undef __isinf_nsf -int -__isinf_nsf (float x) -{ - int32_t ix; - GET_FLOAT_WORD(ix,x); - return (ix & 0x7fffffff) == 0x7f800000; -} |