| Message ID | 20230609104717.95555-15-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm/tcg: Remove inclusions of 'exec/helper-[proto/gen].h' | expand |
On 6/9/23 03:47, Philippe Mathieu-Daudé wrote: > Instead of including helper-neon.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/neon_helper.c | 6 +++++- > target/arm/tcg/translate-a64.c | 5 +++++ > target/arm/tcg/translate-neon.c | 6 ++++++ > target/arm/tcg/translate-sme.c | 5 +++++ > target/arm/tcg/translate.c | 5 +++++ > target/arm/tcg/vec_helper.c | 5 +++++ > 7 files changed, 31 insertions(+), 2 deletions(-) > > diff --git a/target/arm/helper.h b/target/arm/helper.h > index 2cf25f0605..82c34df538 100644 > --- a/target/arm/helper.h > +++ b/target/arm/helper.h > @@ -608,5 +608,4 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, > #include "tcg/helper-sme.h.inc" > #endif > > -#include "tcg/helper-neon.h.inc" > #include "tcg/helper-mve.h.inc" > diff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c > index 0a4ab3e42c..3346a897ad 100644 > --- a/target/arm/tcg/neon_helper.c > +++ b/target/arm/tcg/neon_helper.c > @@ -9,10 +9,14 @@ > #include "qemu/osdep.h" > > #include "cpu.h" > -#include "exec/helper-proto.h" > #include "fpu/softfloat.h" > #include "vec_internal.h" > > +#define HELPER_H "tcg/helper-neon.h.inc" > +#include "exec/helper-proto.h.inc" > +#include "exec/helper-gen.h.inc" > +#undef HELPER_H > + Again, none of the *_helper.c need helper-gen.h.inc, only prototypes. r~
diff --git a/target/arm/helper.h b/target/arm/helper.h index 2cf25f0605..82c34df538 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -608,5 +608,4 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, #include "tcg/helper-sme.h.inc" #endif -#include "tcg/helper-neon.h.inc" #include "tcg/helper-mve.h.inc" diff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c index 0a4ab3e42c..3346a897ad 100644 --- a/target/arm/tcg/neon_helper.c +++ b/target/arm/tcg/neon_helper.c @@ -9,10 +9,14 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper-neon.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/translate-a64.c b/target/arm/tcg/translate-a64.c index 98bcd15188..06ad40a568 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -31,6 +31,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-neon.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + static TCGv_i64 cpu_X[32]; static TCGv_i64 cpu_pc; diff --git a/target/arm/tcg/translate-neon.c b/target/arm/tcg/translate-neon.c index 6823e4c744..a820afb90d 100644 --- a/target/arm/tcg/translate-neon.c +++ b/target/arm/tcg/translate-neon.c @@ -29,6 +29,12 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-neon.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#include "exec/helper-info.c.inc" +#undef HELPER_H + /* Include the generated Neon decoder */ #include "decode-neon-dp.c.inc" #include "decode-neon-ls.c.inc" diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index d0054e3f77..9419aaca4a 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -21,6 +21,11 @@ #include "translate.h" #include "translate-a64.h" +#define HELPER_H "tcg/helper-neon.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + /* * Include the generated decoder. */ diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index a352fced6e..7bfced1bc6 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -29,6 +29,11 @@ #include "cpregs.h" #include "exec/helper-proto.h" +#define HELPER_H "tcg/helper-neon.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "helper.h" #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 d7d6643846..9b00085095 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -30,6 +30,11 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "tcg/helper-neon.h.inc" +#include "exec/helper-proto.h.inc" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + /* * Data for expanding active predicate bits to bytes, for byte elements. *
Instead of including helper-neon.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/neon_helper.c | 6 +++++- target/arm/tcg/translate-a64.c | 5 +++++ target/arm/tcg/translate-neon.c | 6 ++++++ target/arm/tcg/translate-sme.c | 5 +++++ target/arm/tcg/translate.c | 5 +++++ target/arm/tcg/vec_helper.c | 5 +++++ 7 files changed, 31 insertions(+), 2 deletions(-)