[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/17] target/i386: Rename helper template headers as '.h.inc'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 09/17] target/i386: Rename helper template headers as '.h.inc' |
Date: |
Tue, 13 Jun 2023 11:38:14 +0200 |
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 move the included templates in the tcg/ directory and
rename as '.h.inc'.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230608133108.72655-5-philmd@linaro.org>
---
target/i386/helper.h | 6 +++---
.../{cc_helper_template.h => cc_helper_template.h.inc} | 0
.../i386/{ops_sse_header.h => tcg/ops_sse_header.h.inc} | 0
.../shift_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/tcg/{cc_helper_template.h => cc_helper_template.h.inc}
(100%)
rename target/i386/{ops_sse_header.h => tcg/ops_sse_header.h.inc} (100%)
rename target/i386/{shift_helper_template.h =>
tcg/shift_helper_template.h.inc} (100%)
diff --git a/target/i386/helper.h b/target/i386/helper.h
index e627a93107..48609c210b 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 "tcg/ops_sse_header.h.inc"
#define SHIFT 1
-#include "ops_sse_header.h"
+#include "tcg/ops_sse_header.h.inc"
#define SHIFT 2
-#include "ops_sse_header.h"
+#include "tcg/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/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/ops_sse_header.h b/target/i386/tcg/ops_sse_header.h.inc
similarity index 100%
rename from target/i386/ops_sse_header.h
rename to target/i386/tcg/ops_sse_header.h.inc
diff --git a/target/i386/shift_helper_template.h
b/target/i386/tcg/shift_helper_template.h.inc
similarity index 100%
rename from target/i386/shift_helper_template.h
rename to target/i386/tcg/shift_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
--
2.38.1
- [PULL 00/17] Misc patches for 2023-06-13, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 02/17] cocoa: Fix warnings about invalid prototype declarations, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 03/17] util/cacheflush: Use declarations from <OSCacheControl.h> on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 05/17] accel/hvf: Report HV_DENIED error, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 04/17] util/cacheflush: Avoid possible redundant dcache flush on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 06/17] target/hppa/meson: Only build int_helper.o with system emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 07/17] target/i386/helper: Remove do_cpu_sipi() stub for user-mode emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 08/17] target/i386/helper: Shuffle do_cpu_init(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 09/17] target/i386: Rename helper template headers as '.h.inc',
Philippe Mathieu-Daudé <=
- [PULL 10/17] hw/i2c: Enable an id for the pca954x devices, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 12/17] hw/scsi/megasas: Silent GCC duplicated-cond warning, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 11/17] hw/ide/ahci: Remove stray backslash, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 13/17] hw/char/parallel: Export struct ParallelState, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 15/17] exec/ram_addr: Return number of dirty pages in cpu_physical_memory_set_dirty_lebitmap(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 16/17] hw/vfio: Add number of dirty pages to vfio_get_dirty_bitmap tracepoint, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 17/17] exec/memory: Introduce RAM_NAMED_FILE flag, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 14/17] hw/char/parallel-isa: Export struct ISAParallelState, Philippe Mathieu-Daudé, 2023/06/13
- Re: [PULL 00/17] Misc patches for 2023-06-13, Richard Henderson, 2023/06/14