From patchwork Thu Feb 14 19:05:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158434 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1754720jaa; Thu, 14 Feb 2019 11:15:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IZTdRuobUguvRJ7ot+0SDVsoyTQZ5cHV47bDVuvg3w5iuYVkR6ZcsaS8FH4Y8tw9flWsLKA X-Received: by 2002:a81:7155:: with SMTP id m82mr4659149ywc.505.1550171714414; Thu, 14 Feb 2019 11:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550171714; cv=none; d=google.com; s=arc-20160816; b=N6f+La4bWL2sq1UEtjWCw9L1eHSxKrQVvNdO02yv6pnEVPf+MDHBMtEYjxxfhSlSPc rW73I7cDhYlZBTbPXqGL0XR7VInKJMRuOsX4EX7besYyemq7CTiwKemCA20ikHyQw9ht Y+iZKsWNmv+ua2aPqm0z7CBscEbePd/HPRJWww8rMFwjPI1rtVwcfU7Lc4G5DKGD+uG6 wWvL/bupt56MpKyNfwLMBKjNGXvB88cW0ETYGevQkLTppYzY2N1LgP12Nv46ach7AoHM Lh/zfFZbB00MuwAHVLhfpWMQ8byOgYxhN952ElGKF9th3ptVFN/0ca8vTqSTKc7jodsd rScA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=7zm92d4N5jm95GOe8HSeqbCCIZXBS1VbUQlQpCslp0o=; b=UMQzpCvqsu/JMCcwrNZIYxpAXrDlwG3f7wUvsDQ6Z2HohFXO1kpJqO0py3+EHRt3xc rjkRSyi0ieiCPufb5BTLA0SW+u3m2R/C+g5s4PSi1IbU290PH+IkoqT2Tt7Fz6rC1zoL wFoVq/9INb97SlCTOjCkR0cLJ4fCRH2zppTsCfQDcqt+n194Ojjoiv73z3/WI8zYs8Ya Q3110aTjHbUasye81dlPbzehXeYYmwk81BoovEtKxraYUGh2Gbkj+7KX69LHpVlPeunT g2qZDTr+OKOmS6v49q+VN2nXaiZ/RbNKKfVUcwR4qnfTDBjprYYVIV8oBBOSCUdWRYTC RPcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k30m3X5i; 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=fail (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 q11si2078981ywj.90.2019.02.14.11.15.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2019 11:15:14 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=k30m3X5i; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:53621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMTZ-0006TF-Ql for patch@linaro.org; Thu, 14 Feb 2019 14:15:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMLI-00080r-1n for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guMLF-0004r7-S2 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:39 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:40080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guMLD-0004pD-Tn for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:36 -0500 Received: by mail-wr1-x42d.google.com with SMTP id q1so7705326wrp.7 for ; Thu, 14 Feb 2019 11:06:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7zm92d4N5jm95GOe8HSeqbCCIZXBS1VbUQlQpCslp0o=; b=k30m3X5iWZdQaIRI0dDONeb4DJfKkBqicPmFkSiTi9kBGWqBcNS+y0vPA6Ln6ipfoR yIwwe4w+zYWlftthPCOZNsr0lAmAi2XwGFD0H2bla+7C6PLoH656a0RXRU1T9WHHhKel LPuQ/jEdfmD/d4o1yHiXJci2EHmjF7rsjD9aAV7jbAy2SP3yjiu4PoYpJYSOODJiIPxM /Zh5M5AT169n6s/pTdOIkB+Ty/7mvnEnyAfqUZNj0NoapBpMOxTJ22e6aTyyrT1k/d64 S/DxAHPD/r1QfPTJao29q9BrtXKX6JIsNx7JPCtU4gMFEUHYUkAipQz1ItER5t9fSows iI2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7zm92d4N5jm95GOe8HSeqbCCIZXBS1VbUQlQpCslp0o=; b=ml5lccLWb/hHxtsrUwPbEsKwjElEjR3FhI18/YOGnMH6dEjgHAJNdg4TUjySFFVedr BLLSlURV8BsjVdrMTySpHn0f+1ASKHgZtaWk/85OsOU0MChoIITA5rhvQNTSrzuwe5D5 w0Y3qVTIG1CnlWNZw6o0irhiKRsvAiijECcNlu4MaA7frQSicQ9jv9g7cfIzfi/xmekA 3pc/exh2UpRqi9mSLiouF/C6fTNlf7G8nktz6FDNSgErUJiyR17VsxzEd+KrDQ0W9nTH NHUyF+ffYCkDfFt9yne16uflcmsJMjqg2EIVAVgnOYyc6jsCG1H3QRj1ZckotPmhD432 atZQ== X-Gm-Message-State: AHQUAuaoGoS0d6DdfX8SwH9vSeUqbMwmp+r7S32hW3OLPXnF3stEkj2K WdIuUj4vyAeN3LAHRXiOVWw+Wi4LFgd5mw== X-Received: by 2002:adf:dd4f:: with SMTP id u15mr3920883wrm.61.1550171192232; Thu, 14 Feb 2019 11:06:32 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n184sm7798471wmf.5.2019.02.14.11.06.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 11:06:31 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:05:58 +0000 Message-Id: <20190214190603.25030-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214190603.25030-1-peter.maydell@linaro.org> References: <20190214190603.25030-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 22/27] target/arm: Split out flags setting from vfp compares 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Minimize the code within a macro by splitting out a helper function. Use deposit32 instead of manual bit manipulation. Signed-off-by: Richard Henderson Message-id: 20190209033847.9014-9-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 8eedce113c1..28e45f0f0ba 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12871,31 +12871,40 @@ float64 VFP_HELPER(sqrt, d)(float64 a, CPUARMState *env) return float64_sqrt(a, &env->vfp.fp_status); } +static void softfloat_to_vfp_compare(CPUARMState *env, int cmp) +{ + uint32_t flags; + switch (cmp) { + case float_relation_equal: + flags = 0x6; + break; + case float_relation_less: + flags = 0x8; + break; + case float_relation_greater: + flags = 0x2; + break; + case float_relation_unordered: + flags = 0x3; + break; + default: + g_assert_not_reached(); + } + env->vfp.xregs[ARM_VFP_FPSCR] = + deposit32(env->vfp.xregs[ARM_VFP_FPSCR], 28, 4, flags); +} + /* XXX: check quiet/signaling case */ #define DO_VFP_cmp(p, type) \ void VFP_HELPER(cmp, p)(type a, type b, CPUARMState *env) \ { \ - uint32_t flags; \ - switch(type ## _compare_quiet(a, b, &env->vfp.fp_status)) { \ - case 0: flags = 0x6; break; \ - case -1: flags = 0x8; break; \ - case 1: flags = 0x2; break; \ - default: case 2: flags = 0x3; break; \ - } \ - env->vfp.xregs[ARM_VFP_FPSCR] = (flags << 28) \ - | (env->vfp.xregs[ARM_VFP_FPSCR] & 0x0fffffff); \ + softfloat_to_vfp_compare(env, \ + type ## _compare_quiet(a, b, &env->vfp.fp_status)); \ } \ void VFP_HELPER(cmpe, p)(type a, type b, CPUARMState *env) \ { \ - uint32_t flags; \ - switch(type ## _compare(a, b, &env->vfp.fp_status)) { \ - case 0: flags = 0x6; break; \ - case -1: flags = 0x8; break; \ - case 1: flags = 0x2; break; \ - default: case 2: flags = 0x3; break; \ - } \ - env->vfp.xregs[ARM_VFP_FPSCR] = (flags << 28) \ - | (env->vfp.xregs[ARM_VFP_FPSCR] & 0x0fffffff); \ + softfloat_to_vfp_compare(env, \ + type ## _compare(a, b, &env->vfp.fp_status)); \ } DO_VFP_cmp(s, float32) DO_VFP_cmp(d, float64)