From nobody Mon Sep 8 12:33:50 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=1756570144; cv=none; d=zohomail.com; s=zohoarc; b=ZGNxm4aiRvwKwqt+IU4qUB7E8ZON9xOOwv5VdTXHxJ8Vf2um4g0IARvY44DhZ97AjRx++PQm/5sLfBVG5gxcJPAOvxk9K7IRgzYY/i6d5VcUcO27IcJjO6WEuKcEPYhaG0+ncsgz6SXyo9Lpj3I6NPg/Ulew3uMIiLQZo+BNDrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756570144; h=Content-Transfer-Encoding:Cc:Cc: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; bh=NOZ/CjfdiSdINiVTxT9+lF6CMC4POOvU27v/qSr3hZo=; b=T0EmZ/ExJbKLogLRUo8pUG/62SRJaVbsWLXHcUAWPXeRi0xfLwrFSckAOmVeqZax/FJuViSI33+JK7Cg2CwrIyk+QHve8KZr/aRVzdT55zIsdkvgZ+pYQr96V6e7zhyZf3F2sWXExOmugDumM83WgYJifum8vsRKBofkgN7XKvc= 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 1756570144281721.2178884095389; Sat, 30 Aug 2025 09:09:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNyY-0006bc-5Y; Sat, 30 Aug 2025 11:58:51 -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 1usER7-0007Nf-SC for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:47:38 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1usER5-0004xv-T2 for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:47:37 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-24879ed7c17so21043285ad.1 for ; Fri, 29 Aug 2025 22:47:34 -0700 (PDT) Received: from stoup.. (122-150-204-179.dyn.ip.vocus.au. [122.150.204.179]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490658999fsm40852715ad.112.2025.08.29.22.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 22:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756532853; x=1757137653; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NOZ/CjfdiSdINiVTxT9+lF6CMC4POOvU27v/qSr3hZo=; b=yD4ahFvGk+fFwWuPTkW7XYYJvsziKdcG7bYs/WVMxofLu2/jIwtbDfCoCp4SnErnIk VJDbpR7bLsVOthlks5S905YYWKBdwqEsQtZCsjKBdxdWt+f4fULg6IyOtSrDHwvm5+o4 VPJJezCyPjomIu+6biX1IBL3iH6UDuxoxUvBhCtL03hpL61fIHkpDoSL9rodz8FylxI9 M7PLJUfa1OVflrfU/rnYFOudm74JPcmB5um52E+vPWX8Hgx7qiJGEHattLHMD4w5Yw1d zvLHYmpCmM9qHvAoYi9RpAoj219YBo853I6XEgYFR516uX+IQvr7Iz+12JcEH3RRgq8U CtOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756532853; x=1757137653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NOZ/CjfdiSdINiVTxT9+lF6CMC4POOvU27v/qSr3hZo=; b=fbTWt0pCybKbIOOec/Hp5pqfLJODrI/8+adJ50qTmvvUCM6R+iH8KqLkrzvXllmOCl 3gqcARRLk5kRaN13yzTQ/XXsVXpmzQ4nxQg0i3BnKE1dA1xw0ibBSz+QoUfEWHNuCZ3G ZxtaN6HB+yxt7mEMiKZkk1b0tUAM+j/qQUo0nNZr+wehsGA0WIYe3vhNNf38yI0wrH10 ow+qIU4unHZl3Sw+sr5DikXUCwR2QNxJQsSOiZm6aBqPEpIZUIf6JtYcvZJuK6IpBSAu vhcSjpB7yU2ZnQoA9pX8UtKxX092O+BMNmv+CkvCcZC0HSommRP+4LHAiyWUeQwD7P0T scjw== X-Gm-Message-State: AOJu0YwrriRAPYVreGHTUMQieT2d0645JxzPpN6eATYnq1ebElY5Wz6v gQ5su1fy1vJ29OvZV/QCPVDsHfQYPtncRKch1IkdZchJEazNZQwOIRgEJ6FsbdPJtH8Q5VCODCE c1Lj9GbQ= X-Gm-Gg: ASbGncuTjR5scSuxtwqqzJWdBxbDSCvvCweF0D5xZ46QXknjaYQGDXus8Y0QdzVJ4XG 0g0UnHRRU0kaYBZ1VrttTeGq87htTGITHkS64zgBXu4VzTInHi3kSsnml5+xeTRMMCMeF/xPCLu 2yp9p4oXEqpzFhvQWgNWFFrxjuplntskeG6e+AEnTxReMjeVw7pBNeRzwl+JLCFIn/C0RuLOZV3 A06A8fetnscx3+HPDDbhktFU9b1HvwOyd9+st6aihOC8t5LXEFmuVc85JU7KVcFc3l+K0cSGqZ9 swwwKAAATA6PgkRkQ+dUWTj5dov/zaL8paXhCXfnTbwbo9hpDRcuoKw23VEsRQ13DqI/ngZJgQw eq0OaPR47Y3ZbiZQOdtniq94ImEbDCk1coEXmxUWq0zQdKA5uLqir+sJYLLfw34A= X-Google-Smtp-Source: AGHT+IFtl4VxsxAD7HgGCs0U4jiD1GJuCGQlWccATysjMmf/s6AC7gyParEuYn/IqO1AbHzhNb3EJg== X-Received: by 2002:a17:902:e788:b0:246:a165:87c7 with SMTP id d9443c01a7336-24944ac69b5mr10754905ad.42.1756532853206; Fri, 29 Aug 2025 22:47:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v4 63/84] target/arm: Implement GCSPOPCX Date: Sat, 30 Aug 2025 15:41:07 +1000 Message-ID: <20250830054128.448363-64-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250830054128.448363-1-richard.henderson@linaro.org> References: <20250830054128.448363-1-richard.henderson@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=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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 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: 1756570145334116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- 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 084ea00e51..392a0a264f 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -51,6 +51,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 2d39b17188..3236f607f3 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, @@ -116,6 +129,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 b0a1a62a91..193c199a2e 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2560,6 +2560,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]; @@ -2882,6 +2930,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