From f7cfe68f59c07ef9034fab0ad2235fcce831e609 Mon Sep 17 00:00:00 2001 From: Steve Kargl Date: Thu, 26 Jul 2012 03:59:33 +0000 Subject: [PATCH] * ld80/expl.c: . Remove a few #ifdefs that should have been removed in the initial commit. . Sort fpmath.h to its rightful place. * ld128/s_expl.c: . Replace EXPMASK with its actual value. . Sort fpmath.h to its rightful place. Requested by: bde Approved by: das (mentor) --- lib/msun/ld128/s_expl.c | 5 ++--- lib/msun/ld80/s_expl.c | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c index 624cb8d796fa..1888ef885864 100644 --- a/lib/msun/ld128/s_expl.c +++ b/lib/msun/ld128/s_expl.c @@ -29,12 +29,11 @@ __FBSDID("$FreeBSD$"); #include +#include "fpmath.h" #include "math.h" #include "math_private.h" -#include "fpmath.h" #define BIAS (LDBL_MAX_EXP - 1) -#define EXPMASK (BIAS + LDBL_MAX_EXP) static volatile const long double twom10000 = 0x1p-10000L, tiny = 0x1p-10000L; @@ -205,7 +204,7 @@ expl(long double x) /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; - ix = hx & EXPMASK; + ix = hx & 0x7fff; if (ix >= BIAS + 13) { /* |x| >= 8192 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (u.xbits.manh != 0 diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c index d2faad22a230..e2954733f8ac 100644 --- a/lib/msun/ld80/s_expl.c +++ b/lib/msun/ld80/s_expl.c @@ -45,13 +45,9 @@ __FBSDID("$FreeBSD$"); #include #endif -#include "math.h" -#define FPSETPREC -#ifdef NO_FPSETPREC -#undef FPSETPREC -#endif -#include "math_private.h" #include "fpmath.h" +#include "math.h" +#include "math_private.h" #define BIAS (LDBL_MAX_EXP - 1)