From nobody Sun Oct 26 00:03:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521663240400341.3209531464495; Wed, 21 Mar 2018 13:14:00 -0700 (PDT) Received: from localhost ([::1]:57123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyk7O-0003Pc-Ad for importer@patchew.org; Wed, 21 Mar 2018 16:13:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyk5V-00029w-U3 for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyk5Q-0000yF-Qj for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:11:57 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53503) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyk5Q-0000xT-M0 for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:11:52 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3BE20213C6; Wed, 21 Mar 2018 16:11:51 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 21 Mar 2018 16:11:51 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id E4AEA7E0D6; Wed, 21 Mar 2018 16:11:50 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=9WDOUEu01Mhi1L AxfrmvsEgvZoNghKOj8zGaKXDlGSo=; b=VOyblbxyBhr8k7A9z5rWLCGX1x9UvE sWmhf0C/K9CxZnG7IACRBW9kTXOtC7kPaH14aqv2kpSFBKw6PANuk2VX1fgnj1De GdLY85EiZUS/0rpnkCfrR9bykKWE6CIQWut/Vf9JhA/ikl1066dXz7f+i8KmUf6D Zq4ZyFfvEooo8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=9WDOUEu01Mhi1LAxfrmvsEgvZoNghKOj8zGaKXDlGSo=; b=Nruj6aif 6+X6UmdjPyNFwd4xZ3pfm9/DYVpkjDNakqS/dTaJ6rXI+DWrXx/3xqvpqOxsr/ow 84d1S4v3mtJ/99WSOfP6T0J3JPMKTHnYW8fAtSMSPsCFXob82M6Ls9jUA6d0Fwx4 oquwB5hh+fDIt9q6N5FGhsFPWotrdniJPtl6G/Dn/27P4xhEgKbKD4q+be1qKTcG +iomPvd400k4tAyPY+pjeZ1k3WPHrAtl2D7MvtuuQo3X0KEdtGcmIvs3Se0YbUni eRos6rbiyYllkhEx8b0IQL9RAJhp37GM7PZA0mrNSDO80dF8afuoec1yigtOrvjg iZ1yD85sByXxoQ== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2018 16:11:38 -0400 Message-Id: <1521663109-32262-4-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521663109-32262-1-git-send-email-cota@braap.org> References: <1521663109-32262-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH v1 03/14] softfloat: fix {min, max}nummag for same-abs-value inputs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Mark Cave-Ayland , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Before 8936006 ("fpu/softfloat: re-factor minmax", 2018-02-21), we used to return +Zero for maxnummag(-Zero,+Zero); after that commit, we return -Zero. Fix it by making {min,max}nummag consistent with {min,max}num, deferring to the latter when the absolute value of the operands is the same. With this fix we now pass fp-test. Signed-off-by: Emilio G. Cota Reviewed-by: Alex Benn=C3=A9e --- fpu/softfloat.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e124df9..ee615a9 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1700,7 +1700,6 @@ static FloatParts minmax_floats(FloatParts a, FloatPa= rts b, bool ismin, return pick_nan(a, b, s); } else { int a_exp, b_exp; - bool a_sign, b_sign; =20 switch (a.cls) { case float_class_normal: @@ -1731,20 +1730,22 @@ static FloatParts minmax_floats(FloatParts a, Float= Parts b, bool ismin, break; } =20 - a_sign =3D a.sign; - b_sign =3D b.sign; - if (ismag) { - a_sign =3D b_sign =3D 0; + if (ismag && (a_exp !=3D b_exp || a.frac !=3D b.frac)) { + bool a_less =3D a_exp < b_exp; + if (a_exp =3D=3D b_exp) { + a_less =3D a.frac < b.frac; + } + return a_less ^ ismin ? b : a; } =20 - if (a_sign =3D=3D b_sign) { + if (a.sign =3D=3D b.sign) { bool a_less =3D a_exp < b_exp; if (a_exp =3D=3D b_exp) { a_less =3D a.frac < b.frac; } - return a_sign ^ a_less ^ ismin ? b : a; + return a.sign ^ a_less ^ ismin ? b : a; } else { - return a_sign ^ ismin ? b : a; + return a.sign ^ ismin ? b : a; } } } --=20 2.7.4