From patchwork Mon May 5 01:51:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887411 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1824455wrq; Sun, 4 May 2025 18:54:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmbG5ggjqNqNa1vMLM4FG8QBKk0LM6+FuKMn04IFSZiquB81Ww88KHAkQ7LEvCzadzWCs0RA==@linaro.org X-Google-Smtp-Source: AGHT+IFo6nh0dDFxEfCPXjTtnEHjqiczXxJojYm4b9d0/C3jlTGFFuomiPFk+qp73vOP7kJ4L/V6 X-Received: by 2002:a05:622a:4ccc:b0:476:8f90:b5d9 with SMTP id d75a77b69052e-48dff2e2a50mr94783571cf.5.1746410088256; Sun, 04 May 2025 18:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410088; cv=none; d=google.com; s=arc-20240605; b=f2sESHvko2W39Rvv9igSlw3gQzD0agF3RARnE8gXZ2K5zU8gtySCmzT08zjCwYuLG/ amHUixALtI7ifyJz5h8iQDb/A/ZaQ8GSeQIWWJj9eabI7oNPEXmPn+yiJElxVniM5KP+ pX7QI31BfhzJhuJgMqTAe15nZwG7ajC90uOXZha+EAN7Q/4HCFbXBwNqlnPEqoJKBWuo r1FCLbzTXmWNmky4p+IyMSM1q49iIppPX8Wk6+eOpHGZoc2EJmzlS3Z1g95YdAGuvt8M ZxfNv49Y77twsMq9ypk9IJlSUWBDW2227YeZ8iKPrTQroNh8Jhs7yY1VsQpCd+ZDURff jyHA== 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=4MSVLYsQ1aHRPUMsqKWeWNfiw/1OBObe6XUOYFWrKME=; fh=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=WVktko32qarCu3YbODbd4qPk7+iOmMNrt3N8L5nrxK6DLZbRPkVkh9PBeJ+2ngLCRD 4P3rQ7K7kn2CUUpq4qr5wLqwKmoQ2YvmkScbbbhQswpr88nyuAqWl5S46QPQvdVwisL/ xF3WPXDXsZMqjUHCoRC0fXlwibOz66/r6n/4cCTaa04n6jGM6SBiUq+hp+8abdFqk94o 7c4rybHjuX+Vj7YSAAp6z7qS8u7JlYhlp38GI3iA6vsIaNBzgUjlFGwfNcBSCFZmpuB7 Ge1aeiQEwaAVukZ6wktJHSgij5Vpj1fTQSdWO1gQaztRDDfagoVC86o+zeoVzogQThSB 7o6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SyjZjWgR; 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 d75a77b69052e-48b98d10058si84457291cf.477.2025.05.04.18.54.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 18:54:48 -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=SyjZjWgR; 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 1uBl19-0004Kw-Jz; Sun, 04 May 2025 21:53:15 -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 1uBl0k-0003w6-Uy for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:55 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBl0d-0002Wl-3G for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:50 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2241053582dso57793655ad.1 for ; Sun, 04 May 2025 18:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746409961; x=1747014761; 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=4MSVLYsQ1aHRPUMsqKWeWNfiw/1OBObe6XUOYFWrKME=; b=SyjZjWgR5HwPkiuWN8CaP5ynaV3dJx4n+RLIQk6HhaRAKet1TJ4/kQOnKg2glO3lmx Wbg/tu83XaH+OXwgHyVHUpkRVIhubGlIDK+MmIfIFDL3XJw1qkJjksftg12ZtAfJ4Veo vv4UaTtr5UGryq5Fw1zX/hFJtq0zOqfee/AnW3T7Rn3hOBCTkLmRiFv+H2oVqKWeyxpc tgF/H8DwJVcUgBVx7iJE1/wgWQ5HzPgUs0MN056r/dnQAtyuKxLbpyaOkDgOs9G+Yc5c izG5W0D6UvY/wmh1Et8nLWVj+1frPwekZ5MfTRF0usvUbMG4fTuKhzIHLHZBBTpoSPLw iH/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746409961; x=1747014761; 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=4MSVLYsQ1aHRPUMsqKWeWNfiw/1OBObe6XUOYFWrKME=; b=NZZMuiy70Z9JBxkOmX3/2q2gXJVG3jFh2p4NlOcal8VmOKdZY+zr72W/UbcF8Bt6rD QxjCGUfkkJfNHJ1vWR/I6+APxpXN1OSFq0yLKxyktIL7LgywfWmr5H2QI7P1EczWXmjM oLsL4cavni8NJDhQDvPEY6o9NciT+7Rr9BS9iNeQDkSw40/yEggYGzLIlkq3FyiAtBq7 p4MiYhgwLVY5ZP5mEUMuGf/euywjoOF3SiOmaKlOwZ4+qEp3JHPkkJSaNoIKr6UKI7SJ PQVIOsiow67TDsOF01DWjzlVOkVdMEAKcoN6t5pIqWErQm4TXe62mCmfwgTPNDmw/hwQ n2TQ== X-Gm-Message-State: AOJu0Yyn23OMO9+LUR+HZqRmXystxTU+EUdJxxzTHzmE6Na9In661/dg NVKozrw0AAn7Z1Q0NgJ0wdMzxU3HHKRkTs7LA3eEVfc/iOqBUMBa/6J6LZa/H6eTIE9JCWDUpfA qS/g= X-Gm-Gg: ASbGncv9o6nlu7ugtfLBU5WMxZdcRKKujHbiyB9+x9mtWBbpNwopWVklejf42tmWdz8 Ih3D9yP8sOCKcYmyuNlb718fXTPgQbPTQk125fHsn+9gjpXkJNh2XfLp7P/8cXzyGVZmka1MVUh 6b5U5cvKaMJQm4Kr/ZMaoyjBlUOaO2CWYr4A973dPgCYGVpffT8FcF++QSb1DlX43eOE1ikYxrK 112iJMm+20kUl3AYVy7HGlCJGKs4IportJ90K0l1m6jy7nCsEki/yeeGVyBBprIYB3RrEtMKsy5 0T1TJnFIEeQPAFIKol+JHKxGetijNemrOYMR/gOv X-Received: by 2002:a17:903:1aa8:b0:224:1781:a947 with SMTP id d9443c01a7336-22e1e905660mr87815615ad.21.1746409961673; Sun, 04 May 2025 18:52:41 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3920074sm4462101a12.11.2025.05.04.18.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:52:41 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Peter Maydell , anjo@rev.ng, =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 15/48] target/arm/helper: use vaddr instead of target_ulong for exception_pc_alignment Date: Sun, 4 May 2025 18:51:50 -0700 Message-ID: <20250505015223.3895275-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> References: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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 --- 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 8841f039bc6..4e3e96a2af0 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -277,7 +277,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 d9305f9d269..4f94fe179b0 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10243,7 +10243,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 88df9c482ab..99f07047fe5 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -7790,7 +7790,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;