From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id ACF86CCA470 for ; Wed, 8 Oct 2025 22:08:48 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6cD3-00013c-5H; Wed, 08 Oct 2025 18:00:33 -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 1v6cCy-0000p6-3z for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:28 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6cCR-0007O0-72 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:26 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-78125ed4052so366897b3a.0 for ; Wed, 08 Oct 2025 14:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759960789; x=1760565589; 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=l99ksAJYf1hlHp85ERW0bOXWhCZwYtVl85Rk+LJ4JGI=; b=D0xM0v7Md7lnmmlhZzcfMxIPMxtdjla4lj2Dpd5yx8Cxk9UQwlPnJWMYwoKq87klNy /u4LpLQrDZDBWMrLsIJ+HW1o4qN8/0YdodV6XnSnyk4Gr8lkEb28Ndf8xMNz6xzHQanZ Q1elaTtXBU6GUbEomveryiwozfm6b6kDNP4oZtv49tuYgik1MxKK2V+PkmviAFj6ntWE 0MgyIdQ5uw7r4iE0eWoUzBBH5JD2hbTmQHrxBxWhQzjcsRkJA2j9FMiULED5QW8SQSvJ R61e50PqB3Z3RRzdUuKRdjaSRrZAkR4ZwaTvR6Y0RPlWTQyZ0NxKGuCCQ6PyKwpq/sQN 0Rcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759960789; x=1760565589; 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=l99ksAJYf1hlHp85ERW0bOXWhCZwYtVl85Rk+LJ4JGI=; b=ez1py05DhkiRNF6JKP0k8xh5KVZl2PCiRfmOucT9yMsu6mJ1thu6sYQjHJtcm2hdUo IPj8daKjuuChHmdA3t/52sJbR8TXjpd0QZuFOYM3y8qm6A00m3F8lVb/xKgrtQy+OoZy xcXb3K859ljrNcsV0kPKoEjCE/Y4FE6Ec3mea43SIWFZh0lFMgggqZ61n8dbmibEw1ow 3+oLAyuMtPT1sSPl/8y60O77h3zsNLZbIlUHD7tMSlnwYM31Hf+t09a4roHRpVS5EQd0 weqfeRnzbDbXOf0PAv3ML8BlNId+uwPMLxYe+UzdkN9kwz/dNR8T5eVw8fMMDjsgDh24 Ccow== X-Gm-Message-State: AOJu0YzFNP4LtpNB9JJ7mw2+o4ztCkDutjPZaN6bQug9I+KGmhhXO4v/ sYyBDH7muZsZIiHtxQo8bewgiEuXg4m26TUtI6nU5YVUv9YnQPwbDJqPw9nw5RtOgyAESsOHfWA 1QzvJifM= X-Gm-Gg: ASbGncuaX/K+Cc/UgjYJ/QN1QVK8w66fz2SFlz5XnKq9/hMMLV8Izt2hUiiFBK74kN4 NUfQDnJU6EnLbYLT6ymR969zMYJXKxfU4vDue2cZj3arbxYdL4PCsgn2DDCWCeMFeTmzjU8qhMO 16TUb36Bl8yx+XcGoDBlFbeMD0CsesEfU1392pnDxQmmaAtvrZFg/HVcUbgfY8LaFxTAcosBZOf 9LfF74U2VhpaizkmyT7S/OKxWlCPt3OIS4X35XO+CtamuUJ+UxBCQjHrYSoii9s8GooXlBM+XDq mmzjBHFlq+ICA+c0jsXvvpBFwcD5BR642qyalOD2XXhMH0XffckBcPZijaW5qFt5ER6NwMiJYnH PIdjHakl0gbhoxygFAofX5fCwR4CjO7vXRkI2BjO/Mu2rjaN2I12jjp/r X-Google-Smtp-Source: AGHT+IGA0HT3MranXs6/jCBxlwh+eTQlHnZT9ZtK6YRWP0ULYUS22tAJOkDuyPNASmQ4jSBucOjxzQ== X-Received: by 2002:a05:6a20:6a1d:b0:2ff:1132:8c39 with SMTP id adf61e73a8af0-32da80da6c9mr6219022637.4.1759960788793; Wed, 08 Oct 2025 14:59:48 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-794e1fc9db6sm740724b3a.66.2025.10.08.14.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 14:59:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v7 52/73] target/arm: Implement GCSPOPCX Date: Wed, 8 Oct 2025 14:55:52 -0700 Message-ID: <20251008215613.300150-53-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251008215613.300150-1-richard.henderson@linaro.org> References: <20251008215613.300150-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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, T_SPF_HELO_TEMPERROR=0.01, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 ccf45fd136..6d9145109f 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -52,6 +52,7 @@ enum { ARM_CP_GCSPOPM = 0x0009, ARM_CP_GCSPUSHX = 0x000a, ARM_CP_GCSPOPX = 0x000b, + ARM_CP_GCSPOPCX = 0x000c, /* Flag: reads produce resetvalue; writes ignored. */ ARM_CP_CONST = 1 << 4, diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c index 5b5b895a09..3795bf7f36 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; } +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 = 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[] = { { .name = "GCSCRE0_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 5, .opc2 = 2, @@ -120,6 +133,10 @@ static const ARMCPRegInfo gcs_reginfo[] = { .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 7, .opc2 = 4, .access = PL1_W, .accessfn = access_gcspushx, .fgt = FGT_NGCSEPP, .type = ARM_CP_GCSPUSHX }, + { .name = "GCSPOPCX", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 7, .opc2 = 5, + .access = PL1_W, .accessfn = access_gcspopcx, .fgt = FGT_NGCSEPP, + .type = ARM_CP_GCSPOPCX }, { .name = "GCSPOPX", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 7, .opc2 = 6, .access = PL1_W, .type = ARM_CP_GCSPOPX }, diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 72b912a605..bb8ffba586 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); } +static void gen_gcspopcx(DisasContext *s) +{ + TCGv_i64 gcspr = cpu_gcspr[s->current_el]; + int spsr_idx = aarch64_banked_spsr_index(s->current_el); + int spsr_off = offsetof(CPUARMState, banked_spsr[spsr_idx]); + int elr_off = offsetof(CPUARMState, elr_el[s->current_el]); + int gcscr_off = offsetof(CPUARMState, cp15.gcscr_el[s->current_el]); + int pstate_off = offsetof(CPUARMState, pstate); + int mmuidx = core_gcs_mem_index(s->mmu_idx); + MemOp mop = finalize_memop(s, MO_64 | MO_ALIGN); + TCGv_i64 addr = tcg_temp_new_i64(); + TCGv_i64 tmp1 = tcg_temp_new_i64(); + TCGv_i64 tmp2 = tcg_temp_new_i64(); + TCGLabel *fail_label = + 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 = 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 = 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 != 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 != 31) { -- 2.43.0