From owner-svn-src-all@FreeBSD.ORG  Thu Jul 26 03:59:34 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 88E6E106564A;
	Thu, 26 Jul 2012 03:59:34 +0000 (UTC)
	(envelope-from kargl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73FB38FC12;
	Thu, 26 Jul 2012 03:59:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6Q3xYV6032652;
	Thu, 26 Jul 2012 03:59:34 GMT (envelope-from kargl@svn.freebsd.org)
Received: (from kargl@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6Q3xXvj032649;
	Thu, 26 Jul 2012 03:59:34 GMT (envelope-from kargl@svn.freebsd.org)
Message-Id: <201207260359.q6Q3xXvj032649@svn.freebsd.org>
From: Steve Kargl <kargl@FreeBSD.org>
Date: Thu, 26 Jul 2012 03:59:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238783 - in head/lib/msun: ld128 ld80
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 03:59:34 -0000

Author: kargl
Date: Thu Jul 26 03:59:33 2012
New Revision: 238783
URL: http://svn.freebsd.org/changeset/base/238783

Log:
  * 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)

Modified:
  head/lib/msun/ld128/s_expl.c
  head/lib/msun/ld80/s_expl.c

Modified: head/lib/msun/ld128/s_expl.c
==============================================================================
--- head/lib/msun/ld128/s_expl.c	Thu Jul 26 03:50:24 2012	(r238782)
+++ head/lib/msun/ld128/s_expl.c	Thu Jul 26 03:59:33 2012	(r238783)
@@ -29,12 +29,11 @@ __FBSDID("$FreeBSD$");
 
 #include <float.h>
 
+#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

Modified: head/lib/msun/ld80/s_expl.c
==============================================================================
--- head/lib/msun/ld80/s_expl.c	Thu Jul 26 03:50:24 2012	(r238782)
+++ head/lib/msun/ld80/s_expl.c	Thu Jul 26 03:59:33 2012	(r238783)
@@ -45,13 +45,9 @@ __FBSDID("$FreeBSD$");
 #include <ieeefp.h>
 #endif
 
+#include "fpmath.h"
 #include "math.h"
-#define	FPSETPREC
-#ifdef NO_FPSETPREC
-#undef FPSETPREC
-#endif
 #include "math_private.h"
-#include "fpmath.h"
 
 #define	BIAS	(LDBL_MAX_EXP - 1)