From patchwork Fri Jun 9 10:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 690909 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp747217wru; Fri, 9 Jun 2023 03:50:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ51zlbMudTnuLb+1jR60ESGpSa5nQqMrYbx4HG1wET5NGYkU96CUubvr2WWFS/CW9e2MpWN X-Received: by 2002:a05:622a:15ca:b0:3f4:f1f8:9383 with SMTP id d10-20020a05622a15ca00b003f4f1f89383mr1364178qty.52.1686307811306; Fri, 09 Jun 2023 03:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307811; cv=none; d=google.com; s=arc-20160816; b=QBLq1qHs12rp5Sm17E8EHGbwZpvt+CxaVWlOJHGVewzeKHJkqTcFOR5/k8li3KkHJc XUjAfMEJ6loE+hVFTMtWLhklfSPbZy/eaHznDqHEuDRCM1UaXETgsheK/JweusA/mL+g nYks/KT8jKTyU4FzyZw981amOPLSPBYUefzLqWpOGitBoKp/BrcKdCwa0Nrt/bZJbYgN jXcmQeTUb30ESdHn2x/heDX/FhjTSRVNTI3/9zxvkjlY1Nd9y2ePCg5MuOB3QkdgUKyh BpH1BgIElWIt7CZuYYoGwqU0IZskrXHuXmv7kEdICcs6jVlDvAZVYFV+HR+XnP4WpNd6 IScw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=u9JCaz/9hInAtJAic6aYOsmn/F2xIBFQyqUV7/gLybM=; b=RiCVX8RzSCwkvjfHQuic0Vf+KZTvEwYmjeIM8KvgusWjDMWqvsP7tLL2qbTL8hMAAr wWUIfn8hSxmFViiazooyl/7W0l4MJmVELhDoDUY6ZopjxZUCzVWsOG1zkEHsV/wz6vlN OANyknpZwpC3pLQTbYCTKeiL5u+NMHUWqNRoXDae3fhaEYw4P7nOYPYUzUWL6Xj83/mf 4llqhzRYJEA+mYFa0IDJf3yyTK29OdZxvxniDZ/Od53mBVUiKq8KEzRkgRwliGFz/A0B 3zz1tt3JDZuhPgCCMMK6MoEAbVkDbCPTyvmgvIQKxCeB33o6PVu+TK2kdeGCadpfmyaE QPBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I+baEXDf; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d3-20020a05622a15c300b003ef309c5217si2007456qty.423.2023.06.09.03.50.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jun 2023 03:50: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=I+baEXDf; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7Zgz-0002FV-D8; Fri, 09 Jun 2023 06:50:05 -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 1q7Zga-0001kw-75 for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:40 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7ZgX-0001jm-PW for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:49:39 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-30ad458f085so1230721f8f.0 for ; Fri, 09 Jun 2023 03:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686307776; x=1688899776; 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=u9JCaz/9hInAtJAic6aYOsmn/F2xIBFQyqUV7/gLybM=; b=I+baEXDfe18yQXk9D4Ygf4lUaKWN0aP3rLpwyG5oKzr76WsAnTQy57OpU4Ndaj07oy Q3skoLGP7DOcBse0+qnpoyBIPtcZSsg9bieqTjB07Lo/w83qSDuFYCtYBFPcGMFE/ufp GKelFtw3d8sSPtZ31wpfGZiegQ61P1gsJOY1DANXBxlCRvZlS9hSW/isNiYxFo0KTAhY xhE/V3klLKXJDMPdzTPQOJs5xQa3HqcFvKty/8Ko+1+zoDoypKoSi80oEB46q0Gf65fB 8kkWYFXMCOiANzUn1kPPl+Oh6EOS9FXZLSX1X3gj29dWacf288mnchuD5tnJTpYKt99p kd2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686307776; x=1688899776; 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=u9JCaz/9hInAtJAic6aYOsmn/F2xIBFQyqUV7/gLybM=; b=DA6UGRf18rmez6g4yorQ1feFriYwQawoaYft6QlTWtKYvSQKGWjI1PeLD+jmtU9DiT McRvEBmdePyrnpV0SCxfKoDY60ZiGDiYDrq7f5heMlJdMkqd0u0LtAgXpkVn1MhvD2Ek lax5372RHfJ8UYOhp0Qv+QqH8tBXhLawD6n7alrFzDHvK3g5v64tnKPlNlIMunXxO/H0 okZf8WWCbnsn/p6V9RiaC8IUKjJXt6ExQGVI6giTo010rQAic4Eu2w6y88dBQCk4wAD4 rYyIwUWZlePWFdsEm8N29zQ3ciW+5Rz1/nfPlDXi47TodWsROKdDldepfw9PVwuYb2M9 NEUQ== X-Gm-Message-State: AC+VfDy941PQc3BIVFlfYk6SK8EghC4iGwlcvIftWA5wCpRPk5zlJhC0 4kunT8mqK2A0OS7ES9FIKCvLw7CxHTLh7uwquskBgA== X-Received: by 2002:a5d:684b:0:b0:30a:e70d:8022 with SMTP id o11-20020a5d684b000000b0030ae70d8022mr3711583wrw.26.1686307776039; Fri, 09 Jun 2023 03:49:36 -0700 (PDT) Received: from localhost.localdomain (23.171.88.92.rev.sfr.net. [92.88.171.23]) by smtp.gmail.com with ESMTPSA id t25-20020a1c7719000000b003f7eeec829asm2334417wmi.10.2023.06.09.03.49.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jun 2023 03:49:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 21/22] target/arm/tcg: Remove inclusions of 'exec/helper-[proto/gen].h' Date: Fri, 9 Jun 2023 12:47:16 +0200 Message-Id: <20230609104717.95555-22-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230609104717.95555-1-philmd@linaro.org> References: <20230609104717.95555-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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 Inline "exec/helper-proto.h" and "exec/helper-gen.h". We can then move the 'helper.h' in tcg/ directory and rename it as 'helper.h.inc'. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/tcg/translate.h | 5 ++++- target/arm/{helper.h => tcg/helper.h.inc} | 0 target/arm/debug_helper.c | 7 ++++++- target/arm/helper.c | 7 ++++++- target/arm/tcg/crypto_helper.c | 6 +++++- target/arm/tcg/helper-a64.c | 6 +++++- target/arm/tcg/hflags.c | 6 +++++- target/arm/tcg/m_helper.c | 6 +++++- target/arm/tcg/mte_helper.c | 1 - target/arm/tcg/mve_helper.c | 6 +++++- target/arm/tcg/op_helper.c | 6 +++++- target/arm/tcg/pauth_helper.c | 1 - target/arm/tcg/psci.c | 6 +++++- target/arm/tcg/sme_helper.c | 6 +++++- target/arm/tcg/sve_helper.c | 6 +++++- target/arm/tcg/tlb_helper.c | 5 ++++- target/arm/tcg/translate.c | 3 +-- target/arm/tcg/vec_helper.c | 6 +++++- target/arm/vfp_helper.c | 6 +++++- 19 files changed, 76 insertions(+), 19 deletions(-) rename target/arm/{helper.h => tcg/helper.h.inc} (100%) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 3d7c55d3b6..787e857432 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -6,9 +6,12 @@ #include "tcg/tcg-op-gvec.h" #include "exec/exec-all.h" #include "exec/translator.h" -#include "exec/helper-gen.h" #include "internals.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H /* internal defines */ diff --git a/target/arm/helper.h b/target/arm/tcg/helper.h.inc similarity index 100% rename from target/arm/helper.h rename to target/arm/tcg/helper.h.inc diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 8362462a07..5cbaa5cd95 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -11,10 +11,15 @@ #include "internals.h" #include "cpregs.h" #include "exec/exec-all.h" -#include "exec/helper-proto.h" #include "sysemu/tcg.h" #ifdef CONFIG_TCG + +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + /* Return the Exception Level targeted by debug exceptions. */ static int arm_debug_target_el(CPUARMState *env) { diff --git a/target/arm/helper.c b/target/arm/helper.c index d4bee43bd0..2bdf7b0d4e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11,7 +11,6 @@ #include "trace.h" #include "cpu.h" #include "internals.h" -#include "exec/helper-proto.h" #include "qemu/main-loop.h" #include "qemu/timer.h" #include "qemu/bitops.h" @@ -26,6 +25,12 @@ #include "qapi/error.h" #include "qemu/guest-random.h" #ifdef CONFIG_TCG + +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #include "semihosting/common-semi.h" #endif #include "cpregs.h" diff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c index d28690321f..1ba25af575 100644 --- a/target/arm/tcg/crypto_helper.c +++ b/target/arm/tcg/crypto_helper.c @@ -12,12 +12,16 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "crypto/aes.h" #include "crypto/sm4.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + union CRYPTO_STATE { uint8_t bytes[16]; uint32_t words[4]; diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index f5abca6774..8c6452b7d7 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -21,7 +21,6 @@ #include "qemu/units.h" #include "cpu.h" #include "gdbstub/helpers.h" -#include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/main-loop.h" @@ -35,6 +34,11 @@ #include "fpu/softfloat.h" #include /* For crc32 */ +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-a64.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 616c5fa723..8758c28ba2 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -8,9 +8,13 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internals.h" -#include "exec/helper-proto.h" #include "cpregs.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + static inline bool fgt_svc(CPUARMState *env, int el) { /* diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 0891acc29c..ac0f7aed94 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -10,7 +10,6 @@ #include "cpu.h" #include "internals.h" #include "gdbstub/helpers.h" -#include "exec/helper-proto.h" #include "qemu/main-loop.h" #include "qemu/bitops.h" #include "qemu/log.h" @@ -21,6 +20,11 @@ #include "hw/intc/armv7m_nvic.h" #endif +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + static void v7m_msr_xpsr(CPUARMState *env, uint32_t mask, uint32_t reg, uint32_t val) { diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 4a5fa185ae..8831a687ae 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -24,7 +24,6 @@ #include "exec/exec-all.h" #include "exec/ram_addr.h" #include "exec/cpu_ldst.h" -#include "exec/helper-proto.h" #include "hw/core/tcg-cpu-ops.h" #include "qapi/error.h" #include "qemu/guest-random.h" diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index fc003b7c7d..0ebd361ac9 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -21,12 +21,16 @@ #include "cpu.h" #include "internals.h" #include "vec_internal.h" -#include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "tcg/tcg.h" #include "fpu/softfloat.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 70a9c37b74..fa749686cd 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -19,12 +19,16 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "internals.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "cpregs.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define SIGNBIT (uint32_t)0x80000000 #define SIGNBIT64 ((uint64_t)1 << 63) diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index 1bcdcec5ab..dca87b0a2e 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -22,7 +22,6 @@ #include "internals.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "qemu/xxhash.h" diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 6c1239bb96..b2be7dcc64 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -18,13 +18,17 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "kvm-consts.h" #include "qemu/main-loop.h" #include "sysemu/runstate.h" #include "internals.h" #include "arm-powerctl.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + bool arm_is_psci_call(ARMCPU *cpu, int excp_type) { /* diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index 95db4b7861..bf56900853 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internals.h" #include "tcg/tcg-gvec-desc.h" -#include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "qemu/int128.h" @@ -29,6 +28,11 @@ #include "vec_internal.h" #include "sve_ldst_internal.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-sme.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 42c81de0c3..05688c7911 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internals.h" #include "exec/exec-all.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "tcg/tcg.h" @@ -29,6 +28,11 @@ #include "sve_ldst_internal.h" #include "hw/core/tcg-cpu-ops.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 8df36c2cbf..abcc9a9bfe 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -9,8 +9,11 @@ #include "cpu.h" #include "internals.h" #include "exec/exec-all.h" -#include "exec/helper-proto.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H /* * Returns true if the stage 1 translation regime is using LPAE format page diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index da3e0445b2..a66ae970b0 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -27,7 +27,6 @@ #include "arm_ldst.h" #include "semihosting/semihost.h" #include "cpregs.h" -#include "exec/helper-proto.h" #define HELPER_H "tcg/helper-neon.h.inc" #include "exec/helper-proto.h.inc" @@ -39,7 +38,7 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 8fb44a8b7f..5621728271 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -19,12 +19,16 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "qemu/int128.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc" diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c index b7a1bfb9bd..d66af1c11e 100644 --- a/target/arm/vfp_helper.c +++ b/target/arm/vfp_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "internals.h" #ifdef CONFIG_TCG #include "qemu/log.h" @@ -32,6 +31,11 @@ #ifdef CONFIG_TCG +#define HELPER_H "tcg/helper.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-proto.h.inc" #include "exec/helper-gen.h.inc"