From nobody Fri Mar 27 04:00:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771473808; cv=none; d=zohomail.com; s=zohoarc; b=JSLT7ropd+NLG+hbyOL7vX/9UspsVH49PFSaq5HxnOKU+/QB6Vea/ZOw4JS8oC3CrcOyA1vNU/CfL3ZlbnKdZEpSTfQJEmlWMAHhlRL1IxTdOqtFZ8f0eDqJbfgV7EQyG0z+zFI6QWvE8WyrL+xyX3sNFwTFI+1nwJIjgi0S/5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771473808; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=X+EWQStl3OxtO/agizp2TzeqNHuyOddWzArd5felHRI=; b=KNTfqCD4ddAbJCkY1zU4y/SjTxGDPqA8COo/mrZpO+BQopgv7rCI6wfju3T/TcQhJZNg+lnG45XJu2G7J2nCbhz25PIHIlqGvfk67defMcNR2x208P2K5dd+lFzv4AN0H3cemSYdCHJPzEtdudlICDG5jZtsjP6TNMZRLmoBJsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771473808207496.8778651054761; Wed, 18 Feb 2026 20:03:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsvF4-0008Mb-Vg; Wed, 18 Feb 2026 23:02:18 -0500 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 1vsvF3-0008Lx-V3 for qemu-devel@nongnu.org; Wed, 18 Feb 2026 23:02:17 -0500 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 1vsvEy-0001D2-FO for qemu-devel@nongnu.org; Wed, 18 Feb 2026 23:02:17 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2aaf9191da3so2854115ad.2 for ; Wed, 18 Feb 2026 20:02:12 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a73200asm147636225ad.36.2026.02.18.20.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Feb 2026 20:02:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771473731; x=1772078531; 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=X+EWQStl3OxtO/agizp2TzeqNHuyOddWzArd5felHRI=; b=QWL0H7Kce/kelE9D1liCOoc+wHrwa+TpZDX/4mvSF3JWPlYnQsoFF7q/eoWNC1Eg5S S2p82B8E72nA4pcDNK8KKfWipKm46PaiTrC2lp4XIui7JcvEDrVK1TR8v8k87NqjU0Cf zUo2o52as15wgTGZpNROxyfpz2cBCrdsGvZeG6LMeXjgmRgabCgPMd597U6AA354KhZR i4f9i48ccOFL+ytLBO+3QHTB1MY+k+TpDq98V/YLmJXZ1hfHEdLaAtyquHc61XyOP/XP lFY8iajxS7U5ExZFbgUjqE9bV+ER7kM+Dq5LDTV4AQdKIn2HBV49yDpSZSZxT/9VMb00 SPNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771473731; x=1772078531; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=X+EWQStl3OxtO/agizp2TzeqNHuyOddWzArd5felHRI=; b=rSRw5VVvvZT99gABsIDOqdOQKK+b8f+aT7ylsZevPlKWLyRM5AbxFAucVCGJpph3KA PDJBH9dHwj1mf+XfFGRmPk66CisF7Ku7iRw1bppaNtSAPANq8AFJmX5Csb+vV+OYnoMa 1Kd1F2NNHob8b2bvOA8xyAGEd8sV4AaKlfEJz2izg9n7/eHwql+NI0uEjw0wheIX5VMT tsdDSfVtGrc3lP8pNrKwyoAvBZD7pnOOnuSD9ENu+pvqk7FT7pHMN0bmiVOos/hbWOr7 gHG4FZWCkornGQ9j9/AGq3Fg9fe8oIpv+fY5fNxqYLjixlva07R9m8L+WxburfcKKtMx 8vFA== X-Gm-Message-State: AOJu0YyHvUC1HvWCiR0xZ8YtC9c5N3Cme+MxiH9sdyysoVAM17uSWPBJ oDqjUB58hA6cPJqP6Qr0tbAhUkGaxN3dXfN0DWLR0dHed2PReKOIK0UdRPWYcH4yzrSF/EXaY09 /MXEW X-Gm-Gg: AZuq6aJ/gh9DpezHmjV26q2JNUYSJ9KXbrYK11Zvt5hS0mZzFqQNYjan3bGHhdPKYMN Zd2yhBB+b+clhYSZGVZTO3pWZJkMghWy2Z0tyPuMUj9P4Vx104daoF22UYb433JB/Vh/MpOlcak MZKkVDT6F1XWUytD7gqOiGFwSXeeBxl0w7m86cb39j9Bi4ITxlYWd4MQ+v2R2TM4zrDqGBe5/VE phnytbXEdPh0tZYs8sgdH+Ed7BEuwdhaGFC/ttCLLM2bbrKKspjMCbx+KlYYscFc1wejj/tMvBd d5wyXcQMlTwrkozgxVG4M/4CeJQ/wUp9fLYFMKsFgGp5TdST0Ac70pZChL+fg6yvv/Qs/3USDZV tiV4W3YcM2VcHcnXTnkywZVXKN9BftjsN3bJTJoQau6FIgEYXhHUg0ndUJ/TZ0xtotAFQnGAwrB Q++4VgtG7ocTt4RajDSu7D6jfq3Scg4nnoYuzkpjDBl1a83t/uKXLKL6RRx+H9Oo10hYC2crBE+ zRR X-Received: by 2002:a17:903:32c7:b0:2aa:d60c:d48a with SMTP id d9443c01a7336-2ad50e77664mr37975015ad.7.1771473730975; Wed, 18 Feb 2026 20:02:10 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, kvm@vger.kernel.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , anjo@rev.ng, Peter Maydell , Jim MacArthur Subject: [PATCH v4 02/14] target/arm: Don't require helper prototypes in helper.c Date: Wed, 18 Feb 2026 20:01:38 -0800 Message-ID: <20260219040150.2098396-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219040150.2098396-1-pierrick.bouvier@linaro.org> References: <20260219040150.2098396-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771473810106154100 From: Peter Maydell In arm_cpu_do_interrupt_aarch64() we call the TCG helper function helper_rebuild_hflags_a64(), which requires helper.c to include the TCG helper function prototypes even when this file is being compiled with TCG disabled. We don't actually need to do this -- because we have already written the new EL into pstate and updated env->aarch64, we can call aarch64_rebuild_hflags() to achieve the same effect. This is the function we use everywhere else in this file to update hflags. Switch to aarch64_rebuild_hflags() and drop the include of the TCG helper headers. Signed-off-by: Peter Maydell Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/helper.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 8c5769477cf..033baf7e715 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -36,9 +36,6 @@ #include "target/arm/gtimer.h" #include "qemu/plugin.h" =20 -#define HELPER_H "tcg/helper.h" -#include "exec/helper-proto.h.inc" - static void switch_mode(CPUARMState *env, int mode); =20 int compare_u64(const void *a, const void *b) @@ -9473,7 +9470,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) aarch64_restore_sp(env, new_el); =20 if (tcg_enabled()) { - helper_rebuild_hflags_a64(env, new_el); + arm_rebuild_hflags(env); } =20 env->pc =3D addr; --=20 2.47.3