From patchwork Thu Oct 17 18:51:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176692 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1346242ill; Thu, 17 Oct 2019 12:00:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDcjBjoaSyDsiwmz65GU6GReOfWlmkyOsnhS7yucPu4bczjZmtPSCM3+zvwQxqAa2cGqB4 X-Received: by 2002:a50:da0f:: with SMTP id z15mr5470454edj.137.1571338809151; Thu, 17 Oct 2019 12:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571338809; cv=none; d=google.com; s=arc-20160816; b=GbTvCVUrPbnMz1XVz1ZVOCFmTt/8BSUa1wE1Bto/DlngqV4KQvXTVFbFPRM7eMdLFr U9veaf9ZpgHXEZ0g0CdxLvUq12l+EBHqkQ/Thwsu3UY3Ewj8wkRTI/PNwm2o5nqVBmqi 77hIYJDUbGOBz+SYPiPS/Nb8PBQWMDMmRebouGfFWq8Ch9MZ8AWEW6EJaR+Q6qJH5vOc rX8p2PV28C7FLgh9TpNY3xzX2ESU2Uowp6Gu2XXnZZa1+BntK1Qp1BEAAR67rH8i+WCR EPizai39Hcst1DiFU/rIiZhpTzam2GOXoHMryOL033GWJdhqFjjYMsofrMPmNekP4Fl4 sfKQ== 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=HNW+DKXClNFoWE5mAVnYOdmYoSifNB4F8oskeNBuM9U=; b=XnOx8twxUxFgRab7kRiB3MXujUJbwVLh9CsqcMjRFy+hxhLKmJBe+k8obwYh2+jnGZ 67bASQLsdwp2UY7wJk1Ortxqv8cdQvMEy6TVG5mRzcZWOEYhghgkbPxWuAzW4c8k+rkw irNygixYMaiU05RTBp7UuXA/XzuRRMmBj4SHrCpSUOXg4UI+ioe9CWrNy/bca3Gi5fB6 FpDgngUoUIhAiS5wOMgSSK33kbxBjCCCtOE/1m9a7JfdWbqOyZ5ilJLZhhYDAysQr1iB KT2kH0Bw9GemjyChsthPNoiYBV/srFdsqUJ20PKOl4J/Mc2CpGcbDETjMMADP0hpeWSi 6VSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LkyJU8fo; 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 z26si2154978edz.99.2019.10.17.12.00.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Oct 2019 12:00:09 -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=fail header.i=@linaro.org header.s=google header.b=LkyJU8fo; 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 ([::1]:57088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLB0J-0002bU-U9 for patch@linaro.org; Thu, 17 Oct 2019 15:00:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35376) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLAs9-0001Js-1v for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLAs6-0000x2-Hj for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:40 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:46920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLAs6-0000tj-7G for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:38 -0400 Received: by mail-pl1-x641.google.com with SMTP id q24so1544329plr.13 for ; Thu, 17 Oct 2019 11:51:27 -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=HNW+DKXClNFoWE5mAVnYOdmYoSifNB4F8oskeNBuM9U=; b=LkyJU8foHBs+uNhCP8dnkCH5uGCvWMuVcHs0nPTcd0FKZlssvwU1OVH3BE/LuuWPA4 GvIb9Owtax5TrClRNQgtYlUra9mEAsXKlAxWGmAWtDDY5d0yNiqak6cj26TFVpS7xDRK U2Q8F0EYFiYE8GYQk6O1zcIccor7WXzjQciP/ZP2yP+SWeNgUx6wicbehnHM3SoB56gX S5TAElC6d7GOgFsRufovRWLnEKwoyxRKEEE0GwCwUs+X+bdqIdwtNdAPUeXktF//Xn9h XKZCSqyXj4oF6XouBvIfyOwkIT6gkFKs/+/HG8ZyFnFFPWLMKWWcMZ/Va40hCpZOs4oR 9s+A== 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:mime-version:content-transfer-encoding; bh=HNW+DKXClNFoWE5mAVnYOdmYoSifNB4F8oskeNBuM9U=; b=rYd1I34dqv0yLQmKrUnSTWTMxy+zickohzPUpExwB+thT0C7eVvXAKlTKDGC5rzjuF KKWHs705eA+3QHo4MN2h9NT2sJPmWWVhwItfpklDHZVMDs1YyI2hqb3J94mF379Qvj74 Q7W2lyvsgjjFFNCrChVhWYhhCq/0fDrTbGJVOe2KDxQP81mao4eMndsRapTNjmXdmUFW K+v/eqeIcxNKVyuXQIDKqxZQbMFfTMiXJVEZHxqcvYWOlgIjZABTIOYKds6Y5yHgxUQc aOXcIn2/BWMXhcxzaMGiqZh1rgjySI0ee4Mf3iBfOdvNVvRFj+h7joQNmZb0xHKWOKEj H6fg== X-Gm-Message-State: APjAAAXZn2Yr7AoM/ABUrfuRXA0nRz//EEyfq2BBs/L8p8DSgWkm820+ gWDVB01nHC8e06pz1ikiudYrxHb6zDM= X-Received: by 2002:a17:902:bf08:: with SMTP id bi8mr5364152plb.249.1571338286618; Thu, 17 Oct 2019 11:51:26 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id s97sm5009256pjc.4.2019.10.17.11.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 11:51:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 11/20] target/arm: Hoist computation of TBFLAG_A32.VFPEN Date: Thu, 17 Oct 2019 11:51:01 -0700 Message-Id: <20191017185110.539-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017185110.539-1-richard.henderson@linaro.org> References: <20191017185110.539-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There are 3 conditions that each enable this flag. M-profile always enables; A-profile with EL1 as AA64 always enables. Both of these conditions can easily be cached. The final condition relies on the FPEXC register which we are not prepared to cache. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/cpu.h | 2 +- target/arm/helper.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 4d961474ce..9909ff89d4 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3192,7 +3192,7 @@ FIELD(TBFLAG_A32, XSCALE_CPAR, 4, 2) * the same thing as the current security state of the processor! */ FIELD(TBFLAG_A32, NS, 6, 1) -FIELD(TBFLAG_A32, VFPEN, 7, 1) /* Not cached. */ +FIELD(TBFLAG_A32, VFPEN, 7, 1) /* Partially cached, minus FPEXC. */ FIELD(TBFLAG_A32, CONDEXEC, 8, 8) /* Not cached. */ FIELD(TBFLAG_A32, SCTLR_B, 16, 1) /* For M profile only, set if FPCCR.LSPACT is set */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 398e5f5d6d..89aa6fd933 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11088,6 +11088,9 @@ static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el, { uint32_t flags = 0; + /* v8M always enables the fpu. */ + flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1); + if (arm_v7m_is_handler_mode(env)) { flags = FIELD_DP32(flags, TBFLAG_A32, HANDLER, 1); } @@ -11119,6 +11122,10 @@ static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { uint32_t flags = rebuild_hflags_aprofile(env); + + if (arm_el_is_aa64(env, 1)) { + flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1); + } return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } @@ -11250,14 +11257,13 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, flags = FIELD_DP32(flags, TBFLAG_A32, VECSTRIDE, env->vfp.vec_stride); } + if (env->vfp.xregs[ARM_VFP_FPEXC] & (1 << 30)) { + flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1); + } } flags = FIELD_DP32(flags, TBFLAG_A32, THUMB, env->thumb); flags = FIELD_DP32(flags, TBFLAG_A32, CONDEXEC, env->condexec_bits); - if (env->vfp.xregs[ARM_VFP_FPEXC] & (1 << 30) - || arm_el_is_aa64(env, 1) || arm_feature(env, ARM_FEATURE_M)) { - flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1); - } pstate_for_ss = env->uncached_cpsr; }