From patchwork Wed Apr 27 04:39:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566751 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4183486map; Tue, 26 Apr 2022 21:46:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhKT8ud/V4iZ/7Gj3evirfFvWxLNhzXvbLM5fNKXegLGSqtp6OC6Zm4nlOlnFBYvzm55L/ X-Received: by 2002:a37:e106:0:b0:69f:81cd:5f5b with SMTP id c6-20020a37e106000000b0069f81cd5f5bmr2967926qkm.164.1651034777945; Tue, 26 Apr 2022 21:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651034777; cv=none; d=google.com; s=arc-20160816; b=If3+rFmPEfmnBtzFwsSOnwOLYvo3FhRSWNmcN0OuSF1CPqPBkBNqB4J++cf++DHA0m TQPFSb7/u2cmFXNxfxdeeWz6Uql/aTKysMEGbjdesPKeNC970fIH1XSqSWqsGm083cLj cHLD/GjCUXC2ANE+W/HGi+Z4fHulec/p4ZAvTf2FHYvF3d0jr8gacqEYz/d+vHZ58kZ3 WGxljKq2A3nhci1tqWqRfi+zdM2APZx96KR83jIQRgWTdS7qBssnIaVB7LVh3mtUJGLc Brg6iTFPNKGWOj1Z5ocM0BmpyPLDjAnpixsQzUhwHt0LsMDKB1PCp2z8yryug1wTCg4X OG9w== 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=1o9si1s5HiM2x4iDuDzWhxWXoWFSwko9HR+xkw5Bkro=; b=Hpt3jkTC5WglXQ5+FDgv9Plxk/4PC3yucTJy5v6VAffTqm5Qp18z/EGH5GOys71kDB YybOuEStGXKS1MDvdXK0ER+zkTFiy9YP/xaudIbYFlMfhlZKmoJ82o7p0ZmmNIy4hzHA HM3etIl7bnC5ZRYtQcuxqUlrspJWwAmUhwCxQI7F+fydvB5OnsMT2pItrKB3tfwVDHrq ZLuIq+5Nt6u6XwN0Zg4pSRaC5+Dgv+1onY8shOtIS6FNuxwX8yFjHEoAIG3zCR74fmnx sRlooPh1r5OgU/u3njP67SaWgNfhU3ZpeosIpOKpukEANst9VODk0bIkq89C5QDzhg0x vOBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RqU2SZ3M; 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 g11-20020ac87d0b000000b002f1f559e978si100339qtb.421.2022.04.26.21.46.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 21:46:17 -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=RqU2SZ3M; 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]:34226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njZZB-0002Qh-Ic for patch@linaro.org; Wed, 27 Apr 2022 00:46:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njZSy-0001Jd-C2 for qemu-devel@nongnu.org; Wed, 27 Apr 2022 00:39:52 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:40737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njZSw-0007Sc-PN for qemu-devel@nongnu.org; Wed, 27 Apr 2022 00:39:52 -0400 Received: by mail-pf1-x42a.google.com with SMTP id i24so599453pfa.7 for ; Tue, 26 Apr 2022 21:39:49 -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=1o9si1s5HiM2x4iDuDzWhxWXoWFSwko9HR+xkw5Bkro=; b=RqU2SZ3MnBRRWZG0WzVeLaiPs8q8KL7AWEqyvpVJDxs3XUvO78jAP4+cQsuqaeXQi6 OHODAs9jjkfCc62gko5Mdt0eVN0Z4pxqGOHddZXEUTw4sg5ms5+NRa8jyld9i8JRQA5x 5Dlb+upSCfIk2k6XiW0aUGcUYXHJZ/5gz5cQRHodZjmgHBvQeW41n/YVCahP1Wz9Zw41 3DU89XIqh2TP0qiXbbStF6V/lIQZWyyMyLy+TSwVUWXgqHiiuLIp4mLW8Hxh9UykdsHV hjt099KZV//S0GFGvBGxcLuIW0SWg1tIkehJlagTgbda83lmwIqBDn7URyV2zrh7gjze PHHw== 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=1o9si1s5HiM2x4iDuDzWhxWXoWFSwko9HR+xkw5Bkro=; b=KCwhXos6Nunoz23OaW7lSifI1HbgfhHUeKb3mWZM7FhaDIYD+Xp3C2eiTCGnAe3cKc +mipSgbj3dYGKvN/RewVTQBwOp5FJK6Xf0YYbrSPCkRQT0VKJb3Kyj1scP0ORV5K04pa Rnwx3R4eg9PpPLEPbBj68u5TaOWS29iOkKyaF4VFWJOPpmPqQtsxQBzV/BPm6dhwIhQb 0BqFANmlMj4OKb82L77gFx5qcx3THgGUeYe1nlwVo8FBu3XB14l4hneFI7Xzof8FaSBN L2W9YyN3av+L5apIIz6OCRTt0kIHqFTTjAiL1Eyrq06O+BSieG1Uda2itcPhh5ARTPPk OV9A== X-Gm-Message-State: AOAM530nGFg4NLNjCu0yOdbfo14Tc6HKw1Pslm6gQYndAr6By/s0i5eY 3A4oOQJ6Wyo6jIVLRqRRRH1unDxFxOuzqg== X-Received: by 2002:a05:6a00:1a8f:b0:50a:8c2d:2edf with SMTP id e15-20020a056a001a8f00b0050a8c2d2edfmr27666752pfv.82.1651034388360; Tue, 26 Apr 2022 21:39:48 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f16-20020aa78b10000000b0050a81508653sm16875632pfd.198.2022.04.26.21.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 21:39:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 5/6] softfloat: Use FloatRelation within partsN_compare Date: Tue, 26 Apr 2022 21:39:41 -0700 Message-Id: <20220427043942.294654-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220427043942.294654-1-richard.henderson@linaro.org> References: <20220427043942.294654-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 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 Message-Id: <20220401132240.79730-3-richard.henderson@linaro.org> --- 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;