[Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Peter Maydell]

This patchset renames the arch-specific tcg-target.c files
to tcg-target.inc.c, to better indicate the fact that they
are not standalone source files but are just #included
from another .c file.

Having done that we can teach clean-includes about the .inc.c
convention, and then undo some unnecessary #includes that it
added earlier.

thanks
-- PMM

Peter Maydell (3):
  tcg: Rename tcg-target.c to tcg-target.inc.c
  scripts/clean-includes: Ignore .inc.c files
  tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c

 qemu-tech.texi                                 | 2 +-
 scripts/clean-includes                         | 5 +++++
 tcg/README                                     | 5 +++--
 tcg/aarch64/{tcg-target.c => tcg-target.inc.c} | 1 -
 tcg/arm/{tcg-target.c => tcg-target.inc.c}     | 1 -
 tcg/i386/{tcg-target.c => tcg-target.inc.c}    | 1 -
 tcg/ia64/{tcg-target.c => tcg-target.inc.c}    | 0
 tcg/mips/{tcg-target.c => tcg-target.inc.c}    | 1 -
 tcg/ppc/{tcg-target.c => tcg-target.inc.c}     | 1 -
 tcg/s390/{tcg-target.c => tcg-target.inc.c}    | 1 -
 tcg/sparc/{tcg-target.c => tcg-target.inc.c}   | 1 -
 tcg/tcg.c                                      | 7 ++++---
 tcg/tcg.h                                      | 2 +-
 tcg/tci/README                                 | 4 ++--
 tcg/tci/{tcg-target.c => tcg-target.inc.c}     | 1 -
 15 files changed, 16 insertions(+), 17 deletions(-)
 rename tcg/aarch64/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/arm/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/i386/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/ia64/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/mips/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/ppc/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/s390/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/sparc/{tcg-target.c => tcg-target.inc.c} (99%)
 rename tcg/tci/{tcg-target.c => tcg-target.inc.c} (99%)

-- 
1.9.1

[Qemu-devel] [PATCH 1/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Peter Maydell]

Rename the per-architecture tcg-target.c files to tcg-target.inc.c.
This makes it clearer that they are not intended to be standalone
C files, but are instead #included into another source file.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 qemu-tech.texi                                 | 2 +-
 tcg/README                                     | 5 +++--
 tcg/aarch64/{tcg-target.c => tcg-target.inc.c} | 0
 tcg/arm/{tcg-target.c => tcg-target.inc.c}     | 0
 tcg/i386/{tcg-target.c => tcg-target.inc.c}    | 0
 tcg/ia64/{tcg-target.c => tcg-target.inc.c}    | 0
 tcg/mips/{tcg-target.c => tcg-target.inc.c}    | 0
 tcg/ppc/{tcg-target.c => tcg-target.inc.c}     | 0
 tcg/s390/{tcg-target.c => tcg-target.inc.c}    | 0
 tcg/sparc/{tcg-target.c => tcg-target.inc.c}   | 0
 tcg/tcg.c                                      | 7 ++++---
 tcg/tcg.h                                      | 2 +-
 tcg/tci/README                                 | 4 ++--
 tcg/tci/{tcg-target.c => tcg-target.inc.c}     | 0
 14 files changed, 11 insertions(+), 9 deletions(-)
 rename tcg/aarch64/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/arm/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/i386/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/ia64/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/mips/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/ppc/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/s390/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/sparc/{tcg-target.c => tcg-target.inc.c} (100%)
 rename tcg/tci/{tcg-target.c => tcg-target.inc.c} (100%)

diff --git a/qemu-tech.texi b/qemu-tech.texi
index 022017d..bdb2285 100644
--- a/qemu-tech.texi
+++ b/qemu-tech.texi
@@ -385,7 +385,7 @@ ops (see @code{target-i386/translate.c}). Some optimizations can be
 performed at this stage, including liveness analysis and trivial
 constant expression evaluation. TCG ops are then implemented in the
 host CPU back end, also known as TCG target (see
-@code{tcg/i386/tcg-target.c}). For more information, please take a
+@code{tcg/i386/tcg-target.inc.c}). For more information, please take a
 look at @code{tcg/README}.
 
 @node Condition code optimisations
diff --git a/tcg/README b/tcg/README
index 34c0775..f4a8ac1 100644
--- a/tcg/README
+++ b/tcg/README
@@ -460,8 +460,9 @@ function tcg_gen_xxx(args).
 
 4) Backend
 
-tcg-target.h contains the target specific definitions. tcg-target.c
-contains the target specific code.
+tcg-target.h contains the target specific definitions. tcg-target.inc.c
+contains the target specific code; it is #included by tcg/tcg.c, rather
+than being a standalone C file.
 
 4.1) Assumptions
 
diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.inc.c
similarity index 100%
rename from tcg/aarch64/tcg-target.c
rename to tcg/aarch64/tcg-target.inc.c
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.inc.c
similarity index 100%
rename from tcg/arm/tcg-target.c
rename to tcg/arm/tcg-target.inc.c
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.inc.c
similarity index 100%
rename from tcg/i386/tcg-target.c
rename to tcg/i386/tcg-target.inc.c
diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.inc.c
similarity index 100%
rename from tcg/ia64/tcg-target.c
rename to tcg/ia64/tcg-target.inc.c
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.inc.c
similarity index 100%
rename from tcg/mips/tcg-target.c
rename to tcg/mips/tcg-target.inc.c
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.inc.c
similarity index 100%
rename from tcg/ppc/tcg-target.c
rename to tcg/ppc/tcg-target.inc.c
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.inc.c
similarity index 100%
rename from tcg/s390/tcg-target.c
rename to tcg/s390/tcg-target.inc.c
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.inc.c
similarity index 100%
rename from tcg/sparc/tcg-target.c
rename to tcg/sparc/tcg-target.inc.c
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 0317c9e..88567a6 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -62,7 +62,8 @@
 #include "elf.h"
 #include "exec/log.h"
 
-/* Forward declarations for functions declared in tcg-target.c and used here. */
+/* Forward declarations for functions declared in tcg-target.inc.c and
+   used here. */
 static void tcg_target_init(TCGContext *s);
 static void tcg_target_qemu_prologue(TCGContext *s);
 static void patch_reloc(tcg_insn_unit *code_ptr, int type,
@@ -96,7 +97,7 @@ static void tcg_register_jit_int(void *buf, size_t size,
                                  size_t debug_frame_size)
     __attribute__((unused));
 
-/* Forward declarations for functions declared and used in tcg-target.c. */
+/* Forward declarations for functions declared and used in tcg-target.inc.c. */
 static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str);
 static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
                        intptr_t arg2);
@@ -250,7 +251,7 @@ TCGLabel *gen_new_label(void)
     return l;
 }
 
-#include "tcg-target.c"
+#include "tcg-target.inc.c"
 
 /* pool based memory allocation */
 void *tcg_malloc_internal(TCGContext *s, int size)
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 83da5fb..143908b 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -566,7 +566,7 @@ struct TCGContext {
 
     TBContext tb_ctx;
 
-    /* The TCGBackendData structure is private to tcg-target.c.  */
+    /* The TCGBackendData structure is private to tcg-target.inc.c.  */
     struct TCGBackendData *be;
 
     TCGTempSet free_temps[TCG_TYPE_COUNT * 2];
diff --git a/tcg/tci/README b/tcg/tci/README
index dc57f07..3786b09 100644
--- a/tcg/tci/README
+++ b/tcg/tci/README
@@ -21,7 +21,7 @@ This is what TCI (Tiny Code Interpreter) does.
 2) Implementation
 
 Like each TCG host frontend, TCI implements the code generator in
-tcg-target.c, tcg-target.h. Both files are in directory tcg/tci.
+tcg-target.inc.c, tcg-target.h. Both files are in directory tcg/tci.
 
 The additional file tcg/tci.c adds the interpreter.
 
@@ -123,7 +123,7 @@ u1 = linux-user-test works
   would also improve speed for hosts which support byte alignment).
 
 * A better disassembler for the pseudo code would be nice (a very primitive
-  disassembler is included in tcg-target.c).
+  disassembler is included in tcg-target.inc.c).
 
 * It might be useful to have a runtime option which selects the native TCG
   or TCI, so QEMU would have to include two TCGs. Today, selecting TCI
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.inc.c
similarity index 100%
rename from tcg/tci/tcg-target.c
rename to tcg/tci/tcg-target.inc.c
-- 
1.9.1

[Qemu-devel] [PATCH 2/3] scripts/clean-includes: Ignore .inc.c files

[Peter Maydell]

Ignore files which have a .inc.c extension -- these are not headers
but they are not standalone C source files either, so we can't make
any automated decisions about what #include directives they should
have.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 scripts/clean-includes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/clean-includes b/scripts/clean-includes
index 8a3f398..177d253 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -94,6 +94,11 @@ EOT
 
 for f in "$@"; do
   case "$f" in
+    *.inc.c)
+      # These aren't standalone C source files
+      echo "SKIPPING $f (not a standalone source file)"
+      continue
+      ;;
     *.c)
       MODE=c
       ;;
-- 
1.9.1

Re: [Qemu-devel] [PATCH 2/3] scripts/clean-includes: Ignore .inc.c files

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]

On 02/23/2016 07:49 AM, Peter Maydell wrote:
> Ignore files which have a .inc.c extension -- these are not headers
> but they are not standalone C source files either, so we can't make
> any automated decisions about what #include directives they should
> have.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  scripts/clean-includes | 5 +++++
>  1 file changed, 5 insertions(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/scripts/clean-includes b/scripts/clean-includes
> index 8a3f398..177d253 100755
> --- a/scripts/clean-includes
> +++ b/scripts/clean-includes
> @@ -94,6 +94,11 @@ EOT
>  
>  for f in "$@"; do
>    case "$f" in
> +    *.inc.c)
> +      # These aren't standalone C source files
> +      echo "SKIPPING $f (not a standalone source file)"
> +      continue
> +      ;;
>      *.c)
>        MODE=c
>        ;;
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

[Qemu-devel] [PATCH 3/3] tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c

[Peter Maydell]

Commit 757e725b58c57d added a number of #include "qemu/osdep.h"
files to the tcg-target.c files (as they were named at the time).
These are unnecessary because these files are not standalone C
files, and the tcg/tcg.c file which includes them will have
already included osdep.h on their behalf. Remove the unneeded
include directives.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tcg/aarch64/tcg-target.inc.c | 1 -
 tcg/arm/tcg-target.inc.c     | 1 -
 tcg/i386/tcg-target.inc.c    | 1 -
 tcg/mips/tcg-target.inc.c    | 1 -
 tcg/ppc/tcg-target.inc.c     | 1 -
 tcg/s390/tcg-target.inc.c    | 1 -
 tcg/sparc/tcg-target.inc.c   | 1 -
 tcg/tci/tcg-target.inc.c     | 1 -
 8 files changed, 8 deletions(-)

diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c
index 8467d5d..0ed10a9 100644
--- a/tcg/aarch64/tcg-target.inc.c
+++ b/tcg/aarch64/tcg-target.inc.c
@@ -10,7 +10,6 @@
  * See the COPYING file in the top-level directory for details.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-ldst.h"
 #include "qemu/bitops.h"
 
diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
index 146ac00..3edf6a6 100644
--- a/tcg/arm/tcg-target.inc.c
+++ b/tcg/arm/tcg-target.inc.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "elf.h"
 #include "tcg-be-ldst.h"
 
diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index d90636c..9187d34 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-ldst.h"
 
 #ifndef NDEBUG
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
index 2dc4998..297bd00 100644
--- a/tcg/mips/tcg-target.inc.c
+++ b/tcg/mips/tcg-target.inc.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-ldst.h"
 
 #ifdef HOST_WORDS_BIGENDIAN
diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
index c593344..8c1c2df 100644
--- a/tcg/ppc/tcg-target.inc.c
+++ b/tcg/ppc/tcg-target.inc.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-ldst.h"
 
 #if defined _CALL_DARWIN || defined __APPLE__
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index 58520fa..fbf97bb 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-ldst.h"
 
 /* We only support generating code for 64-bit mode.  */
diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c
index d3100ab..54df1bc 100644
--- a/tcg/sparc/tcg-target.inc.c
+++ b/tcg/sparc/tcg-target.inc.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-null.h"
 
 #ifndef NDEBUG
diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c
index 16ce048..4afe4d7 100644
--- a/tcg/tci/tcg-target.inc.c
+++ b/tcg/tci/tcg-target.inc.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include "qemu/osdep.h"
 #include "tcg-be-null.h"
 
 /* TODO list:
-- 
1.9.1

Re: [Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

On 02/23/2016 07:49 AM, Peter Maydell wrote:
> This patchset renames the arch-specific tcg-target.c files
> to tcg-target.inc.c, to better indicate the fact that they
> are not standalone source files but are just #included
> from another .c file.
> 
> Having done that we can teach clean-includes about the .inc.c
> convention, and then undo some unnecessary #includes that it
> added earlier.
> 
> thanks
> -- PMM
> 
> Peter Maydell (3):
>   tcg: Rename tcg-target.c to tcg-target.inc.c
>   scripts/clean-includes: Ignore .inc.c files
>   tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c

Reviewed-by: Eric Blake <eblake@redhat.com>

also, for this series and for "post-include-cleanup followups":
Tested-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Richard Henderson]

On 02/23/2016 06:49 AM, Peter Maydell wrote:
> Peter Maydell (3):
>   tcg: Rename tcg-target.c to tcg-target.inc.c
>   scripts/clean-includes: Ignore .inc.c files
>   tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c

Reviewed-by: Richard Henderson <rth@twiddle.net>


r~

Re: [Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Peter Maydell]

On 23 February 2016 at 16:19, Richard Henderson <rth@twiddle.net> wrote:
> On 02/23/2016 06:49 AM, Peter Maydell wrote:
>> Peter Maydell (3):
>>   tcg: Rename tcg-target.c to tcg-target.inc.c
>>   scripts/clean-includes: Ignore .inc.c files
>>   tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c
>
> Reviewed-by: Richard Henderson <rth@twiddle.net>

Thanks. I'm assuming you'll prefer to take these via the
tcg tree to avoid conflicts with anything else you have pending.

thanks
-- PMM

Re: [Qemu-devel] [PATCH 0/3] tcg: Rename tcg-target.c to tcg-target.inc.c

[Richard Henderson]

On 02/23/2016 08:24 AM, Peter Maydell wrote:
> On 23 February 2016 at 16:19, Richard Henderson <rth@twiddle.net> wrote:
>> On 02/23/2016 06:49 AM, Peter Maydell wrote:
>>> Peter Maydell (3):
>>>   tcg: Rename tcg-target.c to tcg-target.inc.c
>>>   scripts/clean-includes: Ignore .inc.c files
>>>   tcg: Remove unnecessary osdep.h includes from tcg-target.inc.c
>>
>> Reviewed-by: Richard Henderson <rth@twiddle.net>
> 
> Thanks. I'm assuming you'll prefer to take these via the
> tcg tree to avoid conflicts with anything else you have pending.
> 

Sure.  I'm about to rebase and resubmit that, so this will be in.


r~