From nobody Mon Dec 15 21:29:24 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=1755177321; cv=none; d=zohomail.com; s=zohoarc; b=c6xpW5GF4T4gbZlsM6xYe4KETbtBXWydLRnKkXGlw/rMdSLb8CR4UPY2yhW84WopOs4HNMhxxkOsmw9dPBupaikf0/u3hd6/pkWRZTAypfSshAjQSYPjg6P3aO4YnlS5bkpTWKkl5gkubTElFeQBqzjON0ZhJaIKNA80gWQBA8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755177321; 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=i/zcuC56Zj+TUzfAAs7ykKhwgtcOMzUZTNHIMAcbGcA=; b=KVVG9vLo+KR4313FBnWPgwS65tSCR89+VL9ZYVqX4gmPp1I7AieWq0j4QHq3G6cU+1kJnANPY8sP/FrK/7/bbZ4k/zPb706Ti2dhFowhxJptgwcMhVu+6Lsc4o/Li9gd8b5WUWBDH/LsM3izRWv8KWrzzDzv7O9jekNi1db6xc0= 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 1755177321497419.3805523865169; Thu, 14 Aug 2025 06:15:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1umXeW-0004BZ-Dx; Thu, 14 Aug 2025 09:05:56 -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 1umXdQ-0002vr-T1 for qemu-devel@nongnu.org; Thu, 14 Aug 2025 09:04:50 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1umXdF-0005G0-As for qemu-devel@nongnu.org; Thu, 14 Aug 2025 09:04:48 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-76e2ead794eso682295b3a.2 for ; Thu, 14 Aug 2025 06:04:32 -0700 (PDT) Received: from localhost.localdomain ([206.83.105.236]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce6f6fesm34480631b3a.26.2025.08.14.06.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 06:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755176671; x=1755781471; 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=i/zcuC56Zj+TUzfAAs7ykKhwgtcOMzUZTNHIMAcbGcA=; b=kRMZ09RxZIUHk5gv0uEaE8xGqh1kznfVBcFS7r5mohdu416S2yoFGdKLo8IgXpSEFI IN7YgFOYnWD638bMB1C7aurxP/vGlkP81oP4Yw6uePAmho6cWufbRTxVxIupTHFmfQAp iQEZdq0L6+dIK9rQQW+p6TYuq8wpq/QW7BCWoCyx+2LKvtg5ifj1VSYkh9MW97RApimL xM4EfLuxJxjr1AjUR3MgFJsg+c2z8ToXB3gcfEfFepxYXf2QCXreUPOJ/5d/XcffHiQt t4H/8TrTepK0knJgsw7GDhWrsVfoDtNRoFw41ju2/aliAyrE3THUzwMU4xSan2XUy5B3 m+Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755176671; x=1755781471; 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=i/zcuC56Zj+TUzfAAs7ykKhwgtcOMzUZTNHIMAcbGcA=; b=TB8jq5gHJV7NL+wXL653jolHwSaCywpQyKn8u4e7chFkPEnrYWL2StO2UmH9Gnyk1s GNBJRFrADMfFBH0SI1qaqpX3OuqIfUgv8KTNeRRF0RJJ91L33viJujGnuEnn6eqBmJvJ 1skcSgIB3XTSNaG5utdax/dcPhNf/XKKL2PRkw1R3lCFHLjkdYEyjkPDScoatEOfuaLp /Lj7/MVOSiYxKihHfnSmI2dIDhzKFJTimHO8TULEv2uh5aB/M8YPh/6r+d2WSg50C7pn Fq5vtrHwFtwTK49WX9Y9R3BYovIUhzFWnZe7m51GlV68MWTu+L3tecMujvKYsPAfjfOj HIGg== X-Gm-Message-State: AOJu0YyHleJSyRL7wD+PI/xXMGg/uqLS1mKuEB3N0v/X1uPvjxDsVvR9 mfECFKqepQ5uEF4yIqi7Xm+ZflWusNGC9iLHsnTWT03Z0fRhNClzb9lMWDcBAM2v4FYraZ0nMrd gBsLaUAY= X-Gm-Gg: ASbGncuYZo0mukWwCBiIHQDDCUK1rU/yMBrZpE2bP1Eyl8Ml+BTcEjKOcuf/wxyUtQ7 mD6kMscWvv/gkrBtphbs1Yd15CZt+CNPxESKPe8PrNZt4OTB9PhjsrNC4nrtEdyx5IJUr+rgrEB O53HzhIOKp9FVrDPua3SRk/h/iA6Mt/xwHJwqbsPkCEoTJOHeiilOwQWH7hQFt9PSoDqshuKa4u n9TcRgGn/9/GG/1ZMDkBapwtpYk1a3kI95lUf2I+hvfhkD8lkeKsZOc0/8r83SUFiilE1A3EHOw emeohfDJJid8ds+/xMvh5m/XHzfmZNk68sC0thS4C/5lwqntbBDx027O8fRlN5wMZubjSBdmXEU llGjOfbAu0VCzznWAWF7N9Hduxmz8g6V3Ll9mKRnHAvd0pms= X-Google-Smtp-Source: AGHT+IET/HJ8ZWdmSMPJ5THKwFw8fkJ2kNw0DTmloHPE9oUVCpO5we3n2b9rVQq0eDS/QFuZas/Yyw== X-Received: by 2002:a05:6a00:1908:b0:76b:f61a:157 with SMTP id d2e1a72fcca58-76e2fb539d6mr4320530b3a.22.1755176671227; Thu, 14 Aug 2025 06:04:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 63/85] target/arm: Implement GCSPOPCX Date: Thu, 14 Aug 2025 22:57:30 +1000 Message-ID: <20250814125752.164107-64-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250814125752.164107-1-richard.henderson@linaro.org> References: <20250814125752.164107-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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=unavailable 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: 1755177322505116600 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 7a51836cdc..e9a57bc077 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