summaryrefslogtreecommitdiff
path: root/libm
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-01-03 13:51:12 (GMT)
committerDenis Vlasenko <vda.linux@googlemail.com>2009-01-03 13:51:12 (GMT)
commitb994ff9e32473ef3779cb23b4974295f3ba08aef (patch)
treeb25aec85165e003e4fc2a04480a2fba63d3e1c00 /libm
parent15a971616c3e2f373264d0a2e4cd87aa11042737 (diff)
libm: remove scalbln implementation, it seems to be less correct than scalbn.
instead, either alias scalbln to scalbn if int == long on this arch, or just call scalbn form scalbln. text data bss dec hex filename - 45297 180 4 45481 b1a9 lib/libm.so + 44969 180 4 45153 b061 lib/libm.so
Diffstat (limited to 'libm')
-rw-r--r--libm/Makefile.in3
-rw-r--r--libm/s_scalbln.c52
-rw-r--r--libm/s_scalbn.c72
3 files changed, 48 insertions, 79 deletions
diff --git a/libm/Makefile.in b/libm/Makefile.in
index 9cbe82c..c232d91 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -72,8 +72,7 @@ libm_CSRC := \
s_fpclassify.c s_fpclassifyf.c s_signbit.c s_signbitf.c \
s_isnan.c s_isnanf.c s_isinf.c s_isinff.c s_finitef.c \
s_fdim.c s_fma.c s_fmax.c s_fmin.c \
- s_remquo.c s_scalbln.c w_exp2.c
-# REMOVED: w_gamma_r.c
+ s_remquo.c w_exp2.c
FL_MOBJ := \
acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \
ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
diff --git a/libm/s_scalbln.c b/libm/s_scalbln.c
deleted file mode 100644
index 3d0ff2f..0000000
--- a/libm/s_scalbln.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * ====================================================
- * 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.
- * ====================================================
- */
-
-/*
- * scalbn (double x, int n)
- * scalbn(x,n) returns x* 2**n computed by exponent
- * manipulation rather than by actually performing an
- * exponentiation or a multiplication.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
-huge = 1.0e+300,
-tiny = 1.0e-300;
-
-double scalbln(double x, long int n)
-{
- int32_t k,hx,lx;
- EXTRACT_WORDS(hx,lx,x);
- k = (hx&0x7ff00000)>>20; /* extract exponent */
- if (k==0) { /* 0 or subnormal x */
- if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
- x *= two54;
- GET_HIGH_WORD(hx,x);
- k = ((hx&0x7ff00000)>>20) - 54;
- }
- if (k==0x7ff) return x+x; /* NaN or Inf */
- k = k+n;
- if (n> 50000 || k > 0x7fe)
- return huge*copysign(huge,x); /* overflow */
- if (n< -50000) return tiny*copysign(tiny,x); /*underflow*/
- if (k > 0) /* normal result */
- {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
- if (k <= -54)
- return tiny*copysign(tiny,x); /*underflow*/
- k += 54; /* subnormal result */
- SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
- return x*twom54;
-}
-libm_hidden_def(scalbln)
diff --git a/libm/s_scalbn.c b/libm/s_scalbn.c
index c98ea9d..bb14802 100644
--- a/libm/s_scalbn.c
+++ b/libm/s_scalbn.c
@@ -11,7 +11,7 @@
/*
* scalbn (double x, int n)
- * scalbn(x,n) returns x* 2**n computed by exponent
+ * scalbn(x,n) returns x* 2**n computed by exponent
* manipulation rather than by actually performing an
* exponentiation or a multiplication.
*/
@@ -20,35 +20,57 @@
#include "math_private.h"
static const double
-two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
+two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
+twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
huge = 1.0e+300,
tiny = 1.0e-300;
double scalbn(double x, int n)
{
- int32_t k,hx,lx;
- EXTRACT_WORDS(hx,lx,x);
- k = (hx&0x7ff00000)>>20; /* extract exponent */
- if (k==0) { /* 0 or subnormal x */
- if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
- x *= two54;
- GET_HIGH_WORD(hx,x);
- k = ((hx&0x7ff00000)>>20) - 54;
- if (n< -50000) return tiny*x; /*underflow*/
- }
- if (k==0x7ff) return x+x; /* NaN or Inf */
- k = k+n;
- if (k > 0x7fe) return huge*copysign(huge,x); /* overflow */
- if (k > 0) /* normal result */
- {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
- if (k <= -54) {
- if (n > 50000) /* in case integer overflow in n+k */
- return huge*copysign(huge,x); /*overflow*/
- else return tiny*copysign(tiny,x); /*underflow*/
+ int32_t k, hx, lx;
+
+ EXTRACT_WORDS(hx, lx, x);
+ k = (hx & 0x7ff00000) >> 20; /* extract exponent */
+ if (k == 0) { /* 0 or subnormal x */
+ if ((lx | (hx & 0x7fffffff)) == 0)
+ return x; /* +-0 */
+ x *= two54;
+ GET_HIGH_WORD(hx, x);
+ k = ((hx & 0x7ff00000) >> 20) - 54;
+ }
+ if (k == 0x7ff)
+ return x + x; /* NaN or Inf */
+ k = k + n;
+ if (k > 0x7fe)
+ return huge * copysign(huge, x); /* overflow */
+ if (n < -50000)
+ return tiny * copysign(tiny, x); /* underflow */
+ if (k > 0) { /* normal result */
+ SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
+ return x;
}
- k += 54; /* subnormal result */
- SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
- return x*twom54;
+ if (k <= -54) {
+ if (n > 50000) /* in case integer overflow in n+k */
+ return huge * copysign(huge, x); /* overflow */
+ return tiny * copysign(tiny, x); /* underflow */
+ }
+ k += 54; /* subnormal result */
+ SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
+ return x * twom54;
}
libm_hidden_def(scalbn)
+
+#if LONG_MAX == INT_MAX
+/* strong_alias(scalbn, scalbln) - "error: conflicting types for 'scalbln'"
+ * because it tries to declare "typeof(scalbn) scalbln;"
+ * which tries to give "int" parameter to scalbln.
+ * Doing it by hand:
+ */
+__typeof(scalbln) scalbln __attribute__((alias("scalbn")));
+#else
+double scalbln(double x, long n)
+{
+ return scalbn(x, n);
+}
+#endif
+libm_hidden_def(scalbln)