| Message ID | 20230619155510.80991-21-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:55, Philippe Mathieu-Daudé wrote: > Since commit 139c1837db ("meson: rename included C source files > to .c.inc"), QEMU standard procedure for included C files is to > use *.c.inc. > > Besides, since commit 6a0057aa22 ("docs/devel: make a statement > about includes") this is documented as the Coding Style: > > If you do use template header files they should be named with > the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are > being included for expansion. > > Therefore rename 'helper.h' as 'helper.h.inc'. Since this file > is TCG-specific, move it to the tcg/ directory. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > target/arm/tcg/translate.h | 2 +- > target/arm/{helper.h => tcg/helper.h.inc} | 0 > target/arm/debug_helper.c | 2 +- > target/arm/helper.c | 2 +- > target/arm/tcg/helper-a64.c | 2 +- > target/arm/tcg/hflags.c | 2 +- > target/arm/tcg/m_helper.c | 2 +- > target/arm/tcg/op_helper.c | 2 +- > target/arm/tcg/psci.c | 2 +- > target/arm/tcg/tlb_helper.c | 2 +- > target/arm/tcg/translate.c | 2 +- > 11 files changed, 10 insertions(+), 10 deletions(-) > rename target/arm/{helper.h => tcg/helper.h.inc} (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 13d59d8417..6516852c06 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -8,7 +8,7 @@ #include "exec/translator.h" #include "internals.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-gen.h.inc" #undef HELPER_H 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 31165b92a5..b32852e947 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -15,7 +15,7 @@ #ifdef CONFIG_TCG -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/helper.c b/target/arm/helper.c index 63ed29b841..425cc86c7a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -26,7 +26,7 @@ #include "qemu/guest-random.h" #ifdef CONFIG_TCG -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 58a573e21d..5573c0c15e 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -34,7 +34,7 @@ #include "fpu/softfloat.h" #include <zlib.h> /* For crc32 */ -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 83a1aa08e4..e75cb0100e 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -10,7 +10,7 @@ #include "internals.h" #include "cpregs.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 1991eafe05..4100161775 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -24,7 +24,7 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 24205074cc..e1aadd63f0 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -24,7 +24,7 @@ #include "exec/cpu_ldst.h" #include "cpregs.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 2822a6b96a..e00b9b1493 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -24,7 +24,7 @@ #include "internals.h" #include "arm-powerctl.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index e663aef2fd..3f8cb358a6 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -10,7 +10,7 @@ #include "internals.h" #include "exec/exec-all.h" -#define HELPER_H "helper.h" +#define HELPER_H "tcg/helper.h.inc" #include "exec/helper-proto.h.inc" #undef HELPER_H diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index bb8756d0ff..00b73c9151 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -40,7 +40,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-proto.h.inc" #include "exec/helper-info.c.inc" #undef HELPER_H
Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented as the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename 'helper.h' as 'helper.h.inc'. Since this file is TCG-specific, move it to the tcg/ directory. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/tcg/translate.h | 2 +- target/arm/{helper.h => tcg/helper.h.inc} | 0 target/arm/debug_helper.c | 2 +- target/arm/helper.c | 2 +- target/arm/tcg/helper-a64.c | 2 +- target/arm/tcg/hflags.c | 2 +- target/arm/tcg/m_helper.c | 2 +- target/arm/tcg/op_helper.c | 2 +- target/arm/tcg/psci.c | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/translate.c | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename target/arm/{helper.h => tcg/helper.h.inc} (100%)