From patchwork Mon Jun 27 10:22:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 585279 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2952972mab; Mon, 27 Jun 2022 03:35:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s8RfWlkOLUrXoOEpqGyM/P3wMxhKZydLr2Wzju4RFJfKPEvU7BrSxuoQBNPZlqGhxeIWEz X-Received: by 2002:a05:6214:27c4:b0:472:6d89:a12 with SMTP id ge4-20020a05621427c400b004726d890a12mr1838978qvb.7.1656326123860; Mon, 27 Jun 2022 03:35:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656326123; cv=none; d=google.com; s=arc-20160816; b=B1S0D5Upn6oMboNVz1FCuXg5Yd5pgHI2LG+eTRWMIflf6VEd4OP9HlxJLot5CEPqFy TGJ5W6wRXxnd9bF+7e57iter3amPFeQfafj63kqBQmUNHpprMg8EgcJNgJFrkk+VFq9o 5JqHvoM777yxqZ3+vIQRM2dYaj/G4HhSSX7yeFBrnjqiY9AlxXB2SOMarZkt0F3Dd4Fw m+O4sFms352ur8Fabsh03wwyGSs3EoEQcwWny/sFtY2d0LaLL3fh40SPHfIIZ8w+27gA m7Ax2DZJ3cWi71AEzZJozzXsg74Abgas/w5r1/9vSAK60djfuv/eYo6pU2ExHyQbc9mP SLyw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5wziFx4VrUkDL3R6unNxwrzbYVixhlidQEgVavCRMsE=; b=aN7jJnHopyWSwkIPEgb3qTeFa+D41Kwjk7dMI6G8iyyu7Q6t2UKflS/s7ea2Y0ol9A fDDaKr2L3tpge+YjI+Gi0uEoUouyxJZd+qCuuBWAa1KfN51FX7nkFqH3BmV86IFnBtQS 9xEcZ737vdZ8GClZr/JDsZ/4QGNfYYXVVMPPVY7AyZc/EOsbdF7Dlbus5PXX3CrFKcFr DmpqONQ2c8P1TcLFLe158cQHxlnm7f6F3zNKrdUFnQ+SC0zgyIf2IMtcKF2CNHpKR2iL 0TkELqDTDmjC0ZT4y51zX3Yc7XDrbKGTdOoc5wKogOerGZiutKD5Faqg3nqsMsfTovT7 Iwtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n/J6yPin"; 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 g9-20020ac87d09000000b00305239682b4si6401207qtb.32.2022.06.27.03.35.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 03:35:23 -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="n/J6yPin"; 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]:43816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5m5S-0007BV-H7 for patch@linaro.org; Mon, 27 Jun 2022 06:35:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5ltK-0002Jc-6s for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:50 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:44908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5ltH-0004st-SM for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:49 -0400 Received: by mail-wr1-x430.google.com with SMTP id i1so7844312wrb.11 for ; Mon, 27 Jun 2022 03:22:47 -0700 (PDT) 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=5wziFx4VrUkDL3R6unNxwrzbYVixhlidQEgVavCRMsE=; b=n/J6yPinG1LqfWCQtbOnNPM/nUCvRgKDHEm2ii0BHR45ChdudLgloKFUSxeF8Cwjsj 0H4yhQHPj8tg6/7+UE8/LnZFXkeOJVodu+bCAMKhPDDGDN9rd7B7D+vNqXKHwpH440zN XHeSyWvz0O34H0uQWePQ4H66BK6yUGoP9bKwO8szcGQcU5QUGWJDyup+DZT09vyrhxFJ FzieaupHyItmCoCvBonGJh5io8BzEC9PlRRF4z0nFCBJyb0Z0k5mvw6pl4dPyP0HfDYV CVGgz1rQx70wLB4I1WKyokfvTBHjbLkG6KVNchRPXT7oCvbz1TPARaJC9wHM9a7D78Cd VGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5wziFx4VrUkDL3R6unNxwrzbYVixhlidQEgVavCRMsE=; b=aqgKeAb578YE1XAKooCZOouHv66SWWCwkugf3iwdFm93a0nvHiSTU61JUvEE793IBO tvhGjseNeeZcoz/Lt/UdhAKgoaFrFW3CX3JoALojswPC/Au7ko4jnnvEV46nDZRtH7Dj qPophT33F4ZGLgEu2qFeTON0mjRBxW/tWy+1Dz469eaZEY7ltnYDsDUytV74C5seRK6w aCjOr+txre+98BAj5WtT/ARKgcbIp5kV9KuN6l3P1bohcXrtIB5MXDvKxL3mLe9zZzLk fknAqrgqV2EVdiOLBeyzwwWYr5itHBqAbXbZf6tX9j5JsTAo4XGAlFTw5JXg2MzXBf/2 Jn8w== X-Gm-Message-State: AJIora/kf/vV8EQyPQLGQVhqlqEkivagqdOULNCElfW7hpmHbdjaCD6k sBnS6pJq6ndsa7PF4VmvPDvpyQN9ikOOSw== X-Received: by 2002:adf:f245:0:b0:21b:c705:8b1 with SMTP id b5-20020adff245000000b0021bc70508b1mr6764332wrp.282.1656325366522; Mon, 27 Jun 2022 03:22:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id d11-20020a5d6dcb000000b0020e6ce4dabdsm9754335wrz.103.2022.06.27.03.22.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 03:22:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/25] target/arm: Add PSTATE.{SM,ZA} to TB flags Date: Mon, 27 Jun 2022 11:22:22 +0100 Message-Id: <20220627102236.3097629-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220627102236.3097629-1-peter.maydell@linaro.org> References: <20220627102236.3097629-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson These are required to determine if various insns are allowed to issue. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220620175235.60881-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 2 ++ target/arm/translate.h | 4 ++++ target/arm/helper.c | 4 ++++ target/arm/translate-a64.c | 2 ++ 4 files changed, 12 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index dec52c6c3b9..05d369e690a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3160,6 +3160,8 @@ FIELD(TBFLAG_A64, TCMA, 16, 2) FIELD(TBFLAG_A64, MTE_ACTIVE, 18, 1) FIELD(TBFLAG_A64, MTE0_ACTIVE, 19, 1) FIELD(TBFLAG_A64, SMEEXC_EL, 20, 2) +FIELD(TBFLAG_A64, PSTATE_SM, 22, 1) +FIELD(TBFLAG_A64, PSTATE_ZA, 23, 1) /* * Helpers for using the above. diff --git a/target/arm/translate.h b/target/arm/translate.h index c88c9533253..93766649f7f 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -97,6 +97,10 @@ typedef struct DisasContext { bool align_mem; /* True if PSTATE.IL is set */ bool pstate_il; + /* True if PSTATE.SM is set. */ + bool pstate_sm; + /* True if PSTATE.ZA is set. */ + bool pstate_za; /* True if MVE insns are definitely not predicated by VPR or LTPSIZE */ bool mve_no_pred; /* diff --git a/target/arm/helper.c b/target/arm/helper.c index bbd04fbd67b..e06c054c3d7 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11335,6 +11335,10 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, } if (cpu_isar_feature(aa64_sme, env_archcpu(env))) { DP_TBFLAG_A64(flags, SMEEXC_EL, sme_exception_el(env, el)); + if (FIELD_EX64(env->svcr, SVCR, SM)) { + DP_TBFLAG_A64(flags, PSTATE_SM, 1); + } + DP_TBFLAG_A64(flags, PSTATE_ZA, FIELD_EX64(env->svcr, SVCR, ZA)); } sctlr = regime_sctlr(env, stage1); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 8f609f46b6a..5cf4a283bac 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14630,6 +14630,8 @@ static void aarch64_tr_init_disas_context(DisasContextBase *dcbase, dc->ata = EX_TBFLAG_A64(tb_flags, ATA); dc->mte_active[0] = EX_TBFLAG_A64(tb_flags, MTE_ACTIVE); dc->mte_active[1] = EX_TBFLAG_A64(tb_flags, MTE0_ACTIVE); + dc->pstate_sm = EX_TBFLAG_A64(tb_flags, PSTATE_SM); + dc->pstate_za = EX_TBFLAG_A64(tb_flags, PSTATE_ZA); dc->vec_len = 0; dc->vec_stride = 0; dc->cp_regs = arm_cpu->cp_regs;