| Message ID | 20230619155510.80991-6-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm/tcg: Remove inclusions of 'exec/helper-[proto/gen].h' | expand |
On 6/19/23 17:54, Philippe Mathieu-Daudé wrote: > Instead of including helper-gvec.h.inc via helper.h which > is included by all TCG files, restrict it to the few files > that require it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/arm/helper.h | 1 - > target/arm/tcg/translate-a64.c | 4 ++++ > target/arm/tcg/translate-gvec.c | 6 ++++++ > target/arm/tcg/translate-neon.c | 4 ++++ > target/arm/tcg/translate-sve.c | 3 +++ > target/arm/tcg/vec_helper.c | 4 ++++ > 6 files changed, 21 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/helper.h b/target/arm/helper.h index df22f1a117..6d61694f5e 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -198,5 +198,4 @@ DEF_HELPER_FLAGS_6(sve2_fmlal_zzxw_s, TCG_CALL_NO_RWG, #include "tcg/helper-sme.h.inc" #endif -#include "tcg/helper-gvec.h.inc" #include "tcg/helper-mve.h.inc" diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 22caf89bb0..924bbdbf1d 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -26,6 +26,10 @@ #include "semihosting/semihost.h" #include "cpregs.h" +#define HELPER_H "tcg/helper-gvec.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-gen.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/translate-gvec.c b/target/arm/tcg/translate-gvec.c index 8b1d5e283c..1ae346c5a8 100644 --- a/target/arm/tcg/translate-gvec.c +++ b/target/arm/tcg/translate-gvec.c @@ -13,6 +13,12 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-gvec.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H + static void gen_gvec_fn3_qc(uint32_t rd_ofs, uint32_t rn_ofs, uint32_t rm_ofs, uint32_t opr_sz, uint32_t max_sz, gen_helper_gvec_3_ptr *fn) diff --git a/target/arm/tcg/translate-neon.c b/target/arm/tcg/translate-neon.c index 9a1831f849..fa13e7e8cb 100644 --- a/target/arm/tcg/translate-neon.c +++ b/target/arm/tcg/translate-neon.c @@ -24,6 +24,10 @@ #include "translate.h" #include "translate-a32.h" +#define HELPER_H "tcg/helper-gvec.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-gen.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index ff050626e6..605cce0979 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -22,6 +22,9 @@ #include "translate-a64.h" #include "fpu/softfloat.h" +#define HELPER_H "tcg/helper-gvec.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H typedef void GVecGen2sFn(unsigned, uint32_t, uint32_t, TCGv_i64, uint32_t, uint32_t); diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index af325577f0..b0aaca38e7 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -25,6 +25,10 @@ #include "qemu/int128.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper-gvec.h.inc" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + #define HELPER_H "tcg/helper-vfp.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H
Instead of including helper-gvec.h.inc via helper.h which is included by all TCG files, restrict it to the few files that require it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/helper.h | 1 - target/arm/tcg/translate-a64.c | 4 ++++ target/arm/tcg/translate-gvec.c | 6 ++++++ target/arm/tcg/translate-neon.c | 4 ++++ target/arm/tcg/translate-sve.c | 3 +++ target/arm/tcg/vec_helper.c | 4 ++++ 6 files changed, 21 insertions(+), 1 deletion(-)