From patchwork Mon May 12 18:04:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 889377 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1741860wrr; Mon, 12 May 2025 11:12:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3ALDzQB6xWjq6aDmHwF6xjGZrUuEsRsNmvK2gtUaogP96+dLRS1Zgmwc4NCuFeTtt3T3VDQ==@linaro.org X-Google-Smtp-Source: AGHT+IGxgNqVbXFfAJCI4u3wlGmhLkbPPQ6tYTv2fWDqLSu+GQNZrJTA1S4QbLvY6WmSgRbBvSI9 X-Received: by 2002:a05:620a:319e:b0:7ca:e971:8335 with SMTP id af79cd13be357-7cd010d51ecmr2333336785a.8.1747073531100; Mon, 12 May 2025 11:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747073531; cv=none; d=google.com; s=arc-20240605; b=LfDgpTf037ZUIFTPhFCUs5juRwKa7/JdE6lULLr1waJwNG/ZpuK7DdVOowRfaV5L+j XT+NBCRGqfcbsXnd4apZnkQIv7yaBFvQsMJvE9ro3N/jf1uSmVblfUSL2oHc+uUHsaqD vxTIPVTzS/KzlMAcZK1vCu7nvUBWZWm6kE06diosRHaWtSd1U0xCuDs9WFjphC+601a5 AFTXpE36OWFJpEoqcywo0q/Ubsdc15xUxSRQ/SghaQIOVMzjTsLYbxUqvI8YoU6Uo8AR dFbeTW0KbMvts6IC5RQ62UHdD3w+skeXa02BunO1pyYGIZJcFXKtATuIjnL9+lIH2Eoy SHBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hulB2UBYIXOqzJFKVn1ypmpXSnKnDaK1c4I5WrAN9H8=; fh=PlN3fUhDtems6Bb7y59zYD8EwBcqcc7pnzqldojq+us=; b=GLPKtMdAjjlp+foUkS51qAV6j8cYpAKRqVu0ReqcLJDBqhC0rr4YZNFhpj3SvzWFf1 m7WjyaT/BL7x1xr4DPpYOhp7RGAKa3WW144gL9Fl/gEr798G8aNeSoiEZPxx15os9aTn VP9I4O2ud0pi9yWmXV1XXWekfOMjZsikV2Z0yAhchqMn3GpeTV+bIR2WtGk3TCCGqjgl XNAoclIsCwzRlkbDGSdBLFdN3ZCjXSxGG3A7vR3f9+ihjpf4i/paXYmc8t3B+a5VV6UP 0Gnfb5zOCwPNZwWysFau3m+8/wkEZNXts350I5tTSf92hbbuTmyQnKYITTnQuPQGuO1j IfJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AfD2Jiye; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fed816si931537685a.485.2025.05.12.11.12.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 11:12:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AfD2Jiye; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEXXP-0003IE-7s; Mon, 12 May 2025 14:06:03 -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 1uEXWq-0002RT-D4 for qemu-devel@nongnu.org; Mon, 12 May 2025 14:05:30 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEXWo-0008Uz-BJ for qemu-devel@nongnu.org; Mon, 12 May 2025 14:05:27 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-22e4db05fe8so43638045ad.0 for ; Mon, 12 May 2025 11:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747073124; x=1747677924; 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=hulB2UBYIXOqzJFKVn1ypmpXSnKnDaK1c4I5WrAN9H8=; b=AfD2JiyeBAncqEpaEV+eqm5xVoAxKXQIEo/4veHNVClgvDNEmc/iXy+/6ijJIrLFuZ 0Xs54b+mZPIdQRw179oL8qF8F7KVxARzW+BRGSciLlh7iiQd+6E8DoVFd5aa5j7pSUZz /UwQL9HxlXsp9pvqsup8ask+9gBumnbrWgHSDq46Zb7idC5Zp8bgx7YQw7JWfHki+JZV W5PRwSWDii1bvGuyrVrBtQE0t0Vck/sMt4KgiHybyLv046U1vTLOPcpZ1DmarkkawGjt sdmy/vRyhkYwECfxNsz0AvBY4fO+cGPdSdzJW0zqcNH6+BUdRd951YW0GQUEmQEVMtZM m0lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747073124; x=1747677924; 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=hulB2UBYIXOqzJFKVn1ypmpXSnKnDaK1c4I5WrAN9H8=; b=ZcrPZ7qcXTp9RnIaWS4cZRvz0zgBafkWzsZfKua8Z7Fm1k/fUIvbG6WNm0UGbaf7ET jRDvonFtv6iKHNx3d9+301IhNwbTEZJJNT0A9NIotN/idRMoEAR+L4if4i3oIvylkkLE kKJjAvWlGFpyNFAlQVBbZjZ6hwLyym4JKx6oPcDLhCv9yknw07SVsvv53gpJ7ESEO8cA trmoGAvvlT71PrJoBk397mLi5szY2SvR1eseEV47vlOXnVFQrSDqoW4dO9YYrC7fs3sh hzQeYkuLQq6JkzYoRzjW5nILrXhmuqxod1mR64L2kgtwYOXtRW2ZkWIfNJcsD4Ba7VvC 0eJQ== X-Gm-Message-State: AOJu0YyvJNVaNS7HR5I2jzuISAFM/+uStfnBzzYnsbVooILu1I+7KLrN akcdM9HFNb1OMEllbjhKT3B1reDLyfEgklsCmUhebR28G2SHD796cnVJ05q5OedvivV0Zmktc7D m X-Gm-Gg: ASbGncujqd9NMbNx7jOsBJCVtUSPaQzaslEVq3jqUDBIra+AkfvgesPv7z9CqgDVkDL rB8vDTrTq2CdNd7Y4a9leLo9ii8r+Ub3F+en6IhiqYchwkVO5+WH7ArNlEWCO+T8niKXYZfYZtS Svs7H6OAmKo2Y0yyXuqw7T3v1VjhCJXtiHytK2Otg5p8ybiHPKS+Dkbxw/L309itdXXBMQPiYIT 1LRHOZl2ouU8/IhtXBD8RamPXKPLt7AX+0Nb1fiSjE41CrmnKGR41ypTjftclxlOeJheEpQ21CQ C0cCrA0ewIrkAMINi+epO53+v68gSCi/sU8mw79s7E8dnix/ADo= X-Received: by 2002:a17:903:3ba3:b0:220:ca08:8986 with SMTP id d9443c01a7336-22fc8b3e338mr213945315ad.22.1747073123534; Mon, 12 May 2025 11:05:23 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc82a2e4fsm65792005ad.232.2025.05.12.11.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 11:05:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, alex.bennee@linaro.org, anjo@rev.ng, qemu-arm@nongnu.org, Peter Maydell , Paolo Bonzini , Richard Henderson , Pierrick Bouvier Subject: [PATCH v8 13/48] target/arm/helper: use vaddr instead of target_ulong for exception_pc_alignment Date: Mon, 12 May 2025 11:04:27 -0700 Message-ID: <20250512180502.2395029-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250512180502.2395029-1-pierrick.bouvier@linaro.org> References: <20250512180502.2395029-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- target/arm/helper.h | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/translate-a64.c | 2 +- target/arm/tcg/translate.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 09075058391..95b9211c6f4 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -49,7 +49,7 @@ DEF_HELPER_3(exception_with_syndrome, noreturn, env, i32, i32) DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32) DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32) DEF_HELPER_2(exception_swstep, noreturn, env, i32) -DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl) +DEF_HELPER_2(exception_pc_alignment, noreturn, env, vaddr) DEF_HELPER_1(setend, void, env) DEF_HELPER_2(wfi, void, env, i32) DEF_HELPER_1(wfe, void, env) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 5ea4d6590f2..d9e6c827d43 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -276,7 +276,7 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, arm_deliver_fault(cpu, vaddr, access_type, mmu_idx, &fi); } -void helper_exception_pc_alignment(CPUARMState *env, target_ulong pc) +void helper_exception_pc_alignment(CPUARMState *env, vaddr pc) { ARMMMUFaultInfo fi = { .type = ARMFault_Alignment }; int target_el = exception_target_el(env); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 52cf47e775f..ac80f572a2d 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10242,7 +10242,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * start of the TB. */ assert(s->base.num_insns == 1); - gen_helper_exception_pc_alignment(tcg_env, tcg_constant_tl(pc)); + gen_helper_exception_pc_alignment(tcg_env, tcg_constant_vaddr(pc)); s->base.is_jmp = DISAS_NORETURN; s->base.pc_next = QEMU_ALIGN_UP(pc, 4); return; diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index e773ab72685..9962f43b1d0 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -7791,7 +7791,7 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * be possible after an indirect branch, at the start of the TB. */ assert(dc->base.num_insns == 1); - gen_helper_exception_pc_alignment(tcg_env, tcg_constant_tl(pc)); + gen_helper_exception_pc_alignment(tcg_env, tcg_constant_vaddr(pc)); dc->base.is_jmp = DISAS_NORETURN; dc->base.pc_next = QEMU_ALIGN_UP(pc, 4); return;