From nobody Mon Feb 9 01:51:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648819664; cv=none; d=zohomail.com; s=zohoarc; b=bU8GLKnXJrg4dqSMN0efrUOfGX2mL6NrLhR/fUVbZ8jccebe8diH7eYCRNHu62KO5AF7kYfPxIKFO+HTLwhjpeApwIkL45yAk6vNFd4Jpi9ld8yByxDH4gVIbgfL49x2vwCUu/8sWNWjQYYWlOr1ICcRldpWbqzKHJ20BARIaHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648819664; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RbIV1+8NyqMJlYAlK7WMJI7CdKY136/WMhV7maG3bQw=; b=C1wY7EYLGtp1NwD6YimBSqQYBp0c+/RY2H2A49+ctAVJpzdyQELMxryeobzmdNRmqkzkjV3atWDMmvJVOin8RhK26fo1R8XyA71CLfxT6RqLGFWd/Rmy/qIQ8/feuqQ/xTiR14K3kqL/DhRiVFA1Q21h0cjx/LJ8ChUuRisxmWo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648819664713764.7257110066682; Fri, 1 Apr 2022 06:27:44 -0700 (PDT) Received: from localhost ([::1]:58524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHJX-0005nP-AE for importer@patchew.org; Fri, 01 Apr 2022 09:27:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naHEj-0007bs-Sd for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:45 -0400 Received: from [2607:f8b0:4864:20::32a] (port=39787 helo=mail-ot1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naHEi-0006xj-Hj for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:45 -0400 Received: by mail-ot1-x32a.google.com with SMTP id a17-20020a9d3e11000000b005cb483c500dso2106273otd.6 for ; Fri, 01 Apr 2022 06:22:44 -0700 (PDT) Received: from localhost.localdomain (fixed-187-188-190-73.totalplay.net. [187.188.190.73]) by smtp.gmail.com with ESMTPSA id x1-20020a4ae781000000b00320d5d238efsm1006935oov.3.2022.04.01.06.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:22:42 -0700 (PDT) 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=RbIV1+8NyqMJlYAlK7WMJI7CdKY136/WMhV7maG3bQw=; b=N5JhM7vd1/+ttZgA3ovc3BAm9ZxkmQYMeWRxVIz9gc+Jcn8PsEQh3RhvasqyJndYUW gQ6QPIMGBKtndW07jzKzpXNMPMdg5YOwi+k8l4crXsnIHfz780x9PRyTlql5087wZXpZ lsEm9+nsdpy6grqd2VG0SyfibAyvEFG6W8kLWVg0TOtakVsrMDRuxwI/Ve16UfJzTNS+ 6sDIIwZRsAvj2ZX+zWOWPi0Xte3mT21UzCCpXg3OQcYYebZR1fVxlgX93tV5JMhG/WJO bUDymzdJeMp8lyosj3yiLgo03XwThxfMSkL3l5GVyLy/xU7Wck8pji5zOS/KjtrGpDm9 ctGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RbIV1+8NyqMJlYAlK7WMJI7CdKY136/WMhV7maG3bQw=; b=BWrmvKrVn5iO3Q6PfrCK49smhVohJ38yDOg2hAI7tWPHXiykTO5j6cTjVbNqpvbn91 x94c40dfH5m4QKoqFZ2wF55U6PhZ1oeLKS9N9kIDhBVEFokfV/3D2ScmYnmqMrZLCFNR x3sIXmod+zxGsIgmMNVlhY2uFwzPOke6g2Kx731nimxQ95D+NnMPQcfRCO9yKscDEWMe RkgxIgHw6QrMwmX7rj7kAbggyIvLzRPTYr9vN79wA+jqgHTEIpXWoZYPikGttVgkbYjW S9z/0q+QsAttfn+Coy1Y3tcIbpyz1EUdOXvnYOEhvwD4rswEj8SZ90cXQ0pGEeYj1tjf 7vAg== X-Gm-Message-State: AOAM533JXzvhM8DwmJjezxF+1T6HSA73RLaCD/tsdC/47Z5pekU+pUcj aos5FCQxU6HSGhClTUlnT6Rp+mPTYuTJx1QmPfw= X-Google-Smtp-Source: ABdhPJzCjc9CfXxpAiZmTM0luYlIZlZN3nKc+sDhCBggWuPvHLgeLDSTQbYded7izcAhYbdly4lQSg== X-Received: by 2002:a05:6830:1d70:b0:5b2:2c27:be29 with SMTP id l16-20020a0568301d7000b005b22c27be29mr7415773oti.89.1648819363510; Fri, 01 Apr 2022 06:22:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/3] softfloat: Fix declaration of partsN_compare Date: Fri, 1 Apr 2022 07:22:38 -0600 Message-Id: <20220401132240.79730-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401132240.79730-1-richard.henderson@linaro.org> References: <20220401132240.79730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::32a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::32a; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648819665054100001 Content-Type: text/plain; charset="utf-8" The declaration used 'int', while the definition used 'FloatRelation'. This should have resulted in a compiler error, but mysteriously didn't. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- fpu/softfloat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 7f524d4377..7e62fcf414 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -874,10 +874,10 @@ static FloatParts128 *parts128_minmax(FloatParts128 *= a, FloatParts128 *b, #define parts_minmax(A, B, S, F) \ PARTS_GENERIC_64_128(minmax, A)(A, B, S, F) =20 -static int parts64_compare(FloatParts64 *a, FloatParts64 *b, - float_status *s, bool q); -static int parts128_compare(FloatParts128 *a, FloatParts128 *b, - float_status *s, bool q); +static FloatRelation parts64_compare(FloatParts64 *a, FloatParts64 *b, + float_status *s, bool q); +static FloatRelation parts128_compare(FloatParts128 *a, FloatParts128 *b, + float_status *s, bool q); =20 #define parts_compare(A, B, S, Q) \ PARTS_GENERIC_64_128(compare, A)(A, B, S, Q) --=20 2.25.1 From nobody Mon Feb 9 01:51:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648819437; cv=none; d=zohomail.com; s=zohoarc; b=eWqWybZbW0ZauZiLdD5+Ml5Ch9hQFnO5GVylMdOEnyKOni47S7GVdKLd7piP051xZxWYf5xIFTq29EEbXriuzkQZMu5BhOakVcoW4uRX26gm4oJP46XSqEKszg3f7hM5KayVAZkp5p7rFzX6ugLMdfFDyYjpzn7bimtzgnoTY+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648819437; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K5QsF/Me1sMjqXAPM+MvX4EF+gM2USL9xlcban/HSlc=; b=kk97deRfTe7Iq+0qz0HNOPcspsmXWu0fgTkdce4af6VLoE6D4AB/LNDRlZr5p2Fla7XA7jpijse+XFMNgMKXKKAdnaKkwsBc9otZkUhyR2dWlpQEb+VLw0urm2UL/5N9dcXOQ5GJjT/lhsTKYTdgFmx+Ujr9bwej3Qffzt7msCM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648819437332874.2750890224492; Fri, 1 Apr 2022 06:23:57 -0700 (PDT) Received: from localhost ([::1]:52218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHFs-00012r-5Q for importer@patchew.org; Fri, 01 Apr 2022 09:23:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naHEl-0007gR-BA for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:47 -0400 Received: from [2607:f8b0:4864:20::229] (port=34798 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naHEj-0006xt-PW for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:46 -0400 Received: by mail-oi1-x229.google.com with SMTP id v75so2817800oie.1 for ; Fri, 01 Apr 2022 06:22:45 -0700 (PDT) Received: from localhost.localdomain (fixed-187-188-190-73.totalplay.net. [187.188.190.73]) by smtp.gmail.com with ESMTPSA id x1-20020a4ae781000000b00320d5d238efsm1006935oov.3.2022.04.01.06.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:22:44 -0700 (PDT) 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=K5QsF/Me1sMjqXAPM+MvX4EF+gM2USL9xlcban/HSlc=; b=O8DulEcYqp/vrodFX0dZNxQyXLKQNC3uhWIgvYWxhPhUFY+jeCk5n72x51p+RvPY1V b2EznYySCa+4DHgNr2jtHeU6VKrBlDMHtHkzkSSYqaem0djOptH3xm1igY21GkeeGy3K F72VuuyXQU4M7GTkX/paTMk1LP51Zq3jc+itWzgi2VEo4yIoNlGJyGmQGLjgAIbmBU3V WUSgfrtmwXZr5xecAYXVVUDllgShxuNez8wOXFuXzEuHSju5Jga64zJi0gZOc8jmUcv2 wwbpsy4k0jb26IGdZuozn2w8+deN468t7sG/0I65EynGKgG/mzEVHBXmVcdz9B/3j3CC JB4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K5QsF/Me1sMjqXAPM+MvX4EF+gM2USL9xlcban/HSlc=; b=q+PVisMPHzZ0lF0+MzR+MZJeadnazf29wNgGf54sFSSyy2AJTBzgmVT64xbrY77LEB NwQ7l0ZZtHiD2n05EKJXW1m9jaNe9TYse2c+Nv4r5HRop2wXi8y/wejVQhLRm5HtJkqG YGjqAoAWIVKcEXZfxKyJ6nx2GjEzHADcinfaSj2gB3oIn4jOlOwyqQ/rw9ksNIdAhcY6 7HPAO+hc9ujodYnxn0aYHRPn6sTeqexMbFX4mrCdrRLrEyKPVMEBfagB6BAt4vF1f+1a jxPEaKj01z/yxPwXu0UdTjjE5nNKMfK3OGal65Ay/3T++BH/hX9vNOYytrT2fNWSndLA 1B7g== X-Gm-Message-State: AOAM530wqkIv6qv9rCrP/9vguJP9iuzQe/DA6AtKs3ep99zBfSnzSnTB qOPXcExTII4ADcpDShYHyzDTBZIMn3RoG5npCAY= X-Google-Smtp-Source: ABdhPJx0pgWrWK4Rs9Fwz6UnLfwP1231FNLIOj045W9CGYrlxuQmGjt47c3kFg1oi2pR1jTJsTcMdQ== X-Received: by 2002:aca:f288:0:b0:2f4:6cb:4c84 with SMTP id q130-20020acaf288000000b002f406cb4c84mr4506901oih.185.1648819364748; Fri, 01 Apr 2022 06:22:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/3] softfloat: Use FloatRelation within partsN_compare Date: Fri, 1 Apr 2022 07:22:39 -0600 Message-Id: <20220401132240.79730-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401132240.79730-1-richard.henderson@linaro.org> References: <20220401132240.79730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648819438896100001 Content-Type: text/plain; charset="utf-8" As the return type is FloatRelation, it's clearer to use the type for 'cmp' within the function. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- fpu/softfloat-parts.c.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fpu/softfloat-parts.c.inc b/fpu/softfloat-parts.c.inc index db3e1f393d..bbeadaa189 100644 --- a/fpu/softfloat-parts.c.inc +++ b/fpu/softfloat-parts.c.inc @@ -1327,16 +1327,19 @@ static FloatRelation partsN(compare)(FloatPartsN *a= , FloatPartsN *b, float_status *s, bool is_quiet) { int ab_mask =3D float_cmask(a->cls) | float_cmask(b->cls); - int cmp; =20 if (likely(ab_mask =3D=3D float_cmask_normal)) { + FloatRelation cmp; + if (a->sign !=3D b->sign) { goto a_sign; } - if (a->exp !=3D b->exp) { - cmp =3D a->exp < b->exp ? -1 : 1; - } else { + if (a->exp =3D=3D b->exp) { cmp =3D frac_cmp(a, b); + } else if (a->exp < b->exp) { + cmp =3D float_relation_less; + } else { + cmp =3D float_relation_greater; } if (a->sign) { cmp =3D -cmp; --=20 2.25.1 From nobody Mon Feb 9 01:51:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648819663; cv=none; d=zohomail.com; s=zohoarc; b=jnqqPBoWQXF4g/UJpioEe+ejPinx852uWsKhnJU9ioYNvTD15fulfpo0kWjC2V8TMpa9vIFMmw7HaYRRsc3elEU+30mHw47Ylio8APlNwvn0tzqbTHyDvypA2d48SkOCitrYK3j+uePnudyJkvv7eocszro+EXZFch5t3283YA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648819663; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hR2ubnJbTaR/99ZxIVHKnu/SsnV6lFaufZKu6ufkBwc=; b=i8VflJgpsPRSv+4CmA59Uq4GcTNZKIWO5H6OTPhJnOwKe8E7Gry74JXSJcn8+ihVjGZbpSMrvJok+nPpXdBDOkXyQZ9Wk6gzc95LsOSS9vlSijD0EsgpIRf2Zl/Hc01wCr+gQoCC+5kqTbjawoCUG72uu4cBGCyhmS/JKy8YBnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648819663696406.36176701837474; Fri, 1 Apr 2022 06:27:43 -0700 (PDT) Received: from localhost ([::1]:58360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHJW-0005f9-Mh for importer@patchew.org; Fri, 01 Apr 2022 09:27:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naHEm-0007j2-FP for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:48 -0400 Received: from [2607:f8b0:4864:20::234] (port=35446 helo=mail-oi1-x234.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naHEk-0006y4-SH for qemu-devel@nongnu.org; Fri, 01 Apr 2022 09:22:48 -0400 Received: by mail-oi1-x234.google.com with SMTP id e4so2806717oif.2 for ; Fri, 01 Apr 2022 06:22:46 -0700 (PDT) Received: from localhost.localdomain (fixed-187-188-190-73.totalplay.net. [187.188.190.73]) by smtp.gmail.com with ESMTPSA id x1-20020a4ae781000000b00320d5d238efsm1006935oov.3.2022.04.01.06.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:22:45 -0700 (PDT) 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=hR2ubnJbTaR/99ZxIVHKnu/SsnV6lFaufZKu6ufkBwc=; b=w53LLeTF/FjRLW8+OQPpqfYzRL4IsXbrnAppHQqmTr58ljRXUzFJjNBIKk7yU7acfS UQlVKxNVPDlde2zCz33ZGZesUVoH5kRRsKl6KJXpiNAB02qE36gqEU/+gOg6310gF8lK lcxDp5iervWv3jzMnfjnTex6gPWo/jxqi4o0b+Tj/pyqocOaRMhR0NWvmivG/73mPLco 6W+lY28zN3u/GepK6JDtnowwkEzOHS2oUqOdBwD1WwA5nCgeFCMaoBQk9Nxvi8ixTRDL r8NJL7hyHRRMEifzo1DnF+bX9OgNguR3dAee9k5a1dRX24EGwfYikNqx2EeNHAIi8B+j MCPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hR2ubnJbTaR/99ZxIVHKnu/SsnV6lFaufZKu6ufkBwc=; b=6QB1yktLq+tDjiGov4Xx16JWVxAdfoh1+mqcxoiWQMzxfk7ljl2hdXPe2KjQsdisjO S+MgEY9wBuflVAkI2m2/cNecr8eEf9T6rUrRnKau3nSny7Q88qOGCL/hnkSzIQ0nTRtL MT64krpE/1MzBaBLsOUxvzI+aZW7M8AeSeyufgsjiWOmYVS1Wjh0juNbZlM55yLM9Pwd A5EVjG2z1FirDj0Awu7zZ6Txjc9m0b+3TrhqTClWCPXTy3ioercQ4mixDLihMyiUopms 8q7/fXGl+zQzHGaiCbQ+O0ZYOMHdXDUo4kLaHKuMPuhWoYWEft9Qf2y0AAQKtT2JBN5j MBCA== X-Gm-Message-State: AOAM533GMk5o/C4GJQSfKNeSqVd4C1XzVGdmqJtBttcB95uFzzXMrgJg wjhpYYFUXsOVBcBbcSVypRPr3pDmhFJGX5bE4+8= X-Google-Smtp-Source: ABdhPJx5LDoGhaqWtiRG4w62I1vrz7AE998Iurl9Fd4bJ2vSClBD5/JtKSscfKIFJJnW1/w7BH3gvQ== X-Received: by 2002:a05:6808:1294:b0:2f7:5e83:f0f with SMTP id a20-20020a056808129400b002f75e830f0fmr4948992oiw.77.1648819365818; Fri, 01 Apr 2022 06:22:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/3] softfloat: Use FloatRelation for fracN_cmp Date: Fri, 1 Apr 2022 07:22:40 -0600 Message-Id: <20220401132240.79730-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401132240.79730-1-richard.henderson@linaro.org> References: <20220401132240.79730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::234 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x234.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648819665118100004 Content-Type: text/plain; charset="utf-8" Since the caller, partsN_compare, is now exclusively using FloatRelation, it's clearer to use it here too. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- fpu/softfloat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 7e62fcf414..9f2d4e7a29 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -957,21 +957,23 @@ static void frac128_allones(FloatParts128 *a) =20 #define frac_allones(A) FRAC_GENERIC_64_128(allones, A)(A) =20 -static int frac64_cmp(FloatParts64 *a, FloatParts64 *b) +static FloatRelation frac64_cmp(FloatParts64 *a, FloatParts64 *b) { - return a->frac =3D=3D b->frac ? 0 : a->frac < b->frac ? -1 : 1; + return (a->frac =3D=3D b->frac ? float_relation_equal + : a->frac < b->frac ? float_relation_less + : float_relation_greater); } =20 -static int frac128_cmp(FloatParts128 *a, FloatParts128 *b) +static FloatRelation frac128_cmp(FloatParts128 *a, FloatParts128 *b) { uint64_t ta =3D a->frac_hi, tb =3D b->frac_hi; if (ta =3D=3D tb) { ta =3D a->frac_lo, tb =3D b->frac_lo; if (ta =3D=3D tb) { - return 0; + return float_relation_equal; } } - return ta < tb ? -1 : 1; + return ta < tb ? float_relation_less : float_relation_greater; } =20 #define frac_cmp(A, B) FRAC_GENERIC_64_128(cmp, A)(A, B) --=20 2.25.1