From patchwork Thu Oct 17 18:50:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11196887 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD7CA1575 for ; Thu, 17 Oct 2019 18:59:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 844212089C for ; Thu, 17 Oct 2019 18:59:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L8rR/EDb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 844212089C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLB0A-0002sR-72 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Oct 2019 14:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35114) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLArq-000194-Rm for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLArp-0000rw-O6 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:22 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:43865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLArp-0000rc-Fr for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:21 -0400 Received: by mail-pf1-x444.google.com with SMTP id a2so2205259pfo.10 for ; Thu, 17 Oct 2019 11:51:21 -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=O5qTDR4/yunqOnDsae4ZjoUIG4TsLVXzaOK/t5hnYkI=; b=L8rR/EDb44Bi3pXfkhIT7iJFLS1M4qFMVTm+WsN2UrzwSR5ncosMv7Vo+AQEw6jelE P9eVIcrioFLljH+RUpwT3u0HJbbS7kMQGkU82k+Q5p1wZKWqTVxTX9WLWMZ5BF6YvrcT 9sF0Jsp0OhH7iyp9kwcuDm4qluQUcrlJE3e29j9kAfpPGFzvZV4YwzBc96vSkUJhCMTg KYpajYdq8CKSm+8pzgs62ySjekn5mK8DSYF77UoMaSMyMtEMouADPX/j9vy+jGJliYFd 4LcMcMwrR/giPlFSyhQVBMm+VeUByaBFDlS2IU8+HM+sA3lXlygNPuIjKB9jcp3Q0Ul/ GXqg== 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=O5qTDR4/yunqOnDsae4ZjoUIG4TsLVXzaOK/t5hnYkI=; b=B1XXWzESM9SsZ9CAZhvw1cmFy6fzRMfx9EpfHQxAoJfo6E80+XxfjHTJpaN74XvvKT y3WJUtTfxfr56eyDgb+FWEcSMjpz4dNIJyffvGQVd2Vz+eCxpfuF2XlyishXO6DCzBBy 2rviPGC2tbwysWkIFu/0oqDTGazKG4Dp765r6nPXWGbcBXNdwgjmyjcVjoN7qyk5mrzR 2bsz6p1+/96yL8fo2aDROVBq5mJ0Yh4LncKmIDKThO39QUvDUg9NofsmWUWa/ulJ1vCj qnfQXE2muoP7QzXxTEZLaBuk2sPsj3/qSvmQ833WE4Z6fUZd34meuEZsqJXenTVzJSDL 5Ibw== X-Gm-Message-State: APjAAAUtzbxSxiR42Swz9mHddIdLWSwlxQDNv2U5ivk1iP3ppehm0mbX LQ0SUR0X76Um5wUpy1kibLyXHHNyLR0= X-Google-Smtp-Source: APXvYqzDlI3+R/th6izfw2K2Ii8i9y2bzOzkCJNSDeVjY8wpSL/YO2XmhPfwSqHtoIPS7VtcwOFtqQ== X-Received: by 2002:a17:90a:d818:: with SMTP id a24mr6216664pjv.5.1571338280124; Thu, 17 Oct 2019 11:51:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 11:51:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 06/20] target/arm: Reduce tests vs M-profile in cpu_get_tb_cpu_state Date: Thu, 17 Oct 2019 11:50:56 -0700 Message-Id: <20191017185110.539-7-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::444 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Hoist the computation of some TBFLAG_A32 bits that only apply to M-profile under a single test for ARM_FEATURE_M. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/helper.c | 49 +++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index d4303420da..296a4b2232 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11194,6 +11194,29 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, if (arm_feature(env, ARM_FEATURE_M)) { flags = rebuild_hflags_m32(env, fp_el, mmu_idx); + + if (arm_feature(env, ARM_FEATURE_M_SECURITY) && + FIELD_EX32(env->v7m.fpccr[M_REG_S], V7M_FPCCR, S) + != env->v7m.secure) { + flags = FIELD_DP32(flags, TBFLAG_A32, FPCCR_S_WRONG, 1); + } + + if ((env->v7m.fpccr[env->v7m.secure] & R_V7M_FPCCR_ASPEN_MASK) && + (!(env->v7m.control[M_REG_S] & R_V7M_CONTROL_FPCA_MASK) || + (env->v7m.secure && + !(env->v7m.control[M_REG_S] & R_V7M_CONTROL_SFPA_MASK)))) { + /* + * ASPEN is set, but FPCA/SFPA indicate that there is no + * active FP context; we must create a new FP context before + * executing any FP insn. + */ + flags = FIELD_DP32(flags, TBFLAG_A32, NEW_FP_CTXT_NEEDED, 1); + } + + bool is_secure = env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_S_MASK; + if (env->v7m.fpccr[is_secure] & R_V7M_FPCCR_LSPACT_MASK) { + flags = FIELD_DP32(flags, TBFLAG_A32, LSPACT, 1); + } } else { flags = rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); } @@ -11233,32 +11256,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, } } - if (arm_feature(env, ARM_FEATURE_M_SECURITY) && - FIELD_EX32(env->v7m.fpccr[M_REG_S], V7M_FPCCR, S) != env->v7m.secure) { - flags = FIELD_DP32(flags, TBFLAG_A32, FPCCR_S_WRONG, 1); - } - - if (arm_feature(env, ARM_FEATURE_M) && - (env->v7m.fpccr[env->v7m.secure] & R_V7M_FPCCR_ASPEN_MASK) && - (!(env->v7m.control[M_REG_S] & R_V7M_CONTROL_FPCA_MASK) || - (env->v7m.secure && - !(env->v7m.control[M_REG_S] & R_V7M_CONTROL_SFPA_MASK)))) { - /* - * ASPEN is set, but FPCA/SFPA indicate that there is no active - * FP context; we must create a new FP context before executing - * any FP insn. - */ - flags = FIELD_DP32(flags, TBFLAG_A32, NEW_FP_CTXT_NEEDED, 1); - } - - if (arm_feature(env, ARM_FEATURE_M)) { - bool is_secure = env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_S_MASK; - - if (env->v7m.fpccr[is_secure] & R_V7M_FPCCR_LSPACT_MASK) { - flags = FIELD_DP32(flags, TBFLAG_A32, LSPACT, 1); - } - } - if (!arm_feature(env, ARM_FEATURE_M)) { int target_el = arm_debug_target_el(env);