diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-04 12:41:01 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:18:30 -0400 |
commit | 139c1837db7eaee53e1c441629b5bcc159e1deb0 (patch) | |
tree | c677e659b182e1a5df1d7a928c7a7e1afb921b3a /target/ppc | |
parent | 243af0225ab37c642d73e4002b233af728119f72 (diff) | |
download | qemu-139c1837db7eaee53e1c441629b5bcc159e1deb0.zip qemu-139c1837db7eaee53e1c441629b5bcc159e1deb0.tar.gz qemu-139c1837db7eaee53e1c441629b5bcc159e1deb0.tar.bz2 |
meson: rename included C source files to .c.inc
With Makefiles that have automatically generated dependencies, you
generated includes are set as dependencies of the Makefile, so that they
are built before everything else and they are available when first
building the .c files.
Alternatively you can use a fine-grained dependency, e.g.
target/arm/translate.o: target/arm/decode-neon-shared.inc.c
With Meson you have only one choice and it is a third option, namely
"build at the beginning of the corresponding target"; the way you
express it is to list the includes in the sources of that target.
The problem is that Meson decides if something is a source vs. a
generated include by looking at the extension: '.c', '.cc', '.m', '.C'
are sources, while everything else is considered an include---including
'.inc.c'.
Use '.c.inc' to avoid this, as it is consistent with our other convention
of using '.rst.inc' for included reStructuredText files. The editorconfig
file is adjusted.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/ppc')
-rw-r--r-- | target/ppc/int_helper.c | 2 | ||||
-rw-r--r-- | target/ppc/mfrom_table.c.inc (renamed from target/ppc/mfrom_table.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate.c | 22 | ||||
-rw-r--r-- | target/ppc/translate/dfp-impl.c.inc (renamed from target/ppc/translate/dfp-impl.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/dfp-ops.c.inc (renamed from target/ppc/translate/dfp-ops.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/fp-impl.c.inc (renamed from target/ppc/translate/fp-impl.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/fp-ops.c.inc (renamed from target/ppc/translate/fp-ops.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/spe-impl.c.inc (renamed from target/ppc/translate/spe-impl.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/spe-ops.c.inc (renamed from target/ppc/translate/spe-ops.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/vmx-impl.c.inc (renamed from target/ppc/translate/vmx-impl.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/vmx-ops.c.inc (renamed from target/ppc/translate/vmx-ops.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/vsx-impl.c.inc (renamed from target/ppc/translate/vsx-impl.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate/vsx-ops.c.inc (renamed from target/ppc/translate/vsx-ops.inc.c) | 0 | ||||
-rw-r--r-- | target/ppc/translate_init.c.inc (renamed from target/ppc/translate_init.inc.c) | 0 |
14 files changed, 12 insertions, 12 deletions
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index d8bd3c2..43ebf1d 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -398,7 +398,7 @@ target_ulong helper_divso(CPUPPCState *env, target_ulong arg1, target_ulong helper_602_mfrom(target_ulong arg) { if (likely(arg < 602)) { -#include "mfrom_table.inc.c" +#include "mfrom_table.c.inc" return mfrom_ROM_table[arg]; } else { return 0; diff --git a/target/ppc/mfrom_table.inc.c b/target/ppc/mfrom_table.c.inc index 1653b97..1653b97 100644 --- a/target/ppc/mfrom_table.inc.c +++ b/target/ppc/mfrom_table.c.inc diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4ce3d66..04db0d8 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -6900,15 +6900,15 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high) tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high)); } -#include "translate/fp-impl.inc.c" +#include "translate/fp-impl.c.inc" -#include "translate/vmx-impl.inc.c" +#include "translate/vmx-impl.c.inc" -#include "translate/vsx-impl.inc.c" +#include "translate/vsx-impl.c.inc" -#include "translate/dfp-impl.inc.c" +#include "translate/dfp-impl.c.inc" -#include "translate/spe-impl.inc.c" +#include "translate/spe-impl.c.inc" /* Handles lfdp, lxsd, lxssp */ static void gen_dform39(DisasContext *ctx) @@ -7587,19 +7587,19 @@ GEN_HANDLER2_E(treclaim, "treclaim", 0x1F, 0x0E, 0x1D, 0x03E0F800, \ GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F, 0x03FFF800, \ PPC_NONE, PPC2_TM), -#include "translate/fp-ops.inc.c" +#include "translate/fp-ops.c.inc" -#include "translate/vmx-ops.inc.c" +#include "translate/vmx-ops.c.inc" -#include "translate/vsx-ops.inc.c" +#include "translate/vsx-ops.c.inc" -#include "translate/dfp-ops.inc.c" +#include "translate/dfp-ops.c.inc" -#include "translate/spe-ops.inc.c" +#include "translate/spe-ops.c.inc" }; #include "helper_regs.h" -#include "translate_init.inc.c" +#include "translate_init.c.inc" /*****************************************************************************/ /* Misc PowerPC helpers */ diff --git a/target/ppc/translate/dfp-impl.inc.c b/target/ppc/translate/dfp-impl.c.inc index 6c556dc..6c556dc 100644 --- a/target/ppc/translate/dfp-impl.inc.c +++ b/target/ppc/translate/dfp-impl.c.inc diff --git a/target/ppc/translate/dfp-ops.inc.c b/target/ppc/translate/dfp-ops.c.inc index 6ef38e5..6ef38e5 100644 --- a/target/ppc/translate/dfp-ops.inc.c +++ b/target/ppc/translate/dfp-ops.c.inc diff --git a/target/ppc/translate/fp-impl.inc.c b/target/ppc/translate/fp-impl.c.inc index 9f7868e..9f7868e 100644 --- a/target/ppc/translate/fp-impl.inc.c +++ b/target/ppc/translate/fp-impl.c.inc diff --git a/target/ppc/translate/fp-ops.inc.c b/target/ppc/translate/fp-ops.c.inc index 88fab65..88fab65 100644 --- a/target/ppc/translate/fp-ops.inc.c +++ b/target/ppc/translate/fp-ops.c.inc diff --git a/target/ppc/translate/spe-impl.inc.c b/target/ppc/translate/spe-impl.c.inc index 36b4d56..36b4d56 100644 --- a/target/ppc/translate/spe-impl.inc.c +++ b/target/ppc/translate/spe-impl.c.inc diff --git a/target/ppc/translate/spe-ops.inc.c b/target/ppc/translate/spe-ops.c.inc index 7efe8b8..7efe8b8 100644 --- a/target/ppc/translate/spe-ops.inc.c +++ b/target/ppc/translate/spe-ops.c.inc diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.c.inc index de2fd13..de2fd13 100644 --- a/target/ppc/translate/vmx-impl.inc.c +++ b/target/ppc/translate/vmx-impl.c.inc diff --git a/target/ppc/translate/vmx-ops.inc.c b/target/ppc/translate/vmx-ops.c.inc index 84e05fb..84e05fb 100644 --- a/target/ppc/translate/vmx-ops.inc.c +++ b/target/ppc/translate/vmx-ops.c.inc diff --git a/target/ppc/translate/vsx-impl.inc.c b/target/ppc/translate/vsx-impl.c.inc index b518de4..b518de4 100644 --- a/target/ppc/translate/vsx-impl.inc.c +++ b/target/ppc/translate/vsx-impl.c.inc diff --git a/target/ppc/translate/vsx-ops.inc.c b/target/ppc/translate/vsx-ops.c.inc index 7fd3942..7fd3942 100644 --- a/target/ppc/translate/vsx-ops.inc.c +++ b/target/ppc/translate/vsx-ops.c.inc diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.c.inc index 7e66822..7e66822 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.c.inc |