From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 5/7] target/s390x: Rename insn-data/format.def -> insn-data/format.h.inc
Date: Sat, 5 Nov 2022 20:52:25 +0100 [thread overview]
Message-ID: <20221105195227.354769-6-laurent@vivier.eu> (raw)
In-Reply-To: <20221105195227.354769-1-laurent@vivier.eu>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
We use the .h.inc extension to include C headers. To be consistent
with the rest of the codebase, rename the C headers using the .def
extension.
IDE/tools using our .editorconfig / .gitattributes will leverage
this consistency.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221025235006.7215-3-philmd@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/s390x/tcg/{insn-data.def => insn-data.h.inc} | 2 +-
.../s390x/tcg/{insn-format.def => insn-format.h.inc} | 0
target/s390x/tcg/translate.c | 10 +++++-----
3 files changed, 6 insertions(+), 6 deletions(-)
rename target/s390x/tcg/{insn-data.def => insn-data.h.inc} (99%)
rename target/s390x/tcg/{insn-format.def => insn-format.h.inc} (100%)
diff --git a/target/s390x/tcg/insn-data.def b/target/s390x/tcg/insn-data.h.inc
similarity index 99%
rename from target/s390x/tcg/insn-data.def
rename to target/s390x/tcg/insn-data.h.inc
index 6382ceabfcfa..7e952bdfc828 100644
--- a/target/s390x/tcg/insn-data.def
+++ b/target/s390x/tcg/insn-data.h.inc
@@ -8,7 +8,7 @@
*
* OPC = (op << 8) | op2 where op is the major, op2 the minor opcode
* NAME = name of the opcode, used internally
- * FMT = format of the opcode (defined in insn-format.def)
+ * FMT = format of the opcode (defined in insn-format.h.inc)
* FAC = facility the opcode is available in (defined in DisasFacility)
* I1 = func in1_xx fills o->in1
* I2 = func in2_xx fills o->in2
diff --git a/target/s390x/tcg/insn-format.def b/target/s390x/tcg/insn-format.h.inc
similarity index 100%
rename from target/s390x/tcg/insn-format.def
rename to target/s390x/tcg/insn-format.h.inc
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 03efccdf9f92..2fbdab72523e 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -1011,7 +1011,7 @@ static void free_compare(DisasCompare *c)
#define F6(N, X1, X2, X3, X4, X5, X6) F0(N)
typedef enum {
-#include "insn-format.def"
+#include "insn-format.h.inc"
} DisasFormat;
#undef F0
@@ -1076,7 +1076,7 @@ typedef struct DisasFormatInfo {
#define F6(N, X1, X2, X3, X4, X5, X6) { { X1, X2, X3, X4, X5, X6 } },
static const DisasFormatInfo format_info[] = {
-#include "insn-format.def"
+#include "insn-format.h.inc"
};
#undef F0
@@ -6143,7 +6143,7 @@ static void in2_insn(DisasContext *s, DisasOps *o)
#define E(OPC, NM, FT, FC, I1, I2, P, W, OP, CC, D, FL) insn_ ## NM,
enum DisasInsnEnum {
-#include "insn-data.def"
+#include "insn-data.h.inc"
};
#undef E
@@ -6223,7 +6223,7 @@ enum DisasInsnEnum {
#define FAC_MIE3 S390_FEAT_MISC_INSTRUCTION_EXT3 /* miscellaneous-instruction-extensions facility 3 */
static const DisasInsn insn_info[] = {
-#include "insn-data.def"
+#include "insn-data.h.inc"
};
#undef E
@@ -6233,7 +6233,7 @@ static const DisasInsn insn_info[] = {
static const DisasInsn *lookup_opc(uint16_t opc)
{
switch (opc) {
-#include "insn-data.def"
+#include "insn-data.h.inc"
default:
return NULL;
}
--
2.37.3
next prev parent reply other threads:[~2022-11-05 19:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-05 19:52 [PULL 0/7] Trivial branch for 7.2 patches Laurent Vivier
2022-11-05 19:52 ` [PULL 1/7] qapi: virtio: Fix the introduced version Laurent Vivier
2022-11-05 19:52 ` [PULL 2/7] Fix some typos in documentation and comments Laurent Vivier
2022-11-05 19:52 ` [PULL 3/7] xen/pt: fix syntax error that causes FTBFS in some configurations Laurent Vivier
2022-11-05 19:52 ` [PULL 4/7] target/m68k: Rename qregs.def -> qregs.h.inc Laurent Vivier
2022-11-05 19:52 ` Laurent Vivier [this message]
2022-11-05 19:52 ` [PULL 6/7] target/tricore: Rename csfr.def -> csfr.h.inc Laurent Vivier
2022-11-05 19:52 ` [PULL 7/7] tests/unit: simpler variable sequence for test-io-channel Laurent Vivier
2022-11-07 20:03 ` [PULL 0/7] Trivial branch for 7.2 patches Stefan Hajnoczi
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=20221105195227.354769-6-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=thuth@redhat.com \
/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).