From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
qemu-riscv@nongnu.org, qemu-arm@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 3/5] target/i386: Rename helper template headers as '.h.inc'
Date: Tue, 6 Jun 2023 16:12:50 +0200 [thread overview]
Message-ID: <20230606141252.95032-4-philmd@linaro.org> (raw)
In-Reply-To: <20230606141252.95032-1-philmd@linaro.org>
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 +++---
| 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%)
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
--
2.38.1
next prev parent reply other threads:[~2023-06-06 14:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 14:12 [PATCH 0/5] misc: Enforce .[ch].inc extension for re-included .c/.h files Philippe Mathieu-Daudé
2023-06-06 14:12 ` [PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc Philippe Mathieu-Daudé
2023-06-06 14:29 ` Richard Henderson
2023-06-06 18:08 ` Warner Losh
2023-06-06 19:08 ` Philippe Mathieu-Daudé
2023-06-06 14:12 ` [PATCH 2/5] target/arm: Rename helper template headers as '.h.inc' Philippe Mathieu-Daudé
2023-06-06 14:37 ` Richard Henderson
2023-06-06 15:49 ` Philippe Mathieu-Daudé
2023-06-06 15:55 ` Peter Maydell
2023-06-06 16:31 ` Richard Henderson
2023-06-06 14:12 ` Philippe Mathieu-Daudé [this message]
2023-06-06 14:38 ` [PATCH 3/5] target/i386: " Richard Henderson
2023-06-06 14:12 ` [PATCH 4/5] target: Rename per-target 'helper.h' -> 'helper.h.inc' Philippe Mathieu-Daudé
2023-06-06 14:43 ` Richard Henderson
2023-06-08 6:46 ` Philippe Mathieu-Daudé
2023-06-06 14:12 ` [PATCH 5/5] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Philippe Mathieu-Daudé
2023-06-06 14:29 ` Richard Henderson
2023-06-06 17:05 ` Alex Bennée
2023-06-06 17:02 ` [PATCH 0/5] misc: Enforce .[ch].inc extension for re-included .c/.h files Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230606141252.95032-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).