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 C9826C87FD2 for ; Sat, 2 Aug 2025 23:58:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLsT-0004rj-J8; Sat, 02 Aug 2025 19:43:01 -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 1uiLo4-0005gn-IE for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:38:28 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLo2-0006Mb-Jp for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:38:28 -0400 Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-741a905439eso355581a34.0 for ; Sat, 02 Aug 2025 16:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754177905; x=1754782705; 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=2HSPiExRqazCWebE64TbzRDEiXNPirvZyWGgI8CApPM=; b=OPCcABU6y0IOr45LebLqf6U2UGLvtV43hU9gdX+IKN65KtnlvAwhD9+wKsVZwe7T21 NkWommxbyeGXGQNTz9SbkiubI1NRZqmEjhlxWcYUYc+dffSp7RYQUlHCRxZs2ngGBu5l ofPexncoaU53l6RwgzAOyH9coYSdsMmbDIubez6pRU7VkqoJ3S/tykboBDqAjJQ+l0f9 Zr0Ntppl4Wbv4SaT95Ubf7nLj3khIlJqhmafmFa8dMWzzkofLCJXmGkFmX/SlapVj74t 2HetQav4njuqcSDzo71SV09lpNvGpCIvqKZPDXV/Ij2K5aw1ok6lbXXwJsVZGqjcQCHG R8hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754177905; x=1754782705; 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=2HSPiExRqazCWebE64TbzRDEiXNPirvZyWGgI8CApPM=; b=MSkXujVke1CWRcM7p9JL3+/RgqfuFAPP8nNy7DyYLNnBhSB2XLJG37wYJMpOzndv6Q GSi1tlI3cGo8MLH1yIKu58AwJOAl3R1DEgf5dvGzMNdzHj1rUSfXLim/ws/DcB1EfPOR /VNJoVwTxkZ41q+llVXgr/fiq6q5dkyyXEeHD70X+XXtVWpvNqZA0Gd0vYejGgfeZSnv 0XL2/zgbX+s4pUJxmreB92CAd6V4wN9r1CHJ5R4/OFv/1vUXqtK8JldQx6V0ukw6FBv9 kSa2yvp/B3mbJvGiHcbGSdcxQR4FhLo2z07Y+1EmCYtkChUvot+RaHAw3xcbaEJ3YPNr KPRg== X-Gm-Message-State: AOJu0YyNSjSHpfOaDqIQGcwXH1AdKIIO1WTUfH+/Pco6VVfGQjyd79ew WUzbpA6GqGVFLsB+Kvbc38JcBq/OQyU4DZvnNKRwyHDki/xi28isTQGdfkACXPcROqHO4yc5KHA iaDcYN0M= X-Gm-Gg: ASbGncvAP6rA24SJ47MEcKGXqlJtBsGEzo07SOTPNoRXT5I6FAolzezW/fB//Vl9f+E GEHHxd5AdlXZkmOpZBN/I1KN8S08XDPiRKH/IkYK2B3fMyXVNUxSCeuVLrBscQrNI02FXAPeR5g dgs3dFkdNw9e15RZ/4w1xGaXgCFcrtgAHvk5zYK4lzwN6k4UVd2ldsd2O/3KTJgCuDus6abmyDK jbTPKU6eQ/gVgtKkZlzPkHXAfZ45vkiEhgeEqGLy8g4mkX5DKNeDLD06aZgccYQRF6j1yrX4IOh eVvJFzUXXtBdizy5iiZw0S8OcVlmb/1aZ26zHcbkjjcAxFDvttRMcKFxTtE5/3lUSo6mkSLlmo3 yfdyxWzpKTnEaRbzK2CSumaqwanpVst+Qo1kcSWjBc3dOEkAuuM8iRC30a6/J6uc= X-Google-Smtp-Source: AGHT+IHzLx0oInWui1kROALJKuRaUkC5LQsMNaopnf4EU4XtlCa0lC2gcrcZhiGYeCkHRO+qUwquhg== X-Received: by 2002:a05:6830:660d:b0:73b:2751:eee2 with SMTP id 46e09a7af769-7419d2d3e9emr2503781a34.23.1754177905569; Sat, 02 Aug 2025 16:38:25 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-741a71dc78asm380409a34.30.2025.08.02.16.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:38:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 68/85] target/arm: Add gcs record for BLR with PAuth Date: Sun, 3 Aug 2025 09:29:36 +1000 Message-ID: <20250802232953.413294-69-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802232953.413294-1-richard.henderson@linaro.org> References: <20250802232953.413294-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32e.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 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/tcg/translate-a64.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 4c3cc3d943..a945fd3b33 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -1831,20 +1831,20 @@ static bool trans_BRAZ(DisasContext *s, arg_braz *a) static bool trans_BLRAZ(DisasContext *s, arg_braz *a) { - TCGv_i64 dst, lr; + TCGv_i64 dst, link; if (!dc_isar_feature(aa64_pauth, s)) { return false; } - dst = auth_branch_target(s, cpu_reg(s, a->rn), tcg_constant_i64(0), !a->m); - lr = cpu_reg(s, 30); - if (dst == lr) { - TCGv_i64 tmp = tcg_temp_new_i64(); - tcg_gen_mov_i64(tmp, dst); - dst = tmp; + + link = tcg_temp_new_i64(); + gen_pc_plus_diff(s, link, 4); + if (s->gcs_en) { + gen_add_gcs_record(s, link); } - gen_pc_plus_diff(s, lr, curr_insn_len(s)); + tcg_gen_mov_i64(cpu_reg(s, 30), link); + gen_a64_set_pc(s, dst); set_btype_for_blr(s); s->base.is_jmp = DISAS_JUMP; @@ -1881,19 +1881,20 @@ static bool trans_BRA(DisasContext *s, arg_bra *a) static bool trans_BLRA(DisasContext *s, arg_bra *a) { - TCGv_i64 dst, lr; + TCGv_i64 dst, link; if (!dc_isar_feature(aa64_pauth, s)) { return false; } dst = auth_branch_target(s, cpu_reg(s, a->rn), cpu_reg_sp(s, a->rm), !a->m); - lr = cpu_reg(s, 30); - if (dst == lr) { - TCGv_i64 tmp = tcg_temp_new_i64(); - tcg_gen_mov_i64(tmp, dst); - dst = tmp; + + link = tcg_temp_new_i64(); + gen_pc_plus_diff(s, link, 4); + if (s->gcs_en) { + gen_add_gcs_record(s, link); } - gen_pc_plus_diff(s, lr, curr_insn_len(s)); + tcg_gen_mov_i64(cpu_reg(s, 30), link); + gen_a64_set_pc(s, dst); set_btype_for_blr(s); s->base.is_jmp = DISAS_JUMP; -- 2.43.0