From nobody Thu Mar 28 19:51:40 2024 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628386801760.8981372009872; Fri, 13 Apr 2018 07:06:26 -0700 (PDT) Received: from localhost ([::1]:55985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zLJ-00052j-T6 for importer@patchew.org; Fri, 13 Apr 2018 10:06:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zIl-000372-8F for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zIg-0000bi-SI for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:43 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zIg-0000bT-LE for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:38 -0400 Received: by mail-wr0-x243.google.com with SMTP id q13so4996193wre.3 for ; Fri, 13 Apr 2018 07:03:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l34sm5550517wre.14.2018.04.13.07.03.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:03:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2BCB93E0619; Fri, 13 Apr 2018 15:03:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=coFQ2xswQsFEuLwdZm8aY7T7ZboMuDSq8UFNZ8FMz/8=; b=RM71DflaqJFQVrf5lMV94dD25QxBCnjDzVtaCh/vNMwBXnXP4hYq9zGXvqVLH3ar20 65S1x+Q43HFMqyr8+bxnQXv9WO+FzRvxo096tCfcT+PQdRZbGNlaY9352oOHH+FHbdcO L3EuM80e3RcsF9PaAajmaF4qVHIVQ6rHlKVYw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=coFQ2xswQsFEuLwdZm8aY7T7ZboMuDSq8UFNZ8FMz/8=; b=XiF8s5JsmDe2OM4Lz1YSJWobgkEDJLodZvRl5G3nedGs9uQuwueH5bxMJi4nGReNmF LjPCDU214ilHAJvqiNMQIqV/faBWveX2fScZkOj6qIcX98UwQmOyOcbG34fl0pCWnuUP QKH+UBQxGUgFYiySXygwXKCZbeHliB0Nppnv3IpeQ55MRKWRqTqrWSVTvG8FkfgRD8p/ ebaDbRImXtak+JzsRDeDuLr/EEs7sdvAY80k7yG7svF/dHgvY1iax947sIGvV45rSYtr pB6vijJeJRoFKLdferWeSZ+Xq4Dnpx+Gd88q1CrfLbcTvalgaaLtW/5AerHFTaXE+kvg 26yw== X-Gm-Message-State: ALQs6tBeGYBGHdQLtW95HkOW2avGQozkTZKhr7CfTXUYTHyOrFB5DYN2 ixjyq1UUgiSsU9B/Nc0R3/NVxMBJDuw= X-Google-Smtp-Source: AIpwx4/tlgL2kQAiyp3Xy2MmWjSDza/7tzzIdS1FvZHaQtt7KuMrVsh597FiPqsQam6LQhxdSyQtLg== X-Received: by 10.28.113.22 with SMTP id m22mr3714130wmc.115.1523628217483; Fri, 13 Apr 2018 07:03:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 13 Apr 2018 15:03:33 +0100 Message-Id: <20180413140334.26622-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413140334.26622-1-alex.bennee@linaro.org> References: <20180413140334.26622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH v2 1/2] 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: "Emilio G. Cota" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: "Emilio G. Cota" 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Emilio G. Cota Signed-off-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 b46dccc63e..9b99aa6ec8 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1704,7 +1704,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: @@ -1735,20 +1734,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.17.0 From nobody Thu Mar 28 19:51:40 2024 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628341262624.6401688576101; Fri, 13 Apr 2018 07:05:41 -0700 (PDT) Received: from localhost ([::1]:55964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zKa-0004EX-B3 for importer@patchew.org; Fri, 13 Apr 2018 10:05:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zIl-00037P-PH for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zIf-0000bO-Vc for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:43 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:35317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zIf-0000b6-Or for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:03:37 -0400 Received: by mail-wr0-x241.google.com with SMTP id o3so8435937wri.2 for ; Fri, 13 Apr 2018 07:03:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l131sm3623179wmb.36.2018.04.13.07.03.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:03:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3E4873E061C; Fri, 13 Apr 2018 15:03:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EujjhTl4udGdJbhRHyWMrTYrxgmGjapgU23kkosbxs=; b=d1uzxxYZyizcYgh4AATAqFktEWXqN95tRaokTxI/lE93ee+aJg3lysJd92QIYxSv1o H7VVYDPEno1fvttamO/X4D7ptsLpadbWUJs4Nzb9BKUcuPKpCjlC6FwAuxk0JQ1hgUCQ LEYD1diO2s6UkskT+zXwA5uWEPjBm9xZLSsRc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7EujjhTl4udGdJbhRHyWMrTYrxgmGjapgU23kkosbxs=; b=VoWRzKrJcGpeuWJYq8vCUpts2nj2tSoj3vUccxagqh+j63Gh04EFtmUWufWe47XFxy Jm4J4jHeYEvrAblNWQb1rjaIvHPZD3Z8Fu26sHf2pBLReceix6a+SpeI+pnfdq6TPQoI 2Hi6DtYK+0ikD6gLuGqfS58OBi859GZSciSFCW/aWqZGxbEkZ75T/Km76jK3SmdTDo0x 1dZwdmkqHHi8jUbW3txeML0hCkH+qXYuJfWaANG2rRa8OcmKAUjBqXl+fQkzp4Haelab NWn87GHS3yN8hO96DHu8tIbOG2AoRu1tlGyOb3DDlvLcRl7jcCyefYnrycOBnSej1Snk hGwg== X-Gm-Message-State: ALQs6tAAjvnsO/e8b848WJ7A/Fsx+Y2xPv6rPffuoHHs5K7RmlMecNcA zTzgDLanA4htREgYixPw3DTxIg== X-Google-Smtp-Source: AIpwx4/Cs1kKXTXoYsrOVCNCA8+yMNtFaIf+q8nHWAzu225XiUJ9yPi1c5qOyYxBYryd5QzXanm9eA== X-Received: by 10.223.146.69 with SMTP id 63mr142067wrj.156.1523628216620; Fri, 13 Apr 2018 07:03:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 13 Apr 2018 15:03:34 +0100 Message-Id: <20180413140334.26622-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413140334.26622-1-alex.bennee@linaro.org> References: <20180413140334.26622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH v2 2/2] fpu/softfloat: raise float_invalid for NaN/Inf in round_to_int_and_pack 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: Bastian Koppelmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The re-factor broke the raising of INVALID when NaN/Inf is passed to the float_to_int conversion functions. round_to_uint_and_pack got this right for NaN but also missed out the Inf handling. Fixes https://bugs.launchpad.net/qemu/+bug/1759264 Signed-off-by: Alex Benn=C3=A9e Cc: Bastian Koppelmann Reviewed-by: Bastian Koppelmann Reviewed-by: Peter Maydell Tested-by: Bastian Koppelmann --- fpu/softfloat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 9b99aa6ec8..fb8663f59e 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1344,8 +1344,10 @@ static int64_t round_to_int_and_pack(FloatParts in, = int rmode, case float_class_qnan: case float_class_dnan: case float_class_msnan: + s->float_exception_flags =3D orig_flags | float_flag_invalid; return max; case float_class_inf: + s->float_exception_flags =3D orig_flags | float_flag_invalid; return p.sign ? min : max; case float_class_zero: return 0; @@ -1437,6 +1439,7 @@ static uint64_t round_to_uint_and_pack(FloatParts in,= int rmode, uint64_t max, s->float_exception_flags =3D orig_flags | float_flag_invalid; return max; case float_class_inf: + s->float_exception_flags =3D orig_flags | float_flag_invalid; return p.sign ? 0 : max; case float_class_zero: return 0; --=20 2.17.0