From owner-svn-src-head@FreeBSD.ORG  Mon Jun 24 19:12:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E0C451C9;
 Mon, 24 Jun 2013 19:12:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D367619A0;
 Mon, 24 Jun 2013 19:12:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OJCHj5003634;
 Mon, 24 Jun 2013 19:12:17 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OJCHi9003632;
 Mon, 24 Jun 2013 19:12:17 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306241912.r5OJCHi9003632@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 24 Jun 2013 19:12:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252170 - head/lib/msun/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 19:12:18 -0000

Author: eadler
Date: Mon Jun 24 19:12:17 2013
New Revision: 252170
URL: http://svnweb.freebsd.org/changeset/base/252170

Log:
  Make the order of operations for lib/msun more clear.
  
  Tested with md5 sum of object code
  
  Reported by:	swildner@DragonFlyBSD.org
  Submitted by:	bde

Modified:
  head/lib/msun/src/s_fma.c
  head/lib/msun/src/s_fmal.c

Modified: head/lib/msun/src/s_fma.c
==============================================================================
--- head/lib/msun/src/s_fma.c	Mon Jun 24 18:41:28 2013	(r252169)
+++ head/lib/msun/src/s_fma.c	Mon Jun 24 19:12:17 2013	(r252170)
@@ -117,7 +117,7 @@ add_and_denormalize(double a, double b, 
 	if (sum.lo != 0) {
 		EXTRACT_WORD64(hibits, sum.hi);
 		bits_lost = -((int)(hibits >> 52) & 0x7ff) - scale + 1;
-		if (bits_lost != 1 ^ (int)(hibits & 1)) {
+		if ((bits_lost != 1) ^ (int)(hibits & 1)) {
 			/* hibits += (int)copysign(1.0, sum.hi * sum.lo) */
 			EXTRACT_WORD64(lobits, sum.lo);
 			hibits += 1 - (((hibits ^ lobits) >> 62) & 2);

Modified: head/lib/msun/src/s_fmal.c
==============================================================================
--- head/lib/msun/src/s_fmal.c	Mon Jun 24 18:41:28 2013	(r252169)
+++ head/lib/msun/src/s_fmal.c	Mon Jun 24 19:12:17 2013	(r252170)
@@ -113,7 +113,7 @@ add_and_denormalize(long double a, long 
 	if (sum.lo != 0) {
 		u.e = sum.hi;
 		bits_lost = -u.bits.exp - scale + 1;
-		if (bits_lost != 1 ^ (int)(u.bits.manl & 1))
+		if ((bits_lost != 1) ^ (int)(u.bits.manl & 1))
 			sum.hi = nextafterl(sum.hi, INFINITY * sum.lo);
 	}
 	return (ldexp(sum.hi, scale));