| Message ID | 20230606141252.95032-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | misc: Enforce .[ch].inc extension for re-included .c/.h files | expand |
On 6/6/23 07:12, 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 the included templates as '.h.inc'. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > target/i386/helper.h | 6 +++--- > target/i386/{ops_sse_header.h => ops_sse_header.h.inc} | 0 > ...hift_helper_template.h => shift_helper_template.h.inc} | 0 > .../{cc_helper_template.h => cc_helper_template.h.inc} | 0 > target/i386/tcg/cc_helper.c | 8 ++++---- > target/i386/tcg/int_helper.c | 8 ++++---- > 6 files changed, 11 insertions(+), 11 deletions(-) > rename target/i386/{ops_sse_header.h => ops_sse_header.h.inc} (100%) > rename target/i386/{shift_helper_template.h => shift_helper_template.h.inc} (100%) > rename target/i386/tcg/{cc_helper_template.h => cc_helper_template.h.inc} (100%) Move to tcg/ at the same time? Otherwise, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/i386/helper.h b/target/i386/helper.h index e627a93107..e972e1cf36 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -203,11 +203,11 @@ DEF_HELPER_1(enter_mmx, void, env) DEF_HELPER_1(emms, void, env) #define SHIFT 0 -#include "ops_sse_header.h" +#include "ops_sse_header.h.inc" #define SHIFT 1 -#include "ops_sse_header.h" +#include "ops_sse_header.h.inc" #define SHIFT 2 -#include "ops_sse_header.h" +#include "ops_sse_header.h.inc" DEF_HELPER_3(rclb, tl, env, tl, tl) DEF_HELPER_3(rclw, tl, env, tl, tl) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h.inc similarity index 100% rename from target/i386/ops_sse_header.h rename to target/i386/ops_sse_header.h.inc diff --git a/target/i386/shift_helper_template.h b/target/i386/shift_helper_template.h.inc similarity index 100% rename from target/i386/shift_helper_template.h rename to target/i386/shift_helper_template.h.inc diff --git a/target/i386/tcg/cc_helper_template.h b/target/i386/tcg/cc_helper_template.h.inc similarity index 100% rename from target/i386/tcg/cc_helper_template.h rename to target/i386/tcg/cc_helper_template.h.inc diff --git a/target/i386/tcg/cc_helper.c b/target/i386/tcg/cc_helper.c index 6227dbb30b..c310bd842f 100644 --- a/target/i386/tcg/cc_helper.c +++ b/target/i386/tcg/cc_helper.c @@ -58,21 +58,21 @@ const uint8_t parity_table[256] = { }; #define SHIFT 0 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #define SHIFT 1 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #define SHIFT 2 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #ifdef TARGET_X86_64 #define SHIFT 3 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT #endif diff --git a/target/i386/tcg/int_helper.c b/target/i386/tcg/int_helper.c index 599ac968b0..05418f181f 100644 --- a/target/i386/tcg/int_helper.c +++ b/target/i386/tcg/int_helper.c @@ -448,20 +448,20 @@ target_ulong helper_pext(target_ulong src, target_ulong mask) } #define SHIFT 0 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #define SHIFT 1 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #define SHIFT 2 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #ifdef TARGET_X86_64 #define SHIFT 3 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #endif
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 the included templates as '.h.inc'. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/i386/helper.h | 6 +++--- target/i386/{ops_sse_header.h => ops_sse_header.h.inc} | 0 ...hift_helper_template.h => shift_helper_template.h.inc} | 0 .../{cc_helper_template.h => cc_helper_template.h.inc} | 0 target/i386/tcg/cc_helper.c | 8 ++++---- target/i386/tcg/int_helper.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename target/i386/{ops_sse_header.h => ops_sse_header.h.inc} (100%) rename target/i386/{shift_helper_template.h => shift_helper_template.h.inc} (100%) rename target/i386/tcg/{cc_helper_template.h => cc_helper_template.h.inc} (100%)