From patchwork Fri Apr 1 13:22:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 555571 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp1542743mag; Fri, 1 Apr 2022 06:27:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJPbyfRbYG94r6532/dPVO2puRcvxHclDyWKb38ocHs2P35tj0pl6nhMipHytdBX0T3ytN X-Received: by 2002:ad4:5cc3:0:b0:441:1959:cb51 with SMTP id iu3-20020ad45cc3000000b004411959cb51mr8118661qvb.112.1648819643212; Fri, 01 Apr 2022 06:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648819643; cv=none; d=google.com; s=arc-20160816; b=ortYQkn3mH775gq5BXkg5bMreZwFCVu3DU6Qt94y5zO46LEkRadOY2DaYPTwGfPxYP mKva+4JPfiWLWyfk6kaC64mbQk40+Cd03QF8xK4ZVIFg4jHeTUsRAyUqM5Co2g1tShw9 AHarnYnqu2X9dk4WBB0ccEKIGBjA/dQe5ffLeTqikXJ7RMMgv6+RBcMtjFneOv6QabKH sZ5Nv5v1GCGv48RC38XMa20BC1D4qQEFCEvdppvuEu1xBMu6vM5un1EINllPLu279/FY Tda2SPi6Oo5EYY5cIOBLEYJH+WXtaFc37HUEPNSvt3SntkOkgPYFjD9hrkVD5CQwwioB 2ZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RbIV1+8NyqMJlYAlK7WMJI7CdKY136/WMhV7maG3bQw=; b=bbwR5ur7Kyuf1BMG3EJbiajUANfeuDMSJZvgxftn7E5xle0fb/ZHgPYrePAOf4kN/d 3W1k8ohhZk1ABSsWEFViWp7U88Y/4ujleAWvBdDuoD6/gR2opcB5VzDFUKqn9UvJi6Ct FDybi0BzqTakfpi7U8ExD+5Vc86dotexvk3u2+ZS4Yu9NGKQ/iegCadyPlDAhIhuMPuq UcsefHZjHCtGcBovc4nrYQ0frXAXLdAS6Uxj8zBSHwtp85mucql/ZDqw+gsO/mirLk2R 91068QWAjtDShPEHyq2eGA0jy5nh1/j4OpT0DtLnRaYHUGj199Fw8ZoC+AxBc/6VTgnj +JIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N5JhM7vd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b8-20020ac87548000000b002e2292981a3si906561qtr.710.2022.04.01.06.27.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Apr 2022 06:27:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N5JhM7vd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHJC-0003Tk-MA for patch@linaro.org; Fri, 01 Apr 2022 09:27:22 -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) 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-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) 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) 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::32a (failed) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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) -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); #define parts_compare(A, B, S, Q) \ PARTS_GENERIC_64_128(compare, A)(A, B, S, Q) From patchwork Fri Apr 1 13:22:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 555568 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp1539640mag; Fri, 1 Apr 2022 06:23:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgIYSw3NgMbqnTzIVoY9CR3vBEoGsNInVfPHrKSQ2BId/P8W3E1Gl2GN6NF1qEUDLGUE0f X-Received: by 2002:ae9:f104:0:b0:680:d12c:18f4 with SMTP id k4-20020ae9f104000000b00680d12c18f4mr6501848qkg.332.1648819413459; Fri, 01 Apr 2022 06:23:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648819413; cv=none; d=google.com; s=arc-20160816; b=tgNhnY7PIQwRIY9Nbx8Ab4pk8k98KU8C/4GnDYwOgpKcVFqEShE4dMyV80RK1uinmR BvLkHfU7K2ySCAm3ZbawhujsL5P1PJbbXRHABxJGftxi8z9yyz7PsweK10wB0cSahW7K jjeBIbWm5uTivfHL4mUcU6mZ5CQGx45VhMzclup5aPGUGMptqwylRQiBR6/rI5ida20W S5BSngZ/iTvYW0m95xBfwcta3fO4WKtECBlQT5VgmbrQ4G88koetrILxJjz0GGD8n7pK MK1uPO6qC6f/zPhf1knDuKNHTDjbJjMRYY+POCWsd0ko418IiAgLYI5u7TKZjfzJPigm vRAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=K5QsF/Me1sMjqXAPM+MvX4EF+gM2USL9xlcban/HSlc=; b=sXpiXYEERz8oFL577L3gZymvMkZxMD/8czT68aQL8xL+9FXcy5hsd22largpQbokK/ CCAnVf0IuJWU8CiaAnCWlseyfm6HLrFkI34xq4ml4PSjurIi2X7XakjxWgXuit9U+99w NXezpFzPSEu4VAKrn7vw+F6Yz79KWw65WVcheivolgEFtbF7h5nbi8tqVgMLDrHUwwBx n3cmbXhs75WxW12fFkn4a8pIy+Tt1x4EXqGcKIXQ996Bj7lcuAAqd9Xfxg2WhK6E7s0/ 9xL3U49ODCcjRf2w5EESXsKA4shfbiFwsj/Q2KXbBTvLEIbWEx61ByA2iOzTYUdSVCuA KMLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O8DulEcY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 17-20020ac85651000000b002e1fbf3c104si910667qtt.757.2022.04.01.06.23.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Apr 2022 06:23:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O8DulEcY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHFV-0007kg-1v for patch@linaro.org; Fri, 01 Apr 2022 09:23:33 -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) 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-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) 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) 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 = float_cmask(a->cls) | float_cmask(b->cls); - int cmp; if (likely(ab_mask == float_cmask_normal)) { + FloatRelation cmp; + if (a->sign != b->sign) { goto a_sign; } - if (a->exp != b->exp) { - cmp = a->exp < b->exp ? -1 : 1; - } else { + if (a->exp == b->exp) { cmp = frac_cmp(a, b); + } else if (a->exp < b->exp) { + cmp = float_relation_less; + } else { + cmp = float_relation_greater; } if (a->sign) { cmp = -cmp; From patchwork Fri Apr 1 13:22:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 555570 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp1542731mag; Fri, 1 Apr 2022 06:27:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4HaRF3TyDiTWEEImNOzPWvktaZmAbAnd6y5npnQvIPYbHCcbZmlz7AXsz3s3Amm1JhIDD X-Received: by 2002:a05:620a:c55:b0:67e:125b:38ea with SMTP id u21-20020a05620a0c5500b0067e125b38eamr6435419qki.396.1648819642323; Fri, 01 Apr 2022 06:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648819642; cv=none; d=google.com; s=arc-20160816; b=vFuJzgQctlbUw1SWMtmGv6Bk6O7+AsxbdTKGUMmiHYSBYl3ufjZRuRUd+YV5/4Dzr1 U/6C4giKEZDbS6wFV/aJ9DnNOX1JcuRv7c3CI2waAfivKqeEOmZonpLfT8AJwielbXRy dJ1h1Sti+2LEQoUF/ojQ+F1VSX2z9Kh5ycnCO75fVl99Lh+Ty8TRPhMb3ApIGc96qVlh 9gbfPx/4wTU/1ypHFGFpHI1uAhqtYYLwrkq+Tulgh23CnooIM10zW6bkU9WS88I5JOTa zVulV69/XEUNocc5WuENYWu5MmMeg5XZI3aHznaeCtEAhKcNXg7K7olvOo3LfnQ1hrbi C2Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hR2ubnJbTaR/99ZxIVHKnu/SsnV6lFaufZKu6ufkBwc=; b=ivPqKE0mpyJKJMZ61R8Z70p7DklGMT4jC9UFWvz6oj1MtH4mKtVfQINHftbuqD/b21 umgWrIoFjPiEU8Y4OtEzioGIDGGVusIhWjhlEpIVfvIWuz10QM343xGHtY+tUVHB2qJT 6zbPP1sg0zFbNzW9gw3lcjI3zxI0azgpZyKAuYn1IUL8V2oE8+5MiIGi6XsOhwenHcw/ Q/jSfo3U2OkxJCE7u4wlBUUSJE4G3QXDJGzS9hfJ/RHW2LhKDvW3rBCq7khLIPk9avkn h0rE3UDnYYIUoK1IJJr+oNHmdy3v9y9GeEaEqWQA54jv2Yh3fMPNFMjK5o4bk2CEPMpr APeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w53LLeTF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b4-20020ac87544000000b002e1fbf3be78si975679qtr.105.2022.04.01.06.27.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Apr 2022 06:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w53LLeTF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naHJB-0003OV-Rz for patch@linaro.org; Fri, 01 Apr 2022 09:27:21 -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) 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-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) 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) 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::234 (failed) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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) #define frac_allones(A) FRAC_GENERIC_64_128(allones, A)(A) -static int frac64_cmp(FloatParts64 *a, FloatParts64 *b) +static FloatRelation frac64_cmp(FloatParts64 *a, FloatParts64 *b) { - return a->frac == b->frac ? 0 : a->frac < b->frac ? -1 : 1; + return (a->frac == b->frac ? float_relation_equal + : a->frac < b->frac ? float_relation_less + : float_relation_greater); } -static int frac128_cmp(FloatParts128 *a, FloatParts128 *b) +static FloatRelation frac128_cmp(FloatParts128 *a, FloatParts128 *b) { uint64_t ta = a->frac_hi, tb = b->frac_hi; if (ta == tb) { ta = a->frac_lo, tb = b->frac_lo; if (ta == tb) { - return 0; + return float_relation_equal; } } - return ta < tb ? -1 : 1; + return ta < tb ? float_relation_less : float_relation_greater; } #define frac_cmp(A, B) FRAC_GENERIC_64_128(cmp, A)(A, B)