Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195361/?format=api
{ "id": 2195361, "url": "http://patchwork.ozlabs.org/api/patches/2195361/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260210201540.1405424-7-pierrick.bouvier@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260210201540.1405424-7-pierrick.bouvier@linaro.org>", "list_archive_url": null, "date": "2026-02-10T20:15:34", "name": "[v3,06/12] target/arm: move exec/helper-* plumbery to helper.h", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4c78313c6450ed1a81458e9b975d8f53e1e0fa97", "submitter": { "id": 85798, "url": "http://patchwork.ozlabs.org/api/people/85798/?format=api", "name": "Pierrick Bouvier", "email": "pierrick.bouvier@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260210201540.1405424-7-pierrick.bouvier@linaro.org/mbox/", "series": [ { "id": 491737, "url": "http://patchwork.ozlabs.org/api/series/491737/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=491737", "date": "2026-02-10T20:15:31", "name": "target/arm: single-binary", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/491737/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195361/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195361/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=OcoDkYKU;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f9XtB12YNz1xvg\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 11 Feb 2026 07:17:38 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vpu9d-0008QC-Ox; Tue, 10 Feb 2026 15:16:13 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <pierrick.bouvier@linaro.org>)\n id 1vpu9K-0007ru-S2\n for qemu-devel@nongnu.org; Tue, 10 Feb 2026 15:15:55 -0500", "from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <pierrick.bouvier@linaro.org>)\n id 1vpu9I-0008Ai-7W\n for qemu-devel@nongnu.org; Tue, 10 Feb 2026 15:15:54 -0500", "by mail-pg1-x52c.google.com with SMTP id\n 41be03b00d2f7-c61342a69b9so1640144a12.0\n for <qemu-devel@nongnu.org>; Tue, 10 Feb 2026 12:15:51 -0800 (PST)", "from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net.\n [216.71.219.44]) by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2ab0b392cb5sm38523225ad.70.2026.02.10.12.15.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 10 Feb 2026 12:15:50 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1770754551; x=1771359351; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=XNDpa+JQHOniHzUT0Ozar04kohZ49T4fHdN5SF9nmyk=;\n b=OcoDkYKUra8MMWhHsKx/2YHj9HNA/qeYceOWHZY15eqldDLNZnec2tVDPWrMTprDJO\n ibv5DQLXpyT/T5dPmWUitJC+fz66gmFXFVx/mqc+sV5D5dZwCCzvFcGemujoOlwRMn3I\n lls9lTftGaadVj4bMqxec9lRt1S0iaton1J/eF43x973pPjs6xkDlF4kjbRLVY23x5kE\n q3AML7q9nwIwkc0ilHmVSNBEFxhvnuM7OhteC/1lH73BtflN+A1ldfcQ5FMpTZMpuFTl\n BXLKkOAd+ulrk5HeohD8es5nIoPAVg/s6NP5rmRsWTpjNz83SwhtZ6yR3O+N9mWV5NkZ\n GRgA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770754551; x=1771359351;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=XNDpa+JQHOniHzUT0Ozar04kohZ49T4fHdN5SF9nmyk=;\n b=bsgE0VkLu/fxRygbku9e6Uz6nqqILxLH54hJ8ymmVw9EZuHUw57FFXCl0FuiXRwbQB\n 9ULlXlb4TcMscsf7bVh9Eiu0SY/FfmGRSEInALbxUbmI5ktgxiIdXAarIjUPyXMPWkbo\n PVeXJnGhp7EQ/wuNWGpfhwZJM68steuhioAqw4Avj7g5Pxo5Gkn8+1eBF4MHYf0RKkRv\n op2WsdfVkXsBAJ0a9k6p2okOK6LBlt7uxj3IHV5/uaT9tJaux5rigQiDVP+JgGmo4fch\n wwGoTc0qEeATgkeRhRTiFOJxlZ3JQIWgQU89af3T3Mhl14o3IJb1HEgQcisgaUBbHt+Z\n efJw==", "X-Gm-Message-State": "AOJu0Yz76uvXsLF0qCCa8jZqI64LJe6/EybJ2POR/p98qUq07mkYc4DT\n /Vbvo3ftVv7kRZm6aQBCkFGF9mEeYYJiJui/01DN8uDkn4FA8GOjbax9uNCArI7Q9Q8hzcpluuD\n 4AROx", "X-Gm-Gg": "AZuq6aIVp58Z6dKGSk2vINHosIQVd7XO8T+rf/WGOJQngoMEeaTpmtGVbtHqQFF33eq\n TvIbi2TO5u5KfZN33vhzJ1BENz1mzI+CjyGWwp2vP69xg97ctYB3KvLKBYC+UyGiRP0BiydslFI\n XNu63pB/wqF1QOzWN3bKFgJrHnxBG76vXp+uQ6pCG1XWBv6PswdPtmmr/5JKDMhMDOChS0Wj9ND\n HmORNkAJZJdoyMirDGJt2O8LbUlA0P+/xEBGMomDr8V+t9Y+65wxqL/vuAWUeXOl95x7Uw9OsAI\n n8ifYFzCQUzTuSOsWBwX8emus9TtH3UL6oh/fSupPIaHs4LCZFVdO5LO2J3o/3l0RdUa1gRaB+v\n bhYhEi8btRinmCxQ1PesT4V13PKuOUwOyuuILJTrt10wUv5T+GveIdItCNoHoOQDMnuS9M8yHyQ\n zDl3rjggDzS2DcrIMxsxCoKt6Fu1eug8FTrCnr8jUPqlAG77Fir0K2yMGmPJyRCV+HQJP3skROn\n wJ6", "X-Received": "by 2002:a17:902:f548:b0:2a0:8ca7:69de with SMTP id\n d9443c01a7336-2ab27f651c9mr3252815ad.41.1770754550498;\n Tue, 10 Feb 2026 12:15:50 -0800 (PST)", "From": "Pierrick Bouvier <pierrick.bouvier@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "anjo@rev.ng, Jim MacArthur <jim.macarthur@linaro.org>,\n kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Be?=\n\t=?utf-8?q?nn=C3=A9e?= <alex.bennee@linaro.org>, =?utf-8?q?Philippe_Mathieu-?=\n\t=?utf-8?q?Daud=C3=A9?= <philmd@linaro.org>,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>,\n Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,\n Richard Henderson <richard.henderson@linaro.org>", "Subject": "[PATCH v3 06/12] target/arm: move exec/helper-* plumbery to helper.h", "Date": "Tue, 10 Feb 2026 12:15:34 -0800", "Message-ID": "<20260210201540.1405424-7-pierrick.bouvier@linaro.org>", "X-Mailer": "git-send-email 2.47.3", "In-Reply-To": "<20260210201540.1405424-1-pierrick.bouvier@linaro.org>", "References": "<20260210201540.1405424-1-pierrick.bouvier@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2607:f8b0:4864:20::52c;\n envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52c.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Since we cleaned helper.h, we can continue further and remove\nall exec/helper-* inclusion. This way, all helpers use the same pattern,\nand helper include details are limited to those headers.\n\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>\n---\n target/arm/helper.h | 13 ++++++++++++-\n target/arm/tcg/{helper.h => helper-defs.h} | 0\n target/arm/tcg/translate.h | 2 +-\n target/arm/debug_helper.c | 4 +---\n target/arm/helper.c | 5 +++--\n target/arm/tcg/arith_helper.c | 4 +---\n target/arm/tcg/crypto_helper.c | 4 +---\n target/arm/tcg/helper-a64.c | 2 +-\n target/arm/tcg/hflags.c | 4 +---\n target/arm/tcg/m_helper.c | 2 +-\n target/arm/tcg/mte_helper.c | 2 +-\n target/arm/tcg/mve_helper.c | 2 +-\n target/arm/tcg/neon_helper.c | 4 +---\n target/arm/tcg/op_helper.c | 2 +-\n target/arm/tcg/pauth_helper.c | 2 +-\n target/arm/tcg/psci.c | 2 +-\n target/arm/tcg/sme_helper.c | 2 +-\n target/arm/tcg/sve_helper.c | 2 +-\n target/arm/tcg/tlb_helper.c | 4 +---\n target/arm/tcg/translate.c | 6 +-----\n target/arm/tcg/vec_helper.c | 2 +-\n target/arm/tcg/vfp_helper.c | 4 +---\n 22 files changed, 34 insertions(+), 40 deletions(-)\n rename target/arm/tcg/{helper.h => helper-defs.h} (100%)", "diff": "diff --git a/target/arm/helper.h b/target/arm/helper.h\nindex b1e83196b3b..b1c26c180ea 100644\n--- a/target/arm/helper.h\n+++ b/target/arm/helper.h\n@@ -1,3 +1,14 @@\n /* SPDX-License-Identifier: GPL-2.0-or-later */\n \n-#include \"tcg/helper.h\"\n+#ifndef HELPER__H\n+#define HELPER__H\n+\n+#include \"exec/helper-proto-common.h\"\n+#include \"exec/helper-gen-common.h\"\n+\n+#define HELPER_H \"tcg/helper-defs.h\"\n+#include \"exec/helper-proto.h.inc\"\n+#include \"exec/helper-gen.h.inc\"\n+#undef HELPER_H\n+\n+#endif /* HELPER__H */\ndiff --git a/target/arm/tcg/helper.h b/target/arm/tcg/helper-defs.h\nsimilarity index 100%\nrename from target/arm/tcg/helper.h\nrename to target/arm/tcg/helper-defs.h\ndiff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h\nindex 1e30d7c77c3..027769271c9 100644\n--- a/target/arm/tcg/translate.h\n+++ b/target/arm/tcg/translate.h\n@@ -6,7 +6,7 @@\n #include \"tcg/tcg-op-gvec.h\"\n #include \"exec/translator.h\"\n #include \"exec/translation-block.h\"\n-#include \"exec/helper-gen.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n \ndiff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c\nindex 579516e1541..ec6a2b0c179 100644\n--- a/target/arm/debug_helper.c\n+++ b/target/arm/debug_helper.c\n@@ -8,15 +8,13 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/log.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"cpregs.h\"\n #include \"exec/watchpoint.h\"\n #include \"system/tcg.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n #ifdef CONFIG_TCG\n /* Return the Exception Level targeted by debug exceptions. */\n static int arm_debug_target_el(CPUARMState *env)\ndiff --git a/target/arm/helper.c b/target/arm/helper.c\nindex e86ceb130ce..70227263612 100644\n--- a/target/arm/helper.c\n+++ b/target/arm/helper.c\n@@ -10,6 +10,7 @@\n #include \"qemu/log.h\"\n #include \"trace.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"exec/page-protection.h\"\n@@ -36,8 +37,8 @@\n #include \"target/arm/gtimer.h\"\n #include \"qemu/plugin.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n+#define HELPER_H \"tcg/helper-defs.h\"\n+#include \"exec/helper-info.c.inc\"\n \n static void switch_mode(CPUARMState *env, int mode);\n \ndiff --git a/target/arm/tcg/arith_helper.c b/target/arm/tcg/arith_helper.c\nindex 97c6362992c..cc081c8f966 100644\n--- a/target/arm/tcg/arith_helper.c\n+++ b/target/arm/tcg/arith_helper.c\n@@ -8,11 +8,9 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/bswap.h\"\n #include \"qemu/crc32c.h\"\n+#include \"helper.h\"\n #include <zlib.h> /* for crc32 */\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n /*\n * Note that signed overflow is undefined in C. The following routines are\n * careful to use unsigned types where modulo arithmetic is required.\ndiff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c\nindex 3428bd1bf0b..11977cb7723 100644\n--- a/target/arm/tcg/crypto_helper.c\n+++ b/target/arm/tcg/crypto_helper.c\n@@ -15,11 +15,9 @@\n #include \"tcg/tcg-gvec-desc.h\"\n #include \"crypto/aes-round.h\"\n #include \"crypto/sm4.h\"\n+#include \"helper.h\"\n #include \"vec_internal.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n union CRYPTO_STATE {\n uint8_t bytes[16];\n uint32_t words[4];\ndiff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c\nindex 07ddfb895dd..2dec587d386 100644\n--- a/target/arm/tcg/helper-a64.c\n+++ b/target/arm/tcg/helper-a64.c\n@@ -21,7 +21,7 @@\n #include \"qemu/units.h\"\n #include \"cpu.h\"\n #include \"gdbstub/helpers.h\"\n-#include \"exec/helper-proto.h\"\n+#include \"helper.h\"\n #include \"helper-a64.h\"\n #include \"qemu/host-utils.h\"\n #include \"qemu/log.h\"\ndiff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c\nindex 5c9b9bec3b2..7e6f8d36475 100644\n--- a/target/arm/tcg/hflags.c\n+++ b/target/arm/tcg/hflags.c\n@@ -7,15 +7,13 @@\n */\n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"exec/translation-block.h\"\n #include \"accel/tcg/cpu-ops.h\"\n #include \"cpregs.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n static inline bool fgt_svc(CPUARMState *env, int el)\n {\n /*\ndiff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c\nindex 3fb24c77900..5a75e8b3e11 100644\n--- a/target/arm/tcg/m_helper.c\n+++ b/target/arm/tcg/m_helper.c\n@@ -8,10 +8,10 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"gdbstub/helpers.h\"\n-#include \"exec/helper-proto.h\"\n #include \"qemu/main-loop.h\"\n #include \"qemu/bitops.h\"\n #include \"qemu/log.h\"\ndiff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c\nindex 01b7f099f4a..a9fb979f639 100644\n--- a/target/arm/tcg/mte_helper.c\n+++ b/target/arm/tcg/mte_helper.c\n@@ -20,6 +20,7 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/log.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"exec/target_page.h\"\n #include \"exec/page-protection.h\"\n@@ -32,7 +33,6 @@\n #include \"accel/tcg/cpu-ldst.h\"\n #include \"accel/tcg/probe.h\"\n #include \"helper-a64.h\"\n-#include \"exec/helper-proto.h\"\n #include \"exec/tlb-flags.h\"\n #include \"accel/tcg/cpu-ops.h\"\n #include \"qapi/error.h\"\ndiff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c\nindex f33642df1f9..a67d90d6c75 100644\n--- a/target/arm/tcg/mve_helper.c\n+++ b/target/arm/tcg/mve_helper.c\n@@ -19,10 +19,10 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"helper-mve.h\"\n #include \"internals.h\"\n #include \"vec_internal.h\"\n-#include \"exec/helper-proto.h\"\n #include \"accel/tcg/cpu-ldst.h\"\n #include \"tcg/tcg.h\"\n #include \"fpu/softfloat.h\"\ndiff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c\nindex 8d288f3a700..69147969b23 100644\n--- a/target/arm/tcg/neon_helper.c\n+++ b/target/arm/tcg/neon_helper.c\n@@ -9,13 +9,11 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"tcg/tcg-gvec-desc.h\"\n #include \"fpu/softfloat.h\"\n #include \"vec_internal.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n #define SIGNBIT (uint32_t)0x80000000\n #define SIGNBIT64 ((uint64_t)1 << 63)\n \ndiff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c\nindex 4fbd219555d..5a510730ece 100644\n--- a/target/arm/tcg/op_helper.c\n+++ b/target/arm/tcg/op_helper.c\n@@ -19,8 +19,8 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/main-loop.h\"\n #include \"cpu.h\"\n-#include \"exec/helper-proto.h\"\n #include \"exec/target_page.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"accel/tcg/cpu-ldst.h\"\ndiff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c\nindex 5a20117ae89..67c0d59d9e9 100644\n--- a/target/arm/tcg/pauth_helper.c\n+++ b/target/arm/tcg/pauth_helper.c\n@@ -19,11 +19,11 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"accel/tcg/cpu-ldst.h\"\n #include \"helper-a64.h\"\n-#include \"exec/helper-proto.h\"\n #include \"tcg/tcg-gvec-desc.h\"\n #include \"qemu/xxhash.h\"\n \ndiff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c\nindex 2d409301578..bca6058e41a 100644\n--- a/target/arm/tcg/psci.c\n+++ b/target/arm/tcg/psci.c\n@@ -18,7 +18,7 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n-#include \"exec/helper-proto.h\"\n+#include \"helper.h\"\n #include \"kvm-consts.h\"\n #include \"qemu/main-loop.h\"\n #include \"system/runstate.h\"\ndiff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c\nindex 7729732369f..ab5999c5925 100644\n--- a/target/arm/tcg/sme_helper.c\n+++ b/target/arm/tcg/sme_helper.c\n@@ -21,7 +21,7 @@\n #include \"cpu.h\"\n #include \"internals.h\"\n #include \"tcg/tcg-gvec-desc.h\"\n-#include \"exec/helper-proto.h\"\n+#include \"helper.h\"\n #include \"helper-sme.h\"\n #include \"accel/tcg/cpu-ldst.h\"\n #include \"accel/tcg/helper-retaddr.h\"\ndiff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c\nindex 16e528e41a6..062d8881bd0 100644\n--- a/target/arm/tcg/sve_helper.c\n+++ b/target/arm/tcg/sve_helper.c\n@@ -21,9 +21,9 @@\n #include \"cpu.h\"\n #include \"internals.h\"\n #include \"exec/page-protection.h\"\n-#include \"exec/helper-proto.h\"\n #include \"exec/target_page.h\"\n #include \"exec/tlb-flags.h\"\n+#include \"helper.h\"\n #include \"helper-a64.h\"\n #include \"helper-sve.h\"\n #include \"tcg/tcg-gvec-desc.h\"\ndiff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c\nindex 5c689d3b69f..565954269f9 100644\n--- a/target/arm/tcg/tlb_helper.c\n+++ b/target/arm/tcg/tlb_helper.c\n@@ -7,12 +7,10 @@\n */\n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n /*\n * Returns true if the stage 1 translation regime is using LPAE format page\n * tables. Used when raising alignment exceptions, whose FSR changes depending\ndiff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c\nindex febb7f1532a..982c83ef42a 100644\n--- a/target/arm/tcg/translate.c\n+++ b/target/arm/tcg/translate.c\n@@ -26,14 +26,10 @@\n #include \"arm_ldst.h\"\n #include \"semihosting/semihost.h\"\n #include \"cpregs.h\"\n-#include \"exec/helper-proto.h\"\n #include \"exec/target_page.h\"\n+#include \"helper.h\"\n #include \"helper-mve.h\"\n \n-#define HELPER_H \"helper.h\"\n-#include \"exec/helper-info.c.inc\"\n-#undef HELPER_H\n-\n #define ENABLE_ARCH_4T arm_dc_feature(s, ARM_FEATURE_V4T)\n #define ENABLE_ARCH_5 arm_dc_feature(s, ARM_FEATURE_V5)\n /* currently all emulated v5 cores are also v5TE, so don't bother */\ndiff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c\nindex a070ac90579..1223b843bf1 100644\n--- a/target/arm/tcg/vec_helper.c\n+++ b/target/arm/tcg/vec_helper.c\n@@ -19,7 +19,7 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n-#include \"exec/helper-proto.h\"\n+#include \"helper.h\"\n #include \"helper-a64.h\"\n #include \"helper-sme.h\"\n #include \"helper-sve.h\"\ndiff --git a/target/arm/tcg/vfp_helper.c b/target/arm/tcg/vfp_helper.c\nindex e156e3774ad..45f2eb0930f 100644\n--- a/target/arm/tcg/vfp_helper.c\n+++ b/target/arm/tcg/vfp_helper.c\n@@ -19,14 +19,12 @@\n \n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n+#include \"helper.h\"\n #include \"internals.h\"\n #include \"cpu-features.h\"\n #include \"fpu/softfloat.h\"\n #include \"qemu/log.h\"\n \n-#define HELPER_H \"tcg/helper.h\"\n-#include \"exec/helper-proto.h.inc\"\n-\n /*\n * Set the float_status behaviour to match the Arm defaults:\n * * tininess-before-rounding\n", "prefixes": [ "v3", "06/12" ] }