From patchwork Sat Feb 9 03:38:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157914 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp243930jaa; Fri, 8 Feb 2019 19:50:29 -0800 (PST) X-Google-Smtp-Source: AHgI3Iaf9ldFv7An1rlbzMg4N8h7Qe2LAwd586AgbXIgr0mIym+YNiA1gcy3E+AJjN/XLOZrFzbf X-Received: by 2002:a1c:9e4a:: with SMTP id h71mr1348784wme.82.1549684229567; Fri, 08 Feb 2019 19:50:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549684229; cv=none; d=google.com; s=arc-20160816; b=EizDS6vDeo7fjzEPuNbRcmFODfWjQeby9F5TD4eiq0Uew0rBmoLgcjRDcyzyj7MvQC +KaMpVOAgeRjAA2K8BNBDeeVNt+gaK42bEllzyW/z1MjW820GPgTkvbtIN3r9uKTJ1vz w9REjPhzNFYJ2LFCizlQiT2GqPPCp+M/e0PfIbx0hn/wESbhApSKmmnMY+dfHuAESolE pGB/bFEwjWh41P3NrbPq3xSu+QCHJTALbvMWPskg7T/JdpHP4LbDJj7oB0WrnUb3N+4o /SkTSpV4CQxWNX0ARV3OMJat8Ddg1z21DT2dVjFq5PLtiSJEghY52FzILFKbIWT5btA2 a74w== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=mbI6BmlEcsoQbk9otTO/UpbfLnedk7lNBUH1NdN1wA0=; b=woot+m0sXOj/bGEXfQHBavKh2AdLKiwArPGUfERuPX13ehHNO3Izndkgw5nyUS8crc dWOzgvxWt60Yld6G7oYBmJ6kqIrscFs04EWGOGi+64KNtQKTYLOBBblB73ymDBy6r2q+ BUgq64VvPUqb4z68Nvb9ctNl8LgbkxLAIjbbaAYLMKEcBGrPxPMnZ+0EFzCkP8hXXXFb 7diUjBJDoNP2gB0NMVfTH+FYQwy/313qqRY8nIpev2lI2AZZYB4OtUY1B5oOzZDPHl7n CUNEdeManTaoDZC99hIeYPn+VJz/A5hw9yOzInalA9kL5n4H3UNg61PwP24PFhbOIM7J Q5WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NyCCjsZj; 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 g124si2992867wmf.131.2019.02.08.19.50.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Feb 2019 19:50:29 -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=NyCCjsZj; 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]:39179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsJeu-0006M8-L5 for patch@linaro.org; Fri, 08 Feb 2019 22:50:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsJU4-00070F-Sn for qemu-devel@nongnu.org; Fri, 08 Feb 2019 22:39:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsJTz-0000Ye-VT for qemu-devel@nongnu.org; Fri, 08 Feb 2019 22:39:13 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:36140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsJTv-0000VU-VT for qemu-devel@nongnu.org; Fri, 08 Feb 2019 22:39:09 -0500 Received: by mail-pl1-x636.google.com with SMTP id g9so2612842plo.3 for ; Fri, 08 Feb 2019 19:39:04 -0800 (PST) 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; bh=mbI6BmlEcsoQbk9otTO/UpbfLnedk7lNBUH1NdN1wA0=; b=NyCCjsZjpEc0s/hFjnQgtM2DApim9AyROMniCZjo0RUU4nBBC/U1dwDALjxyqZFHkX +zJV66/dxq9NZcLxpRJcxdU8ChXN9Kd9yFrXt7j+Q3jf49ayk0vMc+RgxACxcv9t4/Ly CHXdTZJaP4Y+RvxF9a84KHZfDLPqwv+xDLR/qbEY7iZRvp/go//de6ptOPxTe3yX7uH0 5xix5XuIGiJ0SrQ1HfQdNXMI9aks0t1hX2T8unSRJr0IaPo1Dq2tSG+UDPLybf97e9gM hL3+QWv56o5P1p8SR0kfqffXA1SzWr16aMOuBosboe/MFNqD5wicMWFGV8YoMLgCyPCZ z+8g== 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; bh=mbI6BmlEcsoQbk9otTO/UpbfLnedk7lNBUH1NdN1wA0=; b=WVky45BGwfLtCpmPnzbLM9X5eI2dzke9FJNio37Sc+q9nGWmDRtK2o/xuFOg5hzsWH DjLZE+da7iosrjLEaN+mpQU7pCmiWc4tYehHH32snjHggaS2Cuo1JpQpyoH2WAOnDF6e aCmAmSZzNEa3VaRnNFXrLdjSy+n414X5Lw/OkSTcwzzjNkn4tEGERBwFL0s0Vzj6xsbj 04KFbXBsN+LYBtT6oJEskLYG5+BbTd3RAD8jFsf9hn3SM5TezTTa4qTulyzSNmpEK6JI dPiVp9rprqyNau6aTT5/eRRYPaDOCFp5EF5EVul/72M8wsQYOsKbJd0gqKQG2P2Cp6t/ dG8Q== X-Gm-Message-State: AHQUAuYfGabHIuabHBljklNMW+a4+l+Z3rmEan4FqMf6SYjftYwd6+up vH82V92Ax7xfNhqb9YOLCtWaIvqXh6E= X-Received: by 2002:a17:902:7107:: with SMTP id a7mr26350150pll.290.1549683543235; Fri, 08 Feb 2019 19:39:03 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id s84sm6340737pfi.15.2019.02.08.19.39.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Feb 2019 19:39:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 8 Feb 2019 19:38:43 -0800 Message-Id: <20190209033847.9014-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190209033847.9014-1-richard.henderson@linaro.org> References: <20190209033847.9014-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::636 Subject: [Qemu-devel] [PATCH v3 08/12] 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Minimize the code within a macro by splitting out a helper function. Use deposit32 instead of manual bit manipulation. Signed-off-by: Richard Henderson --- target/arm/helper.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.c b/target/arm/helper.c index 6ac81c2ca2..51be3fa16f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12752,31 +12752,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)