From nobody Fri Nov 14 20:45:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760102127; cv=none; d=zohomail.com; s=zohoarc; b=VGQVHTXK6wmpzvnawfOgkQ/2fZuH7JK7e6C8xiR+VfcmbDIF+MMAnBnJajhKjFoPSU6jp2zN5jdawF3+05N+TlZnNdUmjz/l9dmA3ZTLj8aOH95drqfyCc5j6Ehx8F7eYYfAiKNEhb4cYnigic4pVsk60rp7VmVqHOZRO+sFrn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760102127; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=LBqKe4T5VSYNNeh6kgz5dxwTbw6vjxkjGh8m4B7JMPw=; b=Tk19daaqmjiSE1HdMvIkGd8sBuTAJCTiS+wySZvvrxoHzVEgC1XKJzk9/VDW5NApFhHjQg9WPh6OuVdrHzJcXwWIOLjurfR6vOYsS30/9377+VArE8cQqM+ZbnaYqImOsYeLXPkCwiIE7KmDmnysWvmBpHiLMD8YM/Tr+G0r/fI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760102127203138.53028296499338; Fri, 10 Oct 2025 06:15:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7CqQ-0007KO-Nr; Fri, 10 Oct 2025 09:07:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7CqO-0007I1-Fd for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:07:36 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7CpQ-0003zY-OH for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:07:35 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3c68ac7e18aso1426003f8f.2 for ; Fri, 10 Oct 2025 06:06:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce583316sm4221657f8f.20.2025.10.10.06.06.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 06:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760101588; x=1760706388; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LBqKe4T5VSYNNeh6kgz5dxwTbw6vjxkjGh8m4B7JMPw=; b=VqEIO6AR/xSJVVSxr4mLzHkEkKrPU9hHkTNfNvpCmd8H5pv6Q2bksF7veyxhmC4G6t mhUOsJzgJmBDGGhtUOupWaxtw4EsT6Dt9D98YAsRGfipXNSPSVln0RitsB+TZmxnzdbW 0pVBC4c0L3z7U3gPzpoLjR3ZhY0iiheTn8v0fSvWK8+lOw4flGD9PE07O5xHAEDMQqZY Fz/Ah41aSmRdOSKCOBzMCa2rRiklli5piY/eOL11SzS1ERZ2ZcTuNr5BqsK1d96FJvnQ yCCV+n6z2xlS1+mPFOqlxHXQl/KCcnE9dNO7hZZKhKHDWBAR5BLacnIu1ALR39Lecl67 HLhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760101588; x=1760706388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LBqKe4T5VSYNNeh6kgz5dxwTbw6vjxkjGh8m4B7JMPw=; b=Z5qMIrH1krNoANsZ/oTe45zV+84hrFafcLt2Z6jb5MH2caxyO+/nLnFGgrifhf5rVG Fu0/SjWgNbrB3gp8AITJZk8vRcAW/RvWJCoEY0ot4wlsxhFND5/EvqT7n3+V57DmrOSF OLeNtZSqPyhyP8x3DZ1LI0Zrux7h0p1sB0xDxSHTyFCpFubtZC4oeazSdsnYaXeYHJEO 2Dt6adsjwPbWBoeueKT/YFAl33ruStZlLjTcOLgamnomAqyT2caC+KBJmxo40PbHOG0G PWszrQUi0lz2j8gyjATQbxzaHNwrQN3L0nDB1pDGMxJsgRybiqx+ODmKNVwQf7dW0O6F /+yg== X-Gm-Message-State: AOJu0Yx3jqkWCkckiQ6QJlYHALT50BiABiycsKXbjEIg2jh9o/pGyLw5 8lXLqRqsWwsg5JY54fYOLlA3ic4C0S3Rt7sWzdJyr4XBUGhY4wTsLdJHGnvsdAFeSjWtBBlhrcD oDjKn X-Gm-Gg: ASbGncu3ALkfVVb8JqEUBo9g8R+l6R0afIrJOMlRAXtQ75Y7xnHVw64rPMe33cEVFKG Uslx7E9VVrg2ReCvgTrsVe/dIJBkuiBIaZ7Pct5+/puA5KXbKA8QMMgVO21z4lcgZqrHjDdGfaL 1zE4h+esCJoBgiFiToQ3PT58Ml2AQ5tDOEyCPYg+KDsR7YfqXo+s8OaAq5lest24hDFZo9PcUp9 xwxq5PsYWkrhXz2CkMxbZgN9Wr0RLPlVA3f1m54RFv9sFBqoYuShHS4sGR7Z8BjXsceT4Hv4rVI 7YH7sAlmxmIqFSdZuxnOBWrx4wFi7MzCLbs2L6oWxDqveB/3oEYiMDgIBHyx5U9owNkLMcZaGJi qZTTzULJBzjtAtDYcVJjt00OaJsIH3+Iqu/9ZecjOLzCsqPDjo2M= X-Google-Smtp-Source: AGHT+IFbHF29+0FrHJVEkbTGxi3cElbnMy0jQ0Xc5Avr7j5mRkeROTWcz16eSH7zeQWG7EX8SavAlQ== X-Received: by 2002:a5d:64c3:0:b0:3fa:2316:c21 with SMTP id ffacd0b85a97d-42669895abbmr7455336f8f.17.1760101588481; Fri, 10 Oct 2025 06:06:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 52/76] target/arm: Implement GCSPOPCX Date: Fri, 10 Oct 2025 14:05:03 +0100 Message-ID: <20251010130527.3921602-53-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010130527.3921602-1-peter.maydell@linaro.org> References: <20251010130527.3921602-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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, T_SPF_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760102129295158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-id: 20251008215613.300150-53-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpregs.h | 1 + target/arm/cpregs-gcs.c | 17 +++++++++++ target/arm/tcg/translate-a64.c | 56 ++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index ccf45fd136d..6d9145109fe 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -52,6 +52,7 @@ enum { ARM_CP_GCSPOPM =3D 0x0009, ARM_CP_GCSPUSHX =3D 0x000a, ARM_CP_GCSPOPX =3D 0x000b, + ARM_CP_GCSPOPCX =3D 0x000c, =20 /* Flag: reads produce resetvalue; writes ignored. */ ARM_CP_CONST =3D 1 << 4, diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c index 5b5b895a091..3795bf7f363 100644 --- a/target/arm/cpregs-gcs.c +++ b/target/arm/cpregs-gcs.c @@ -66,6 +66,19 @@ static CPAccessResult access_gcspushx(CPUARMState *env, = const ARMCPRegInfo *ri, return CP_ACCESS_OK; } =20 +static CPAccessResult access_gcspopcx(CPUARMState *env, const ARMCPRegInfo= *ri, + bool isread) +{ + /* Trap if lock not taken, and enabled. */ + if (env->pstate & PSTATE_EXLOCK) { + int el =3D arm_current_el(env); + if (env->cp15.gcscr_el[el] & GCSCR_EXLOCKEN) { + return CP_ACCESS_EXLOCK; + } + } + return CP_ACCESS_OK; +} + static const ARMCPRegInfo gcs_reginfo[] =3D { { .name =3D "GCSCRE0_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 2, .crm =3D 5, .opc2 =3D 2, @@ -120,6 +133,10 @@ static const ARMCPRegInfo gcs_reginfo[] =3D { .opc0 =3D 1, .opc1 =3D 0, .crn =3D 7, .crm =3D 7, .opc2 =3D 4, .access =3D PL1_W, .accessfn =3D access_gcspushx, .fgt =3D FGT_NGCSE= PP, .type =3D ARM_CP_GCSPUSHX }, + { .name =3D "GCSPOPCX", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 1, .opc1 =3D 0, .crn =3D 7, .crm =3D 7, .opc2 =3D 5, + .access =3D PL1_W, .accessfn =3D access_gcspopcx, .fgt =3D FGT_NGCSE= PP, + .type =3D ARM_CP_GCSPOPCX }, { .name =3D "GCSPOPX", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 1, .opc1 =3D 0, .crn =3D 7, .crm =3D 7, .opc2 =3D 6, .access =3D PL1_W, .type =3D ARM_CP_GCSPOPX }, diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 72b912a6050..bb8ffba5868 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2568,6 +2568,54 @@ static void gen_gcspushx(DisasContext *s) clear_pstate_bits(PSTATE_EXLOCK); } =20 +static void gen_gcspopcx(DisasContext *s) +{ + TCGv_i64 gcspr =3D cpu_gcspr[s->current_el]; + int spsr_idx =3D aarch64_banked_spsr_index(s->current_el); + int spsr_off =3D offsetof(CPUARMState, banked_spsr[spsr_idx]); + int elr_off =3D offsetof(CPUARMState, elr_el[s->current_el]); + int gcscr_off =3D offsetof(CPUARMState, cp15.gcscr_el[s->current_el]); + int pstate_off =3D offsetof(CPUARMState, pstate); + int mmuidx =3D core_gcs_mem_index(s->mmu_idx); + MemOp mop =3D finalize_memop(s, MO_64 | MO_ALIGN); + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 tmp1 =3D tcg_temp_new_i64(); + TCGv_i64 tmp2 =3D tcg_temp_new_i64(); + TCGLabel *fail_label =3D + delay_exception(s, EXCP_UDEF, syn_gcs_data_check(GCS_IT_GCSPOPCX, = 31)); + + /* The value at top-of-stack must be an exception token. */ + tcg_gen_qemu_ld_i64(tmp1, gcspr, mmuidx, mop); + tcg_gen_brcondi_i64(TCG_COND_NE, tmp1, 0b1001, fail_label); + + /* Validate in turn, ELR ... */ + tcg_gen_addi_i64(addr, gcspr, 8); + tcg_gen_qemu_ld_i64(tmp1, addr, mmuidx, mop); + tcg_gen_ld_i64(tmp2, tcg_env, elr_off); + tcg_gen_brcond_i64(TCG_COND_NE, tmp1, tmp2, fail_label); + + /* ... SPSR ... */ + tcg_gen_addi_i64(addr, addr, 8); + tcg_gen_qemu_ld_i64(tmp1, addr, mmuidx, mop); + tcg_gen_ld_i64(tmp2, tcg_env, spsr_off); + tcg_gen_brcond_i64(TCG_COND_NE, tmp1, tmp2, fail_label); + + /* ... and LR. */ + tcg_gen_addi_i64(addr, addr, 8); + tcg_gen_qemu_ld_i64(tmp1, addr, mmuidx, mop); + tcg_gen_brcond_i64(TCG_COND_NE, tmp1, cpu_reg(s, 30), fail_label); + + /* Writeback stack pointer after pop. */ + tcg_gen_addi_i64(gcspr, addr, 8); + + /* PSTATE.EXLOCK =3D GetCurrentEXLOCKEN(). */ + tcg_gen_ld_i64(tmp1, tcg_env, gcscr_off); + tcg_gen_ld_i64(tmp2, tcg_env, pstate_off); + tcg_gen_shri_i64(tmp1, tmp1, ctz64(GCSCR_EXLOCKEN)); + tcg_gen_deposit_i64(tmp2, tmp2, tmp1, ctz64(PSTATE_EXLOCK), 1); + tcg_gen_st_i64(tmp2, tcg_env, pstate_off); +} + static void gen_gcspopx(DisasContext *s) { TCGv_i64 gcspr =3D cpu_gcspr[s->current_el]; @@ -2920,6 +2968,14 @@ static void handle_sys(DisasContext *s, bool isread, gen_gcspushx(s); } return; + case ARM_CP_GCSPOPCX: + /* Choose the CONSTRAINED UNPREDICTABLE for UNDEF. */ + if (rt !=3D 31) { + unallocated_encoding(s); + } else if (s->gcs_en) { + gen_gcspopcx(s); + } + return; case ARM_CP_GCSPOPX: /* Choose the CONSTRAINED UNPREDICTABLE for UNDEF. */ if (rt !=3D 31) { --=20 2.43.0