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 D2E64C87FCE for ; Sun, 27 Jul 2025 08:11:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufwSE-00061Z-Sx; Sun, 27 Jul 2025 04:10:00 -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 1ufwPg-0003G3-FI for qemu-devel@nongnu.org; Sun, 27 Jul 2025 04:07:20 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufwPe-0004qg-9O for qemu-devel@nongnu.org; Sun, 27 Jul 2025 04:07:20 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2352400344aso30526395ad.2 for ; Sun, 27 Jul 2025 01:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753603637; x=1754208437; 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=RPGoJwnTczFq0hUhh1/WUbQmW5Q+b6Pxb6X8smLgfxY=; b=U3rhdrPCLMbBLMWVo8dqfGUYl4Y51srOqTZ6cyln0Es5AYrSDqaxbAzVzmGdqLlhxP JHVp9L1XtmjN9IcSqbSOsffxpPUBFZu+TK+OUvhxSNoBDGH9X4H8PB3zZq7utIxURS68 /kV1UpbWKLL6i2mAx2NYMxpgri4A+c8uTZxfZmHfzjL7SehRb8CZo+I4UwP58HMxC4vu mlbdsenEC5axepsaZMhbwY6Z7CZc3ouRIpy4ApANcZCG2fvRdDmjaNrqvgLD2f8BgahF B3scs5p2S+D99hY/udBdeJim8hhAjldHx/meOh0P0EncDCkIPCkZFrKrQTcDVLzpJTRA nAgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753603637; x=1754208437; 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=RPGoJwnTczFq0hUhh1/WUbQmW5Q+b6Pxb6X8smLgfxY=; b=rI1DmA90I1r97WOJPKrfMlUeoh4Nu7rcVgIg1Y8VjuRnNoDDE6PUTgH4J/JecgMwSG NSSOwmOd9QnT+qyDT1uBnGST/mWGXbGiNA+bw9x3WiOU510CGBx0ix4bLZPppOJzduLS wuPHhlbdeIGTsbTavHateoet129cKcBhO3ZV+AA+vhZaeHv3OxwQsQHuiJly7qGDwdIj rs9H4QXQjFLUbdK9L88pETO15kpBQpYAx4poZpQLbcZu4OikMhCO86hvkBZASsrOwZy0 Mo9TJLWxdR2GwtvqmcTmoIwwFbRZLQsSc3HeAKh5mqEKyJSJDWL8kHnt300bZ4chzlEw Z1lA== X-Gm-Message-State: AOJu0YyQ51ClVXB+rj5zD4vOdvqc4fgH8aVfVpB47ysikDoNzDroXeGg Ce1fMVTuHE1YKvop3fZUNx2bRTyvsRNiaXPpndw7g033BFRrlHdXzE0E74vo3n1YlZGJCKTYHG4 fviI5 X-Gm-Gg: ASbGnct9RmpQTrVMQl2NO7xk2uOMcNTlid5vwI4c0J42+Rh8tB1AiZUGImosimHswwF +K4dwe+twnoV1gOC0hBjA4wg27C9MMGi3mwnt9/xeYcaQ2GlXezC7JoZsfig0BvTsB+7NTwiSEP G3EDYCBavQkma/pLC2ds2QuR7k1UXD6nngEI7JN1OXLhiXNir58cv/oX4ZP9uGul4TfboayHmsa BEx5olOHrg1S3vu4XT3h1q54QVvRa7rR1W780uVULAnDg7zVG7ELHV8xL+MqSNdA5sGflLztO0l 3+6PqTBAWPP+cYOtnglYnjSA+iX5bFgbAE1339psLDJX9YZiKhZNSqqa0/0ON3IaF9ZvFFbgj3+ 1cdsAGRvkxK6zyUMvqYqjO+5yXG+qCD1Adq3XyXckd0Nw6aPSlAymllAyw/qV3cO3SRkjuwVG6f /hsur0PXlVRtmMYwPL+zUK X-Google-Smtp-Source: AGHT+IEIRxYBJ603W4TXnAniQq+VBI0GlTfV2fO9AdN3n0NroZYOkJSO6Z4zjh9Q726DB8SpdfMkAQ== X-Received: by 2002:a17:902:ccc4:b0:238:d19:864b with SMTP id d9443c01a7336-23fb3165b37mr111857895ad.41.1753603636952; Sun, 27 Jul 2025 01:07:16 -0700 (PDT) Received: from localhost.localdomain (syn-098-150-199-049.res.spectrum.com. [98.150.199.49]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24011d5bcbesm3908065ad.10.2025.07.27.01.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 01:07:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 66/82] target/arm: Load gcs record for RET Date: Sat, 26 Jul 2025 22:02:38 -1000 Message-ID: <20250727080254.83840-67-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250727080254.83840-1-richard.henderson@linaro.org> References: <20250727080254.83840-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Richard Henderson --- target/arm/tcg/translate-a64.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index a945fd3b33..49e17548c1 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -433,6 +433,30 @@ static void gen_add_gcs_record(DisasContext *s, TCGv_i64 value) tcg_gen_st_i64(addr, tcg_env, sp_off); } +static void gen_load_check_gcs_record(DisasContext *s, TCGv_i64 target, + GCSInstructionType it, int rt) +{ + int sp_off = offsetof(CPUARMState, cp15.gcspr_el[s->current_el]); + 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 rec_va = tcg_temp_new_i64(); + + tcg_gen_ld_i64(addr, tcg_env, sp_off); + tcg_gen_qemu_ld_i64(rec_va, clean_data_tbi(s, addr), mmuidx, mop); + + if (s->gcs_rvcen) { + TCGLabel *fail_label = + delay_exception(s, EXCP_UDEF, syn_gcs_data_check(it, rt)); + + tcg_gen_brcond_i64(TCG_COND_NE, rec_va, target, fail_label); + } + + gen_a64_set_pc(s, rec_va); + tcg_gen_addi_i64(addr, addr, 8); + tcg_gen_st_i64(addr, tcg_env, sp_off); +} + typedef struct DisasCompare64 { TCGCond cond; TCGv_i64 value; @@ -1787,7 +1811,13 @@ static bool trans_BLR(DisasContext *s, arg_r *a) static bool trans_RET(DisasContext *s, arg_r *a) { - gen_a64_set_pc(s, cpu_reg(s, a->rn)); + TCGv_i64 target = cpu_reg(s, a->rn); + + if (s->gcs_en) { + gen_load_check_gcs_record(s, target, GCS_IT_RET_nPauth, a->rn); + } else { + gen_a64_set_pc(s, target); + } s->base.is_jmp = DISAS_JUMP; return true; } -- 2.43.0