* [PATCH v2 1/4] tcg: Search includes from the project root source directory
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
@ 2020-01-01 11:23 ` Philippe Mathieu-Daudé
2020-01-02 1:43 ` David Gibson
2020-01-03 2:40 ` Alistair Francis
2020-01-01 11:23 ` [PATCH v2 2/4] tcg: Search includes in the parent " Philippe Mathieu-Daudé
` (5 subsequent siblings)
6 siblings, 2 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-01 11:23 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier,
Philippe Mathieu-Daudé, Michael Walle, qemu-ppc,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
We currently search both the root and the tcg/ directories for tcg
files:
$ git grep '#include "tcg/' | wc -l
28
$ git grep '#include "tcg[^/]' | wc -l
94
To simplify the preprocessor search path, unify by expliciting the
tcg/ directory.
Patch created mechanically by running:
$ for x in \
tcg.h tcg-mo.h tcg-op.h tcg-opc.h \
tcg-op-gvec.h tcg-gvec-desc.h; do \
sed -i "s,#include \"$x\",#include \"tcg/$x\"," \
$(git grep -l "#include \"$x\""); \
done
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/exec/cpu_ldst.h | 2 +-
tcg/i386/tcg-target.h | 2 +-
tcg/tcg-op.h | 2 +-
tcg/tcg.h | 4 ++--
accel/tcg/cpu-exec.c | 2 +-
accel/tcg/tcg-runtime-gvec.c | 2 +-
accel/tcg/translate-all.c | 2 +-
accel/tcg/user-exec.c | 2 +-
bsd-user/main.c | 2 +-
cpus.c | 2 +-
exec.c | 2 +-
linux-user/main.c | 2 +-
target/alpha/translate.c | 2 +-
target/arm/helper-a64.c | 2 +-
target/arm/translate-a64.c | 4 ++--
target/arm/translate-sve.c | 6 +++---
target/arm/translate.c | 4 ++--
target/cris/translate.c | 2 +-
target/hppa/translate.c | 2 +-
target/i386/mem_helper.c | 2 +-
target/i386/translate.c | 2 +-
target/lm32/translate.c | 2 +-
target/m68k/translate.c | 2 +-
target/microblaze/translate.c | 2 +-
target/mips/translate.c | 2 +-
target/moxie/translate.c | 2 +-
target/nios2/translate.c | 2 +-
target/openrisc/translate.c | 2 +-
target/ppc/mem_helper.c | 2 +-
target/ppc/translate.c | 4 ++--
target/riscv/cpu_helper.c | 2 +-
target/riscv/translate.c | 2 +-
target/s390x/translate.c | 4 ++--
target/sh4/translate.c | 2 +-
target/sparc/ldst_helper.c | 2 +-
target/sparc/translate.c | 2 +-
target/tilegx/translate.c | 2 +-
target/tricore/translate.c | 2 +-
target/unicore32/translate.c | 2 +-
target/xtensa/translate.c | 2 +-
tcg/optimize.c | 2 +-
tcg/tcg-common.c | 2 +-
tcg/tcg-op-gvec.c | 8 ++++----
tcg/tcg-op-vec.c | 6 +++---
tcg/tcg-op.c | 6 +++---
tcg/tcg.c | 2 +-
tcg/tci.c | 2 +-
47 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index fd499f7e2f..9c637f6e89 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -153,7 +153,7 @@ static inline void clear_helper_retaddr(void)
#else
/* The memory helpers for tcg-generated code need tcg_target_long etc. */
-#include "tcg.h"
+#include "tcg/tcg.h"
static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry)
{
diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
index 928e8b87bb..bfb3f5f6e9 100644
--- a/tcg/i386/tcg-target.h
+++ b/tcg/i386/tcg-target.h
@@ -223,7 +223,7 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
* The x86 has a pretty strong memory ordering which only really
* allows for some stores to be re-ordered after loads.
*/
-#include "tcg-mo.h"
+#include "tcg/tcg-mo.h"
#define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index 4af272daa5..230db6e022 100644
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -25,7 +25,7 @@
#ifndef TCG_TCG_OP_H
#define TCG_TCG_OP_H
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 92ca10dffc..bb59027240 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -31,7 +31,7 @@
#include "qemu/bitops.h"
#include "qemu/plugin.h"
#include "qemu/queue.h"
-#include "tcg-mo.h"
+#include "tcg/tcg-mo.h"
#include "tcg-target.h"
#include "qemu/int128.h"
@@ -211,7 +211,7 @@ typedef uint64_t TCGRegSet;
typedef enum TCGOpcode {
#define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name,
-#include "tcg-opc.h"
+#include "tcg/tcg-opc.h"
#undef DEF
NB_OPS,
} TCGOpcode;
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 62068d10c3..2560c90eec 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -23,7 +23,7 @@
#include "trace.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "qemu/atomic.h"
#include "sysemu/qtest.h"
#include "qemu/timer.h"
diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c
index 51cb29ca79..5b1902d591 100644
--- a/accel/tcg/tcg-runtime-gvec.c
+++ b/accel/tcg/tcg-runtime-gvec.c
@@ -21,7 +21,7 @@
#include "qemu/host-utils.h"
#include "cpu.h"
#include "exec/helper-proto.h"
-#include "tcg-gvec-desc.h"
+#include "tcg/tcg-gvec-desc.h"
/* Virtually all hosts support 16-byte vectors. Those that don't can emulate
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index bb325a2bc4..a08ab11f65 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -25,7 +25,7 @@
#include "trace.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index b09f7a1577..2d45613231 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "qemu/bitops.h"
#include "exec/cpu_ldst.h"
#include "translate-all.h"
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 7f4e3cd627..770c2b267a 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -33,7 +33,7 @@
#include "qemu/module.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
#include "exec/log.h"
diff --git a/cpus.c b/cpus.c
index b472378b70..18f56572fa 100644
--- a/cpus.c
+++ b/cpus.c
@@ -53,7 +53,7 @@
#include "qemu/bitmap.h"
#include "qemu/seqlock.h"
#include "qemu/guest-random.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "hw/nmi.h"
#include "sysemu/replay.h"
#include "sysemu/runstate.h"
diff --git a/exec.c b/exec.c
index d4b769d0d4..0f6b087f57 100644
--- a/exec.c
+++ b/exec.c
@@ -25,7 +25,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/target_page.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "hw/qdev-core.h"
#include "hw/qdev-properties.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/linux-user/main.c b/linux-user/main.c
index 8718d03ee2..fba833aac9 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -37,7 +37,7 @@
#include "qemu/plugin.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
#include "qemu/guest-random.h"
diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index f7f1ed0f41..8870284f57 100644
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -23,7 +23,7 @@
#include "disas/disas.h"
#include "qemu/host-utils.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
index b4cd680fc4..36aa6badfd 100644
--- a/target/arm/helper-a64.c
+++ b/target/arm/helper-a64.c
@@ -31,7 +31,7 @@
#include "exec/cpu_ldst.h"
#include "qemu/int128.h"
#include "qemu/atomic128.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "fpu/softfloat.h"
#include <zlib.h> /* For crc32 */
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index d4bebbe629..a1d4dce4fa 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -20,8 +20,8 @@
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
#include "qemu/log.h"
#include "arm_ldst.h"
#include "translate.h"
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 5d7edd0907..b35bad245e 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -20,9 +20,9 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
-#include "tcg-gvec-desc.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
+#include "tcg/tcg-gvec-desc.h"
#include "qemu/log.h"
#include "arm_ldst.h"
#include "translate.h"
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 2b6c1f91bf..39821d040b 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -24,8 +24,8 @@
#include "internals.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
#include "qemu/log.h"
#include "qemu/bitops.h"
#include "arm_ldst.h"
diff --git a/target/cris/translate.c b/target/cris/translate.c
index cb57516a44..aaa46b5bca 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -27,7 +27,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/helper-proto.h"
#include "mmu.h"
#include "exec/cpu_ldst.h"
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 2f8d407a82..f25927aeca 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -22,7 +22,7 @@
#include "disas/disas.h"
#include "qemu/host-utils.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c
index d50d4b0c40..acf41f8885 100644
--- a/target/i386/mem_helper.c
+++ b/target/i386/mem_helper.c
@@ -24,7 +24,7 @@
#include "exec/cpu_ldst.h"
#include "qemu/int128.h"
#include "qemu/atomic128.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
void helper_cmpxchg8b_unlocked(CPUX86State *env, target_ulong a0)
{
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 7c99ef1385..d9af8f4078 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "exec/translator.h"
diff --git a/target/lm32/translate.c b/target/lm32/translate.c
index 73db9654d6..e583d52d03 100644
--- a/target/lm32/translate.c
+++ b/target/lm32/translate.c
@@ -23,7 +23,7 @@
#include "exec/helper-proto.h"
#include "exec/exec-all.h"
#include "exec/translator.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "qemu/qemu-print.h"
#include "exec/cpu_ldst.h"
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index fcdb7bc8e4..31b743717e 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "qemu/log.h"
#include "qemu/qemu-print.h"
#include "exec/cpu_ldst.h"
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index 525115b041..37a844db99 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/helper-proto.h"
#include "microblaze-decode.h"
#include "exec/cpu_ldst.h"
diff --git a/target/mips/translate.c b/target/mips/translate.c
index 4bff585bd6..efe75e6be0 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "hw/mips/cpudevs.h"
diff --git a/target/moxie/translate.c b/target/moxie/translate.c
index c87e9ec2b1..d5fb27dfb8 100644
--- a/target/moxie/translate.c
+++ b/target/moxie/translate.c
@@ -26,7 +26,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "qemu/qemu-print.h"
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 82107bf270..6c34cd3193 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -23,7 +23,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
#include "exec/helper-proto.h"
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index 8dd28d6cf1..52323a16df 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "qemu/log.h"
#include "qemu/bitops.h"
#include "qemu/qemu-print.h"
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
index 1351b53f28..7404b14bed 100644
--- a/target/ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
@@ -25,7 +25,7 @@
#include "exec/helper-proto.h"
#include "helper_regs.h"
#include "exec/cpu_ldst.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "internal.h"
#include "qemu/atomic128.h"
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index f5fe5d0611..9dcf8dc261 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -23,8 +23,8 @@
#include "internal.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
#include "qemu/host-utils.h"
#include "qemu/main-loop.h"
#include "exec/cpu_ldst.h"
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 767c8762ac..85403da9c8 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -22,7 +22,7 @@
#include "qemu/main-loop.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "trace.h"
int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index ab6a891dc3..56b1b1fe7b 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "cpu.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "disas/disas.h"
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 4292bb0dd0..b764ec3140 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -33,8 +33,8 @@
#include "internal.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
#include "qemu/log.h"
#include "qemu/host-utils.h"
#include "exec/cpu_ldst.h"
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 922785e225..6192d83e8c 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -23,7 +23,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index 7345827a96..e91cfdecd3 100644
--- a/target/sparc/ldst_helper.c
+++ b/target/sparc/ldst_helper.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
#include "exec/helper-proto.h"
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index edc23a7c40..9416a551cf 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -24,7 +24,7 @@
#include "disas/disas.h"
#include "exec/helper-proto.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "exec/helper-gen.h"
diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c
index abce7e1c75..65f1c91f4f 100644
--- a/target/tilegx/translate.c
+++ b/target/tilegx/translate.c
@@ -24,7 +24,7 @@
#include "exec/log.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "linux-user/syscall_defs.h"
diff --git a/target/tricore/translate.c b/target/tricore/translate.c
index c574638c9f..609d75ae8a 100644
--- a/target/tricore/translate.c
+++ b/target/tricore/translate.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "exec/cpu_ldst.h"
#include "qemu/qemu-print.h"
diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c
index 0f6891b8aa..d4b06df672 100644
--- a/target/unicore32/translate.c
+++ b/target/unicore32/translate.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "qemu/log.h"
#include "exec/cpu_ldst.h"
#include "exec/translator.h"
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index a99f5296e2..f5510ef043 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -33,7 +33,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#include "qemu/log.h"
#include "qemu/qemu-print.h"
#include "exec/cpu_ldst.h"
diff --git a/tcg/optimize.c b/tcg/optimize.c
index f7f4e873c9..53aa8e5329 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -24,7 +24,7 @@
*/
#include "qemu/osdep.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#define CASE_OP_32_64(x) \
glue(glue(case INDEX_op_, x), _i32): \
diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
index 97305a3efc..7e1992e79e 100644
--- a/tcg/tcg-common.c
+++ b/tcg/tcg-common.c
@@ -32,7 +32,7 @@ uintptr_t tci_tb_ptr;
TCGOpDef tcg_op_defs[] = {
#define DEF(s, oargs, iargs, cargs, flags) \
{ #s, oargs, iargs, cargs, iargs + oargs + cargs, flags },
-#include "tcg-opc.h"
+#include "tcg/tcg-opc.h"
#undef DEF
};
const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c
index 5c95ecd51c..41b4a3c661 100644
--- a/tcg/tcg-op-gvec.c
+++ b/tcg/tcg-op-gvec.c
@@ -18,11 +18,11 @@
*/
#include "qemu/osdep.h"
-#include "tcg.h"
-#include "tcg-op.h"
-#include "tcg-op-gvec.h"
+#include "tcg/tcg.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
#include "qemu/main-loop.h"
-#include "tcg-gvec-desc.h"
+#include "tcg/tcg-gvec-desc.h"
#define MAX_UNROLL 4
diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
index 6714991bf4..b6937e8d64 100644
--- a/tcg/tcg-op-vec.c
+++ b/tcg/tcg-op-vec.c
@@ -19,9 +19,9 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "tcg.h"
-#include "tcg-op.h"
-#include "tcg-mo.h"
+#include "tcg/tcg.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-mo.h"
/* Reduce the number of ifdefs below. This assumes that all uses of
TCGV_HIGH and TCGV_LOW are properly protected by a conditional that
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index c245126f98..7d782002e3 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -25,9 +25,9 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "tcg.h"
-#include "tcg-op.h"
-#include "tcg-mo.h"
+#include "tcg/tcg.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-mo.h"
#include "trace-tcg.h"
#include "trace/mem.h"
#include "exec/plugin-gen.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 4f616ba38b..dd4b3d7684 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -48,7 +48,7 @@
#include "hw/boards.h"
#endif
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
#if UINTPTR_MAX == UINT32_MAX
# define ELF_CLASS ELFCLASS32
diff --git a/tcg/tci.c b/tcg/tci.c
index a6208653e8..46fe9ce63f 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -30,7 +30,7 @@
#include "qemu-common.h"
#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
#include "exec/cpu_ldst.h"
-#include "tcg-op.h"
+#include "tcg/tcg-op.h"
/* Marker for missing code. */
#define TODO() \
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
2020-01-01 11:23 ` [PATCH v2 1/4] tcg: Search includes from the project root source directory Philippe Mathieu-Daudé
@ 2020-01-02 1:43 ` David Gibson
2020-01-03 2:40 ` Alistair Francis
1 sibling, 0 replies; 15+ messages in thread
From: David Gibson @ 2020-01-02 1:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel, Max Filippov,
Alistair Francis, Edgar E. Iglesias, Guan Xuetao, Marek Vasut,
Palmer Dabbelt, Aleksandar Rikalo, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, Richard Henderson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier, Michael Walle,
qemu-ppc, Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
[-- Attachment #1: Type: text/plain, Size: 23023 bytes --]
On Wed, Jan 01, 2020 at 12:23:00PM +0100, Philippe Mathieu-Daudé wrote:
> We currently search both the root and the tcg/ directories for tcg
> files:
>
> $ git grep '#include "tcg/' | wc -l
> 28
>
> $ git grep '#include "tcg[^/]' | wc -l
> 94
>
> To simplify the preprocessor search path, unify by expliciting the
> tcg/ directory.
>
> Patch created mechanically by running:
>
> $ for x in \
> tcg.h tcg-mo.h tcg-op.h tcg-opc.h \
> tcg-op-gvec.h tcg-gvec-desc.h; do \
> sed -i "s,#include \"$x\",#include \"tcg/$x\"," \
> $(git grep -l "#include \"$x\""); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
ppc parts
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/exec/cpu_ldst.h | 2 +-
> tcg/i386/tcg-target.h | 2 +-
> tcg/tcg-op.h | 2 +-
> tcg/tcg.h | 4 ++--
> accel/tcg/cpu-exec.c | 2 +-
> accel/tcg/tcg-runtime-gvec.c | 2 +-
> accel/tcg/translate-all.c | 2 +-
> accel/tcg/user-exec.c | 2 +-
> bsd-user/main.c | 2 +-
> cpus.c | 2 +-
> exec.c | 2 +-
> linux-user/main.c | 2 +-
> target/alpha/translate.c | 2 +-
> target/arm/helper-a64.c | 2 +-
> target/arm/translate-a64.c | 4 ++--
> target/arm/translate-sve.c | 6 +++---
> target/arm/translate.c | 4 ++--
> target/cris/translate.c | 2 +-
> target/hppa/translate.c | 2 +-
> target/i386/mem_helper.c | 2 +-
> target/i386/translate.c | 2 +-
> target/lm32/translate.c | 2 +-
> target/m68k/translate.c | 2 +-
> target/microblaze/translate.c | 2 +-
> target/mips/translate.c | 2 +-
> target/moxie/translate.c | 2 +-
> target/nios2/translate.c | 2 +-
> target/openrisc/translate.c | 2 +-
> target/ppc/mem_helper.c | 2 +-
> target/ppc/translate.c | 4 ++--
> target/riscv/cpu_helper.c | 2 +-
> target/riscv/translate.c | 2 +-
> target/s390x/translate.c | 4 ++--
> target/sh4/translate.c | 2 +-
> target/sparc/ldst_helper.c | 2 +-
> target/sparc/translate.c | 2 +-
> target/tilegx/translate.c | 2 +-
> target/tricore/translate.c | 2 +-
> target/unicore32/translate.c | 2 +-
> target/xtensa/translate.c | 2 +-
> tcg/optimize.c | 2 +-
> tcg/tcg-common.c | 2 +-
> tcg/tcg-op-gvec.c | 8 ++++----
> tcg/tcg-op-vec.c | 6 +++---
> tcg/tcg-op.c | 6 +++---
> tcg/tcg.c | 2 +-
> tcg/tci.c | 2 +-
> 47 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index fd499f7e2f..9c637f6e89 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -153,7 +153,7 @@ static inline void clear_helper_retaddr(void)
> #else
>
> /* The memory helpers for tcg-generated code need tcg_target_long etc. */
> -#include "tcg.h"
> +#include "tcg/tcg.h"
>
> static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry)
> {
> diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
> index 928e8b87bb..bfb3f5f6e9 100644
> --- a/tcg/i386/tcg-target.h
> +++ b/tcg/i386/tcg-target.h
> @@ -223,7 +223,7 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
> * The x86 has a pretty strong memory ordering which only really
> * allows for some stores to be re-ordered after loads.
> */
> -#include "tcg-mo.h"
> +#include "tcg/tcg-mo.h"
>
> #define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
>
> diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
> index 4af272daa5..230db6e022 100644
> --- a/tcg/tcg-op.h
> +++ b/tcg/tcg-op.h
> @@ -25,7 +25,7 @@
> #ifndef TCG_TCG_OP_H
> #define TCG_TCG_OP_H
>
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
>
> diff --git a/tcg/tcg.h b/tcg/tcg.h
> index 92ca10dffc..bb59027240 100644
> --- a/tcg/tcg.h
> +++ b/tcg/tcg.h
> @@ -31,7 +31,7 @@
> #include "qemu/bitops.h"
> #include "qemu/plugin.h"
> #include "qemu/queue.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg-mo.h"
> #include "tcg-target.h"
> #include "qemu/int128.h"
>
> @@ -211,7 +211,7 @@ typedef uint64_t TCGRegSet;
>
> typedef enum TCGOpcode {
> #define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name,
> -#include "tcg-opc.h"
> +#include "tcg/tcg-opc.h"
> #undef DEF
> NB_OPS,
> } TCGOpcode;
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 62068d10c3..2560c90eec 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -23,7 +23,7 @@
> #include "trace.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/atomic.h"
> #include "sysemu/qtest.h"
> #include "qemu/timer.h"
> diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c
> index 51cb29ca79..5b1902d591 100644
> --- a/accel/tcg/tcg-runtime-gvec.c
> +++ b/accel/tcg/tcg-runtime-gvec.c
> @@ -21,7 +21,7 @@
> #include "qemu/host-utils.h"
> #include "cpu.h"
> #include "exec/helper-proto.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-gvec-desc.h"
>
>
> /* Virtually all hosts support 16-byte vectors. Those that don't can emulate
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index bb325a2bc4..a08ab11f65 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -25,7 +25,7 @@
> #include "trace.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index b09f7a1577..2d45613231 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -20,7 +20,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/bitops.h"
> #include "exec/cpu_ldst.h"
> #include "translate-all.h"
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 7f4e3cd627..770c2b267a 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -33,7 +33,7 @@
> #include "qemu/module.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/timer.h"
> #include "qemu/envlist.h"
> #include "exec/log.h"
> diff --git a/cpus.c b/cpus.c
> index b472378b70..18f56572fa 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -53,7 +53,7 @@
> #include "qemu/bitmap.h"
> #include "qemu/seqlock.h"
> #include "qemu/guest-random.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "hw/nmi.h"
> #include "sysemu/replay.h"
> #include "sysemu/runstate.h"
> diff --git a/exec.c b/exec.c
> index d4b769d0d4..0f6b087f57 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -25,7 +25,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "exec/target_page.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "hw/qdev-core.h"
> #include "hw/qdev-properties.h"
> #if !defined(CONFIG_USER_ONLY)
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 8718d03ee2..fba833aac9 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -37,7 +37,7 @@
> #include "qemu/plugin.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/timer.h"
> #include "qemu/envlist.h"
> #include "qemu/guest-random.h"
> diff --git a/target/alpha/translate.c b/target/alpha/translate.c
> index f7f1ed0f41..8870284f57 100644
> --- a/target/alpha/translate.c
> +++ b/target/alpha/translate.c
> @@ -23,7 +23,7 @@
> #include "disas/disas.h"
> #include "qemu/host-utils.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
> index b4cd680fc4..36aa6badfd 100644
> --- a/target/arm/helper-a64.c
> +++ b/target/arm/helper-a64.c
> @@ -31,7 +31,7 @@
> #include "exec/cpu_ldst.h"
> #include "qemu/int128.h"
> #include "qemu/atomic128.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "fpu/softfloat.h"
> #include <zlib.h> /* For crc32 */
>
> diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
> index d4bebbe629..a1d4dce4fa 100644
> --- a/target/arm/translate-a64.c
> +++ b/target/arm/translate-a64.c
> @@ -20,8 +20,8 @@
>
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "arm_ldst.h"
> #include "translate.h"
> diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
> index 5d7edd0907..b35bad245e 100644
> --- a/target/arm/translate-sve.c
> +++ b/target/arm/translate-sve.c
> @@ -20,9 +20,9 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> +#include "tcg/tcg-gvec-desc.h"
> #include "qemu/log.h"
> #include "arm_ldst.h"
> #include "translate.h"
> diff --git a/target/arm/translate.c b/target/arm/translate.c
> index 2b6c1f91bf..39821d040b 100644
> --- a/target/arm/translate.c
> +++ b/target/arm/translate.c
> @@ -24,8 +24,8 @@
> #include "internals.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "qemu/bitops.h"
> #include "arm_ldst.h"
> diff --git a/target/cris/translate.c b/target/cris/translate.c
> index cb57516a44..aaa46b5bca 100644
> --- a/target/cris/translate.c
> +++ b/target/cris/translate.c
> @@ -27,7 +27,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/helper-proto.h"
> #include "mmu.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/hppa/translate.c b/target/hppa/translate.c
> index 2f8d407a82..f25927aeca 100644
> --- a/target/hppa/translate.c
> +++ b/target/hppa/translate.c
> @@ -22,7 +22,7 @@
> #include "disas/disas.h"
> #include "qemu/host-utils.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c
> index d50d4b0c40..acf41f8885 100644
> --- a/target/i386/mem_helper.c
> +++ b/target/i386/mem_helper.c
> @@ -24,7 +24,7 @@
> #include "exec/cpu_ldst.h"
> #include "qemu/int128.h"
> #include "qemu/atomic128.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
>
> void helper_cmpxchg8b_unlocked(CPUX86State *env, target_ulong a0)
> {
> diff --git a/target/i386/translate.c b/target/i386/translate.c
> index 7c99ef1385..d9af8f4078 100644
> --- a/target/i386/translate.c
> +++ b/target/i386/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/translator.h"
>
> diff --git a/target/lm32/translate.c b/target/lm32/translate.c
> index 73db9654d6..e583d52d03 100644
> --- a/target/lm32/translate.c
> +++ b/target/lm32/translate.c
> @@ -23,7 +23,7 @@
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> #include "exec/translator.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/qemu-print.h"
>
> #include "exec/cpu_ldst.h"
> diff --git a/target/m68k/translate.c b/target/m68k/translate.c
> index fcdb7bc8e4..31b743717e 100644
> --- a/target/m68k/translate.c
> +++ b/target/m68k/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/qemu-print.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
> index 525115b041..37a844db99 100644
> --- a/target/microblaze/translate.c
> +++ b/target/microblaze/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/helper-proto.h"
> #include "microblaze-decode.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/mips/translate.c b/target/mips/translate.c
> index 4bff585bd6..efe75e6be0 100644
> --- a/target/mips/translate.c
> +++ b/target/mips/translate.c
> @@ -26,7 +26,7 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "hw/mips/cpudevs.h"
>
> diff --git a/target/moxie/translate.c b/target/moxie/translate.c
> index c87e9ec2b1..d5fb27dfb8 100644
> --- a/target/moxie/translate.c
> +++ b/target/moxie/translate.c
> @@ -26,7 +26,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "qemu/qemu-print.h"
>
> diff --git a/target/nios2/translate.c b/target/nios2/translate.c
> index 82107bf270..6c34cd3193 100644
> --- a/target/nios2/translate.c
> +++ b/target/nios2/translate.c
> @@ -23,7 +23,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> #include "exec/helper-proto.h"
> diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
> index 8dd28d6cf1..52323a16df 100644
> --- a/target/openrisc/translate.c
> +++ b/target/openrisc/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/bitops.h"
> #include "qemu/qemu-print.h"
> diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
> index 1351b53f28..7404b14bed 100644
> --- a/target/ppc/mem_helper.c
> +++ b/target/ppc/mem_helper.c
> @@ -25,7 +25,7 @@
> #include "exec/helper-proto.h"
> #include "helper_regs.h"
> #include "exec/cpu_ldst.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "internal.h"
> #include "qemu/atomic128.h"
>
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index f5fe5d0611..9dcf8dc261 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -23,8 +23,8 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/host-utils.h"
> #include "qemu/main-loop.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
> index 767c8762ac..85403da9c8 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -22,7 +22,7 @@
> #include "qemu/main-loop.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "trace.h"
>
> int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index ab6a891dc3..56b1b1fe7b 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -19,7 +19,7 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "cpu.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "disas/disas.h"
> #include "exec/cpu_ldst.h"
> #include "exec/exec-all.h"
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 4292bb0dd0..b764ec3140 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -33,8 +33,8 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "qemu/host-utils.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/sh4/translate.c b/target/sh4/translate.c
> index 922785e225..6192d83e8c 100644
> --- a/target/sh4/translate.c
> +++ b/target/sh4/translate.c
> @@ -23,7 +23,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
> index 7345827a96..e91cfdecd3 100644
> --- a/target/sparc/ldst_helper.c
> +++ b/target/sparc/ldst_helper.c
> @@ -19,7 +19,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/sparc/translate.c b/target/sparc/translate.c
> index edc23a7c40..9416a551cf 100644
> --- a/target/sparc/translate.c
> +++ b/target/sparc/translate.c
> @@ -24,7 +24,7 @@
> #include "disas/disas.h"
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
>
> #include "exec/helper-gen.h"
> diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c
> index abce7e1c75..65f1c91f4f 100644
> --- a/target/tilegx/translate.c
> +++ b/target/tilegx/translate.c
> @@ -24,7 +24,7 @@
> #include "exec/log.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "linux-user/syscall_defs.h"
>
> diff --git a/target/tricore/translate.c b/target/tricore/translate.c
> index c574638c9f..609d75ae8a 100644
> --- a/target/tricore/translate.c
> +++ b/target/tricore/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "qemu/qemu-print.h"
>
> diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c
> index 0f6891b8aa..d4b06df672 100644
> --- a/target/unicore32/translate.c
> +++ b/target/unicore32/translate.c
> @@ -13,7 +13,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "exec/cpu_ldst.h"
> #include "exec/translator.h"
> diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
> index a99f5296e2..f5510ef043 100644
> --- a/target/xtensa/translate.c
> +++ b/target/xtensa/translate.c
> @@ -33,7 +33,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/qemu-print.h"
> #include "exec/cpu_ldst.h"
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index f7f4e873c9..53aa8e5329 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -24,7 +24,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> #define CASE_OP_32_64(x) \
> glue(glue(case INDEX_op_, x), _i32): \
> diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
> index 97305a3efc..7e1992e79e 100644
> --- a/tcg/tcg-common.c
> +++ b/tcg/tcg-common.c
> @@ -32,7 +32,7 @@ uintptr_t tci_tb_ptr;
> TCGOpDef tcg_op_defs[] = {
> #define DEF(s, oargs, iargs, cargs, flags) \
> { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags },
> -#include "tcg-opc.h"
> +#include "tcg/tcg-opc.h"
> #undef DEF
> };
> const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
> diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c
> index 5c95ecd51c..41b4a3c661 100644
> --- a/tcg/tcg-op-gvec.c
> +++ b/tcg/tcg-op-gvec.c
> @@ -18,11 +18,11 @@
> */
>
> #include "qemu/osdep.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/main-loop.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-gvec-desc.h"
>
> #define MAX_UNROLL 4
>
> diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
> index 6714991bf4..b6937e8d64 100644
> --- a/tcg/tcg-op-vec.c
> +++ b/tcg/tcg-op-vec.c
> @@ -19,9 +19,9 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-mo.h"
>
> /* Reduce the number of ifdefs below. This assumes that all uses of
> TCGV_HIGH and TCGV_LOW are properly protected by a conditional that
> diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
> index c245126f98..7d782002e3 100644
> --- a/tcg/tcg-op.c
> +++ b/tcg/tcg-op.c
> @@ -25,9 +25,9 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-mo.h"
> #include "trace-tcg.h"
> #include "trace/mem.h"
> #include "exec/plugin-gen.h"
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 4f616ba38b..dd4b3d7684 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -48,7 +48,7 @@
> #include "hw/boards.h"
> #endif
>
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> #if UINTPTR_MAX == UINT32_MAX
> # define ELF_CLASS ELFCLASS32
> diff --git a/tcg/tci.c b/tcg/tci.c
> index a6208653e8..46fe9ce63f 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -30,7 +30,7 @@
> #include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> /* Marker for missing code. */
> #define TODO() \
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
2020-01-01 11:23 ` [PATCH v2 1/4] tcg: Search includes from the project root source directory Philippe Mathieu-Daudé
2020-01-02 1:43 ` David Gibson
@ 2020-01-03 2:40 ` Alistair Francis
1 sibling, 0 replies; 15+ messages in thread
From: Alistair Francis @ 2020-01-03 2:40 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Cornelia Huck, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel@nongnu.org Developers,
Max Filippov, Alistair Francis, Edgar E. Iglesias, Guan Xuetao,
Marek Vasut, open list:New World, Aleksandar Rikalo, David Gibson,
Artyom Tarasenko, Eduardo Habkost, Stefan Weil, Riku Voipio,
qemu-s390x, qemu-arm, Stafford Horne, Richard Henderson,
open list:RISC-V, Bastian Koppelmann, Chris Wulff,
Claudio Fontana, Laurent Vivier, Michael Walle, Palmer Dabbelt,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
On Wed, Jan 1, 2020 at 3:24 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> We currently search both the root and the tcg/ directories for tcg
> files:
>
> $ git grep '#include "tcg/' | wc -l
> 28
>
> $ git grep '#include "tcg[^/]' | wc -l
> 94
>
> To simplify the preprocessor search path, unify by expliciting the
> tcg/ directory.
>
> Patch created mechanically by running:
>
> $ for x in \
> tcg.h tcg-mo.h tcg-op.h tcg-opc.h \
> tcg-op-gvec.h tcg-gvec-desc.h; do \
> sed -i "s,#include \"$x\",#include \"tcg/$x\"," \
> $(git grep -l "#include \"$x\""); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> include/exec/cpu_ldst.h | 2 +-
> tcg/i386/tcg-target.h | 2 +-
> tcg/tcg-op.h | 2 +-
> tcg/tcg.h | 4 ++--
> accel/tcg/cpu-exec.c | 2 +-
> accel/tcg/tcg-runtime-gvec.c | 2 +-
> accel/tcg/translate-all.c | 2 +-
> accel/tcg/user-exec.c | 2 +-
> bsd-user/main.c | 2 +-
> cpus.c | 2 +-
> exec.c | 2 +-
> linux-user/main.c | 2 +-
> target/alpha/translate.c | 2 +-
> target/arm/helper-a64.c | 2 +-
> target/arm/translate-a64.c | 4 ++--
> target/arm/translate-sve.c | 6 +++---
> target/arm/translate.c | 4 ++--
> target/cris/translate.c | 2 +-
> target/hppa/translate.c | 2 +-
> target/i386/mem_helper.c | 2 +-
> target/i386/translate.c | 2 +-
> target/lm32/translate.c | 2 +-
> target/m68k/translate.c | 2 +-
> target/microblaze/translate.c | 2 +-
> target/mips/translate.c | 2 +-
> target/moxie/translate.c | 2 +-
> target/nios2/translate.c | 2 +-
> target/openrisc/translate.c | 2 +-
> target/ppc/mem_helper.c | 2 +-
> target/ppc/translate.c | 4 ++--
> target/riscv/cpu_helper.c | 2 +-
> target/riscv/translate.c | 2 +-
> target/s390x/translate.c | 4 ++--
> target/sh4/translate.c | 2 +-
> target/sparc/ldst_helper.c | 2 +-
> target/sparc/translate.c | 2 +-
> target/tilegx/translate.c | 2 +-
> target/tricore/translate.c | 2 +-
> target/unicore32/translate.c | 2 +-
> target/xtensa/translate.c | 2 +-
> tcg/optimize.c | 2 +-
> tcg/tcg-common.c | 2 +-
> tcg/tcg-op-gvec.c | 8 ++++----
> tcg/tcg-op-vec.c | 6 +++---
> tcg/tcg-op.c | 6 +++---
> tcg/tcg.c | 2 +-
> tcg/tci.c | 2 +-
> 47 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index fd499f7e2f..9c637f6e89 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -153,7 +153,7 @@ static inline void clear_helper_retaddr(void)
> #else
>
> /* The memory helpers for tcg-generated code need tcg_target_long etc. */
> -#include "tcg.h"
> +#include "tcg/tcg.h"
>
> static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry)
> {
> diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
> index 928e8b87bb..bfb3f5f6e9 100644
> --- a/tcg/i386/tcg-target.h
> +++ b/tcg/i386/tcg-target.h
> @@ -223,7 +223,7 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
> * The x86 has a pretty strong memory ordering which only really
> * allows for some stores to be re-ordered after loads.
> */
> -#include "tcg-mo.h"
> +#include "tcg/tcg-mo.h"
>
> #define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
>
> diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
> index 4af272daa5..230db6e022 100644
> --- a/tcg/tcg-op.h
> +++ b/tcg/tcg-op.h
> @@ -25,7 +25,7 @@
> #ifndef TCG_TCG_OP_H
> #define TCG_TCG_OP_H
>
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
>
> diff --git a/tcg/tcg.h b/tcg/tcg.h
> index 92ca10dffc..bb59027240 100644
> --- a/tcg/tcg.h
> +++ b/tcg/tcg.h
> @@ -31,7 +31,7 @@
> #include "qemu/bitops.h"
> #include "qemu/plugin.h"
> #include "qemu/queue.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg-mo.h"
> #include "tcg-target.h"
> #include "qemu/int128.h"
>
> @@ -211,7 +211,7 @@ typedef uint64_t TCGRegSet;
>
> typedef enum TCGOpcode {
> #define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name,
> -#include "tcg-opc.h"
> +#include "tcg/tcg-opc.h"
> #undef DEF
> NB_OPS,
> } TCGOpcode;
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 62068d10c3..2560c90eec 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -23,7 +23,7 @@
> #include "trace.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/atomic.h"
> #include "sysemu/qtest.h"
> #include "qemu/timer.h"
> diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c
> index 51cb29ca79..5b1902d591 100644
> --- a/accel/tcg/tcg-runtime-gvec.c
> +++ b/accel/tcg/tcg-runtime-gvec.c
> @@ -21,7 +21,7 @@
> #include "qemu/host-utils.h"
> #include "cpu.h"
> #include "exec/helper-proto.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-gvec-desc.h"
>
>
> /* Virtually all hosts support 16-byte vectors. Those that don't can emulate
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index bb325a2bc4..a08ab11f65 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -25,7 +25,7 @@
> #include "trace.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index b09f7a1577..2d45613231 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -20,7 +20,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/bitops.h"
> #include "exec/cpu_ldst.h"
> #include "translate-all.h"
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 7f4e3cd627..770c2b267a 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -33,7 +33,7 @@
> #include "qemu/module.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/timer.h"
> #include "qemu/envlist.h"
> #include "exec/log.h"
> diff --git a/cpus.c b/cpus.c
> index b472378b70..18f56572fa 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -53,7 +53,7 @@
> #include "qemu/bitmap.h"
> #include "qemu/seqlock.h"
> #include "qemu/guest-random.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "hw/nmi.h"
> #include "sysemu/replay.h"
> #include "sysemu/runstate.h"
> diff --git a/exec.c b/exec.c
> index d4b769d0d4..0f6b087f57 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -25,7 +25,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "exec/target_page.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "hw/qdev-core.h"
> #include "hw/qdev-properties.h"
> #if !defined(CONFIG_USER_ONLY)
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 8718d03ee2..fba833aac9 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -37,7 +37,7 @@
> #include "qemu/plugin.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "qemu/timer.h"
> #include "qemu/envlist.h"
> #include "qemu/guest-random.h"
> diff --git a/target/alpha/translate.c b/target/alpha/translate.c
> index f7f1ed0f41..8870284f57 100644
> --- a/target/alpha/translate.c
> +++ b/target/alpha/translate.c
> @@ -23,7 +23,7 @@
> #include "disas/disas.h"
> #include "qemu/host-utils.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
> index b4cd680fc4..36aa6badfd 100644
> --- a/target/arm/helper-a64.c
> +++ b/target/arm/helper-a64.c
> @@ -31,7 +31,7 @@
> #include "exec/cpu_ldst.h"
> #include "qemu/int128.h"
> #include "qemu/atomic128.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "fpu/softfloat.h"
> #include <zlib.h> /* For crc32 */
>
> diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
> index d4bebbe629..a1d4dce4fa 100644
> --- a/target/arm/translate-a64.c
> +++ b/target/arm/translate-a64.c
> @@ -20,8 +20,8 @@
>
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "arm_ldst.h"
> #include "translate.h"
> diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
> index 5d7edd0907..b35bad245e 100644
> --- a/target/arm/translate-sve.c
> +++ b/target/arm/translate-sve.c
> @@ -20,9 +20,9 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> +#include "tcg/tcg-gvec-desc.h"
> #include "qemu/log.h"
> #include "arm_ldst.h"
> #include "translate.h"
> diff --git a/target/arm/translate.c b/target/arm/translate.c
> index 2b6c1f91bf..39821d040b 100644
> --- a/target/arm/translate.c
> +++ b/target/arm/translate.c
> @@ -24,8 +24,8 @@
> #include "internals.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "qemu/bitops.h"
> #include "arm_ldst.h"
> diff --git a/target/cris/translate.c b/target/cris/translate.c
> index cb57516a44..aaa46b5bca 100644
> --- a/target/cris/translate.c
> +++ b/target/cris/translate.c
> @@ -27,7 +27,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/helper-proto.h"
> #include "mmu.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/hppa/translate.c b/target/hppa/translate.c
> index 2f8d407a82..f25927aeca 100644
> --- a/target/hppa/translate.c
> +++ b/target/hppa/translate.c
> @@ -22,7 +22,7 @@
> #include "disas/disas.h"
> #include "qemu/host-utils.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c
> index d50d4b0c40..acf41f8885 100644
> --- a/target/i386/mem_helper.c
> +++ b/target/i386/mem_helper.c
> @@ -24,7 +24,7 @@
> #include "exec/cpu_ldst.h"
> #include "qemu/int128.h"
> #include "qemu/atomic128.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
>
> void helper_cmpxchg8b_unlocked(CPUX86State *env, target_ulong a0)
> {
> diff --git a/target/i386/translate.c b/target/i386/translate.c
> index 7c99ef1385..d9af8f4078 100644
> --- a/target/i386/translate.c
> +++ b/target/i386/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/translator.h"
>
> diff --git a/target/lm32/translate.c b/target/lm32/translate.c
> index 73db9654d6..e583d52d03 100644
> --- a/target/lm32/translate.c
> +++ b/target/lm32/translate.c
> @@ -23,7 +23,7 @@
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> #include "exec/translator.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/qemu-print.h"
>
> #include "exec/cpu_ldst.h"
> diff --git a/target/m68k/translate.c b/target/m68k/translate.c
> index fcdb7bc8e4..31b743717e 100644
> --- a/target/m68k/translate.c
> +++ b/target/m68k/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/qemu-print.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
> index 525115b041..37a844db99 100644
> --- a/target/microblaze/translate.c
> +++ b/target/microblaze/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/helper-proto.h"
> #include "microblaze-decode.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/mips/translate.c b/target/mips/translate.c
> index 4bff585bd6..efe75e6be0 100644
> --- a/target/mips/translate.c
> +++ b/target/mips/translate.c
> @@ -26,7 +26,7 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "hw/mips/cpudevs.h"
>
> diff --git a/target/moxie/translate.c b/target/moxie/translate.c
> index c87e9ec2b1..d5fb27dfb8 100644
> --- a/target/moxie/translate.c
> +++ b/target/moxie/translate.c
> @@ -26,7 +26,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "qemu/qemu-print.h"
>
> diff --git a/target/nios2/translate.c b/target/nios2/translate.c
> index 82107bf270..6c34cd3193 100644
> --- a/target/nios2/translate.c
> +++ b/target/nios2/translate.c
> @@ -23,7 +23,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> #include "exec/helper-proto.h"
> diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
> index 8dd28d6cf1..52323a16df 100644
> --- a/target/openrisc/translate.c
> +++ b/target/openrisc/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/bitops.h"
> #include "qemu/qemu-print.h"
> diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
> index 1351b53f28..7404b14bed 100644
> --- a/target/ppc/mem_helper.c
> +++ b/target/ppc/mem_helper.c
> @@ -25,7 +25,7 @@
> #include "exec/helper-proto.h"
> #include "helper_regs.h"
> #include "exec/cpu_ldst.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "internal.h"
> #include "qemu/atomic128.h"
>
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index f5fe5d0611..9dcf8dc261 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -23,8 +23,8 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/host-utils.h"
> #include "qemu/main-loop.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
> index 767c8762ac..85403da9c8 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -22,7 +22,7 @@
> #include "qemu/main-loop.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "trace.h"
>
> int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index ab6a891dc3..56b1b1fe7b 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -19,7 +19,7 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "cpu.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "disas/disas.h"
> #include "exec/cpu_ldst.h"
> #include "exec/exec-all.h"
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 4292bb0dd0..b764ec3140 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -33,8 +33,8 @@
> #include "internal.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/log.h"
> #include "qemu/host-utils.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/sh4/translate.c b/target/sh4/translate.c
> index 922785e225..6192d83e8c 100644
> --- a/target/sh4/translate.c
> +++ b/target/sh4/translate.c
> @@ -23,7 +23,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> #include "exec/helper-gen.h"
> diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
> index 7345827a96..e91cfdecd3 100644
> --- a/target/sparc/ldst_helper.c
> +++ b/target/sparc/ldst_helper.c
> @@ -19,7 +19,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg.h"
> +#include "tcg/tcg.h"
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> #include "exec/cpu_ldst.h"
> diff --git a/target/sparc/translate.c b/target/sparc/translate.c
> index edc23a7c40..9416a551cf 100644
> --- a/target/sparc/translate.c
> +++ b/target/sparc/translate.c
> @@ -24,7 +24,7 @@
> #include "disas/disas.h"
> #include "exec/helper-proto.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
>
> #include "exec/helper-gen.h"
> diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c
> index abce7e1c75..65f1c91f4f 100644
> --- a/target/tilegx/translate.c
> +++ b/target/tilegx/translate.c
> @@ -24,7 +24,7 @@
> #include "exec/log.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "linux-user/syscall_defs.h"
>
> diff --git a/target/tricore/translate.c b/target/tricore/translate.c
> index c574638c9f..609d75ae8a 100644
> --- a/target/tricore/translate.c
> +++ b/target/tricore/translate.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "exec/cpu_ldst.h"
> #include "qemu/qemu-print.h"
>
> diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c
> index 0f6891b8aa..d4b06df672 100644
> --- a/target/unicore32/translate.c
> +++ b/target/unicore32/translate.c
> @@ -13,7 +13,7 @@
> #include "cpu.h"
> #include "disas/disas.h"
> #include "exec/exec-all.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "exec/cpu_ldst.h"
> #include "exec/translator.h"
> diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
> index a99f5296e2..f5510ef043 100644
> --- a/target/xtensa/translate.c
> +++ b/target/xtensa/translate.c
> @@ -33,7 +33,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "disas/disas.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
> #include "qemu/log.h"
> #include "qemu/qemu-print.h"
> #include "exec/cpu_ldst.h"
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index f7f4e873c9..53aa8e5329 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -24,7 +24,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> #define CASE_OP_32_64(x) \
> glue(glue(case INDEX_op_, x), _i32): \
> diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
> index 97305a3efc..7e1992e79e 100644
> --- a/tcg/tcg-common.c
> +++ b/tcg/tcg-common.c
> @@ -32,7 +32,7 @@ uintptr_t tci_tb_ptr;
> TCGOpDef tcg_op_defs[] = {
> #define DEF(s, oargs, iargs, cargs, flags) \
> { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags },
> -#include "tcg-opc.h"
> +#include "tcg/tcg-opc.h"
> #undef DEF
> };
> const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
> diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c
> index 5c95ecd51c..41b4a3c661 100644
> --- a/tcg/tcg-op-gvec.c
> +++ b/tcg/tcg-op-gvec.c
> @@ -18,11 +18,11 @@
> */
>
> #include "qemu/osdep.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-op-gvec.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-op-gvec.h"
> #include "qemu/main-loop.h"
> -#include "tcg-gvec-desc.h"
> +#include "tcg/tcg-gvec-desc.h"
>
> #define MAX_UNROLL 4
>
> diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
> index 6714991bf4..b6937e8d64 100644
> --- a/tcg/tcg-op-vec.c
> +++ b/tcg/tcg-op-vec.c
> @@ -19,9 +19,9 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-mo.h"
>
> /* Reduce the number of ifdefs below. This assumes that all uses of
> TCGV_HIGH and TCGV_LOW are properly protected by a conditional that
> diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
> index c245126f98..7d782002e3 100644
> --- a/tcg/tcg-op.c
> +++ b/tcg/tcg-op.c
> @@ -25,9 +25,9 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/exec-all.h"
> -#include "tcg.h"
> -#include "tcg-op.h"
> -#include "tcg-mo.h"
> +#include "tcg/tcg.h"
> +#include "tcg/tcg-op.h"
> +#include "tcg/tcg-mo.h"
> #include "trace-tcg.h"
> #include "trace/mem.h"
> #include "exec/plugin-gen.h"
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 4f616ba38b..dd4b3d7684 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -48,7 +48,7 @@
> #include "hw/boards.h"
> #endif
>
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> #if UINTPTR_MAX == UINT32_MAX
> # define ELF_CLASS ELFCLASS32
> diff --git a/tcg/tci.c b/tcg/tci.c
> index a6208653e8..46fe9ce63f 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -30,7 +30,7 @@
> #include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> -#include "tcg-op.h"
> +#include "tcg/tcg-op.h"
>
> /* Marker for missing code. */
> #define TODO() \
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 2/4] tcg: Search includes in the parent source directory
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
2020-01-01 11:23 ` [PATCH v2 1/4] tcg: Search includes from the project root source directory Philippe Mathieu-Daudé
@ 2020-01-01 11:23 ` Philippe Mathieu-Daudé
2020-01-02 1:44 ` David Gibson
` (2 more replies)
2020-01-01 11:23 ` [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/ Philippe Mathieu-Daudé
` (4 subsequent siblings)
6 siblings, 3 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-01 11:23 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier,
Philippe Mathieu-Daudé, Michael Walle, qemu-ppc,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c
are in tcg/, their parent directory. To simplify the preprocessor
search path, include the relative parent path: '..'.
Patch created mechanically by running:
$ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \
sed -i "s,#include \"$x\",#include \"../$x\"," \
$(git grep -l "#include \"$x\""); \
done
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tcg/aarch64/tcg-target.inc.c | 4 ++--
tcg/arm/tcg-target.inc.c | 4 ++--
tcg/i386/tcg-target.inc.c | 4 ++--
tcg/mips/tcg-target.inc.c | 2 +-
tcg/ppc/tcg-target.inc.c | 4 ++--
tcg/riscv/tcg-target.inc.c | 4 ++--
tcg/s390/tcg-target.inc.c | 4 ++--
tcg/sparc/tcg-target.inc.c | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c
index 3f921015d3..843fd0ca69 100644
--- a/tcg/aarch64/tcg-target.inc.c
+++ b/tcg/aarch64/tcg-target.inc.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory for details.
*/
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#include "qemu/bitops.h"
/* We're going to re-use TCGType in setting of the SF bit, which controls
@@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d,
}
#ifdef CONFIG_SOFTMMU
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* TCGMemOpIdx oi, uintptr_t ra)
diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
index 94d80d79d1..fffb6611e2 100644
--- a/tcg/arm/tcg-target.inc.c
+++ b/tcg/arm/tcg-target.inc.c
@@ -23,7 +23,7 @@
*/
#include "elf.h"
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
int arm_arch = __ARM_ARCH;
@@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args,
}
#ifdef CONFIG_SOFTMMU
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index 9d8ed974e0..cdedcb2b25 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
@@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n)
}
#if defined(CONFIG_SOFTMMU)
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
index 5442167045..1da663ce84 100644
--- a/tcg/mips/tcg-target.inc.c
+++ b/tcg/mips/tcg-target.inc.c
@@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
}
#if defined(CONFIG_SOFTMMU)
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
static void * const qemu_ld_helpers[16] = {
[MO_UB] = helper_ret_ldub_mmu,
diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
index d308d69aba..ee1f9227c1 100644
--- a/tcg/ppc/tcg-target.inc.c
+++ b/tcg/ppc/tcg-target.inc.c
@@ -23,7 +23,7 @@
*/
#include "elf.h"
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#if defined _CALL_DARWIN || defined __APPLE__
#define TCG_TARGET_CALL_DARWIN
@@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] = {
};
#if defined (CONFIG_SOFTMMU)
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
* int mmu_idx, uintptr_t ra)
diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c
index 7018509693..2bc0ba71f2 100644
--- a/tcg/riscv/tcg-target.inc.c
+++ b/tcg/riscv/tcg-target.inc.c
@@ -27,7 +27,7 @@
* THE SOFTWARE.
*/
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
@@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
*/
#if defined(CONFIG_SOFTMMU)
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* TCGMemOpIdx oi, uintptr_t ra)
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index 8aaa4cebe8..b07e9ff7d6 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -29,7 +29,7 @@
#error "unsupported code generation mode"
#endif
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#include "elf.h"
/* ??? The translation blocks produced by TCG are generally small enough to
@@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
}
#if defined(CONFIG_SOFTMMU)
-#include "tcg-ldst.inc.c"
+#include "../tcg-ldst.inc.c"
/* We're expecting to use a 20-bit negative offset on the tlb memory ops. */
QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0);
diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c
index d7986cda5c..65fddb310d 100644
--- a/tcg/sparc/tcg-target.inc.c
+++ b/tcg/sparc/tcg-target.inc.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "tcg-pool.inc.c"
+#include "../tcg-pool.inc.c"
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
2020-01-01 11:23 ` [PATCH v2 2/4] tcg: Search includes in the parent " Philippe Mathieu-Daudé
@ 2020-01-02 1:44 ` David Gibson
2020-01-03 2:41 ` Alistair Francis
2020-01-07 10:54 ` Paolo Bonzini
2 siblings, 0 replies; 15+ messages in thread
From: David Gibson @ 2020-01-02 1:44 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel, Max Filippov,
Alistair Francis, Edgar E. Iglesias, Guan Xuetao, Marek Vasut,
Palmer Dabbelt, Aleksandar Rikalo, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, Richard Henderson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier, Michael Walle,
qemu-ppc, Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
[-- Attachment #1: Type: text/plain, Size: 6520 bytes --]
On Wed, Jan 01, 2020 at 12:23:01PM +0100, Philippe Mathieu-Daudé wrote:
> All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c
> are in tcg/, their parent directory. To simplify the preprocessor
> search path, include the relative parent path: '..'.
>
> Patch created mechanically by running:
>
> $ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \
> sed -i "s,#include \"$x\",#include \"../$x\"," \
> $(git grep -l "#include \"$x\""); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
ppc parts
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> tcg/aarch64/tcg-target.inc.c | 4 ++--
> tcg/arm/tcg-target.inc.c | 4 ++--
> tcg/i386/tcg-target.inc.c | 4 ++--
> tcg/mips/tcg-target.inc.c | 2 +-
> tcg/ppc/tcg-target.inc.c | 4 ++--
> tcg/riscv/tcg-target.inc.c | 4 ++--
> tcg/s390/tcg-target.inc.c | 4 ++--
> tcg/sparc/tcg-target.inc.c | 2 +-
> 8 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c
> index 3f921015d3..843fd0ca69 100644
> --- a/tcg/aarch64/tcg-target.inc.c
> +++ b/tcg/aarch64/tcg-target.inc.c
> @@ -10,7 +10,7 @@
> * See the COPYING file in the top-level directory for details.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "qemu/bitops.h"
>
> /* We're going to re-use TCGType in setting of the SF bit, which controls
> @@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
> index 94d80d79d1..fffb6611e2 100644
> --- a/tcg/arm/tcg-target.inc.c
> +++ b/tcg/arm/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> int arm_arch = __ARM_ARCH;
>
> @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
> index 9d8ed974e0..cdedcb2b25 100644
> --- a/tcg/i386/tcg-target.inc.c
> +++ b/tcg/i386/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
> index 5442167045..1da663ce84 100644
> --- a/tcg/mips/tcg-target.inc.c
> +++ b/tcg/mips/tcg-target.inc.c
> @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> static void * const qemu_ld_helpers[16] = {
> [MO_UB] = helper_ret_ldub_mmu,
> diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
> index d308d69aba..ee1f9227c1 100644
> --- a/tcg/ppc/tcg-target.inc.c
> +++ b/tcg/ppc/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #if defined _CALL_DARWIN || defined __APPLE__
> #define TCG_TARGET_CALL_DARWIN
> @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] = {
> };
>
> #if defined (CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c
> index 7018509693..2bc0ba71f2 100644
> --- a/tcg/riscv/tcg-target.inc.c
> +++ b/tcg/riscv/tcg-target.inc.c
> @@ -27,7 +27,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
> */
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
> index 8aaa4cebe8..b07e9ff7d6 100644
> --- a/tcg/s390/tcg-target.inc.c
> +++ b/tcg/s390/tcg-target.inc.c
> @@ -29,7 +29,7 @@
> #error "unsupported code generation mode"
> #endif
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "elf.h"
>
> /* ??? The translation blocks produced by TCG are generally small enough to
> @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* We're expecting to use a 20-bit negative offset on the tlb memory ops. */
> QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0);
> diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c
> index d7986cda5c..65fddb310d 100644
> --- a/tcg/sparc/tcg-target.inc.c
> +++ b/tcg/sparc/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
2020-01-01 11:23 ` [PATCH v2 2/4] tcg: Search includes in the parent " Philippe Mathieu-Daudé
2020-01-02 1:44 ` David Gibson
@ 2020-01-03 2:41 ` Alistair Francis
2020-01-07 10:54 ` Paolo Bonzini
2 siblings, 0 replies; 15+ messages in thread
From: Alistair Francis @ 2020-01-03 2:41 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Cornelia Huck, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel@nongnu.org Developers,
Max Filippov, Alistair Francis, Edgar E. Iglesias, Guan Xuetao,
Marek Vasut, open list:New World, Aleksandar Rikalo, David Gibson,
Artyom Tarasenko, Eduardo Habkost, Stefan Weil, Riku Voipio,
qemu-s390x, qemu-arm, Stafford Horne, Richard Henderson,
open list:RISC-V, Bastian Koppelmann, Chris Wulff,
Claudio Fontana, Laurent Vivier, Michael Walle, Palmer Dabbelt,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
On Wed, Jan 1, 2020 at 3:24 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c
> are in tcg/, their parent directory. To simplify the preprocessor
> search path, include the relative parent path: '..'.
>
> Patch created mechanically by running:
>
> $ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \
> sed -i "s,#include \"$x\",#include \"../$x\"," \
> $(git grep -l "#include \"$x\""); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> tcg/aarch64/tcg-target.inc.c | 4 ++--
> tcg/arm/tcg-target.inc.c | 4 ++--
> tcg/i386/tcg-target.inc.c | 4 ++--
> tcg/mips/tcg-target.inc.c | 2 +-
> tcg/ppc/tcg-target.inc.c | 4 ++--
> tcg/riscv/tcg-target.inc.c | 4 ++--
> tcg/s390/tcg-target.inc.c | 4 ++--
> tcg/sparc/tcg-target.inc.c | 2 +-
> 8 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c
> index 3f921015d3..843fd0ca69 100644
> --- a/tcg/aarch64/tcg-target.inc.c
> +++ b/tcg/aarch64/tcg-target.inc.c
> @@ -10,7 +10,7 @@
> * See the COPYING file in the top-level directory for details.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "qemu/bitops.h"
>
> /* We're going to re-use TCGType in setting of the SF bit, which controls
> @@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
> index 94d80d79d1..fffb6611e2 100644
> --- a/tcg/arm/tcg-target.inc.c
> +++ b/tcg/arm/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> int arm_arch = __ARM_ARCH;
>
> @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
> index 9d8ed974e0..cdedcb2b25 100644
> --- a/tcg/i386/tcg-target.inc.c
> +++ b/tcg/i386/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
> index 5442167045..1da663ce84 100644
> --- a/tcg/mips/tcg-target.inc.c
> +++ b/tcg/mips/tcg-target.inc.c
> @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> static void * const qemu_ld_helpers[16] = {
> [MO_UB] = helper_ret_ldub_mmu,
> diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
> index d308d69aba..ee1f9227c1 100644
> --- a/tcg/ppc/tcg-target.inc.c
> +++ b/tcg/ppc/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #if defined _CALL_DARWIN || defined __APPLE__
> #define TCG_TARGET_CALL_DARWIN
> @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] = {
> };
>
> #if defined (CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c
> index 7018509693..2bc0ba71f2 100644
> --- a/tcg/riscv/tcg-target.inc.c
> +++ b/tcg/riscv/tcg-target.inc.c
> @@ -27,7 +27,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
> */
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
> index 8aaa4cebe8..b07e9ff7d6 100644
> --- a/tcg/s390/tcg-target.inc.c
> +++ b/tcg/s390/tcg-target.inc.c
> @@ -29,7 +29,7 @@
> #error "unsupported code generation mode"
> #endif
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "elf.h"
>
> /* ??? The translation blocks produced by TCG are generally small enough to
> @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* We're expecting to use a 20-bit negative offset on the tlb memory ops. */
> QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0);
> diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c
> index d7986cda5c..65fddb310d 100644
> --- a/tcg/sparc/tcg-target.inc.c
> +++ b/tcg/sparc/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
2020-01-01 11:23 ` [PATCH v2 2/4] tcg: Search includes in the parent " Philippe Mathieu-Daudé
2020-01-02 1:44 ` David Gibson
2020-01-03 2:41 ` Alistair Francis
@ 2020-01-07 10:54 ` Paolo Bonzini
2 siblings, 0 replies; 15+ messages in thread
From: Paolo Bonzini @ 2020-01-07 10:54 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier, Michael Walle,
qemu-ppc, Aleksandar Markovic, Aurelien Jarno
On 01/01/20 12:23, Philippe Mathieu-Daudé wrote:
> All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c
> are in tcg/, their parent directory. To simplify the preprocessor
> search path, include the relative parent path: '..'.
>
> Patch created mechanically by running:
>
> $ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \
> sed -i "s,#include \"$x\",#include \"../$x\"," \
> $(git grep -l "#include \"$x\""); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Another possibility is to move the .inc.c files to include/tcg (probably
renaming them to .inc.h in the meanwhile) but this is good too.
Paolo
> ---
> tcg/aarch64/tcg-target.inc.c | 4 ++--
> tcg/arm/tcg-target.inc.c | 4 ++--
> tcg/i386/tcg-target.inc.c | 4 ++--
> tcg/mips/tcg-target.inc.c | 2 +-
> tcg/ppc/tcg-target.inc.c | 4 ++--
> tcg/riscv/tcg-target.inc.c | 4 ++--
> tcg/s390/tcg-target.inc.c | 4 ++--
> tcg/sparc/tcg-target.inc.c | 2 +-
> 8 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c
> index 3f921015d3..843fd0ca69 100644
> --- a/tcg/aarch64/tcg-target.inc.c
> +++ b/tcg/aarch64/tcg-target.inc.c
> @@ -10,7 +10,7 @@
> * See the COPYING file in the top-level directory for details.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "qemu/bitops.h"
>
> /* We're going to re-use TCGType in setting of the SF bit, which controls
> @@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c
> index 94d80d79d1..fffb6611e2 100644
> --- a/tcg/arm/tcg-target.inc.c
> +++ b/tcg/arm/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> int arm_arch = __ARM_ARCH;
>
> @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args,
> }
>
> #ifdef CONFIG_SOFTMMU
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
> index 9d8ed974e0..cdedcb2b25 100644
> --- a/tcg/i386/tcg-target.inc.c
> +++ b/tcg/i386/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
> index 5442167045..1da663ce84 100644
> --- a/tcg/mips/tcg-target.inc.c
> +++ b/tcg/mips/tcg-target.inc.c
> @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> static void * const qemu_ld_helpers[16] = {
> [MO_UB] = helper_ret_ldub_mmu,
> diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
> index d308d69aba..ee1f9227c1 100644
> --- a/tcg/ppc/tcg-target.inc.c
> +++ b/tcg/ppc/tcg-target.inc.c
> @@ -23,7 +23,7 @@
> */
>
> #include "elf.h"
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #if defined _CALL_DARWIN || defined __APPLE__
> #define TCG_TARGET_CALL_DARWIN
> @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] = {
> };
>
> #if defined (CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
> * int mmu_idx, uintptr_t ra)
> diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c
> index 7018509693..2bc0ba71f2 100644
> --- a/tcg/riscv/tcg-target.inc.c
> +++ b/tcg/riscv/tcg-target.inc.c
> @@ -27,7 +27,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> @@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
> */
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
> * TCGMemOpIdx oi, uintptr_t ra)
> diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
> index 8aaa4cebe8..b07e9ff7d6 100644
> --- a/tcg/s390/tcg-target.inc.c
> +++ b/tcg/s390/tcg-target.inc.c
> @@ -29,7 +29,7 @@
> #error "unsupported code generation mode"
> #endif
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
> #include "elf.h"
>
> /* ??? The translation blocks produced by TCG are generally small enough to
> @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
> }
>
> #if defined(CONFIG_SOFTMMU)
> -#include "tcg-ldst.inc.c"
> +#include "../tcg-ldst.inc.c"
>
> /* We're expecting to use a 20-bit negative offset on the tlb memory ops. */
> QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0);
> diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c
> index d7986cda5c..65fddb310d 100644
> --- a/tcg/sparc/tcg-target.inc.c
> +++ b/tcg/sparc/tcg-target.inc.c
> @@ -22,7 +22,7 @@
> * THE SOFTWARE.
> */
>
> -#include "tcg-pool.inc.c"
> +#include "../tcg-pool.inc.c"
>
> #ifdef CONFIG_DEBUG_TCG
> static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
2020-01-01 11:23 ` [PATCH v2 1/4] tcg: Search includes from the project root source directory Philippe Mathieu-Daudé
2020-01-01 11:23 ` [PATCH v2 2/4] tcg: Search includes in the parent " Philippe Mathieu-Daudé
@ 2020-01-01 11:23 ` Philippe Mathieu-Daudé
2020-01-03 2:42 ` Alistair Francis
2020-01-01 11:23 ` [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list Philippe Mathieu-Daudé
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-01 11:23 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier,
Philippe Mathieu-Daudé, Michael Walle, qemu-ppc,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
{tcg => include/tcg}/tcg-gvec-desc.h | 0
{tcg => include/tcg}/tcg-mo.h | 0
{tcg => include/tcg}/tcg-op-gvec.h | 0
{tcg => include/tcg}/tcg-op.h | 0
{tcg => include/tcg}/tcg-opc.h | 0
{tcg => include/tcg}/tcg.h | 0
MAINTAINERS | 1 +
7 files changed, 1 insertion(+)
rename {tcg => include/tcg}/tcg-gvec-desc.h (100%)
rename {tcg => include/tcg}/tcg-mo.h (100%)
rename {tcg => include/tcg}/tcg-op-gvec.h (100%)
rename {tcg => include/tcg}/tcg-op.h (100%)
rename {tcg => include/tcg}/tcg-opc.h (100%)
rename {tcg => include/tcg}/tcg.h (100%)
diff --git a/tcg/tcg-gvec-desc.h b/include/tcg/tcg-gvec-desc.h
similarity index 100%
rename from tcg/tcg-gvec-desc.h
rename to include/tcg/tcg-gvec-desc.h
diff --git a/tcg/tcg-mo.h b/include/tcg/tcg-mo.h
similarity index 100%
rename from tcg/tcg-mo.h
rename to include/tcg/tcg-mo.h
diff --git a/tcg/tcg-op-gvec.h b/include/tcg/tcg-op-gvec.h
similarity index 100%
rename from tcg/tcg-op-gvec.h
rename to include/tcg/tcg-op-gvec.h
diff --git a/tcg/tcg-op.h b/include/tcg/tcg-op.h
similarity index 100%
rename from tcg/tcg-op.h
rename to include/tcg/tcg-op.h
diff --git a/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
similarity index 100%
rename from tcg/tcg-opc.h
rename to include/tcg/tcg-opc.h
diff --git a/tcg/tcg.h b/include/tcg/tcg.h
similarity index 100%
rename from tcg/tcg.h
rename to include/tcg/tcg.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 387879aebc..02e1490895 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2374,6 +2374,7 @@ Common TCG code
M: Richard Henderson <rth@twiddle.net>
S: Maintained
F: tcg/
+F: include/tcg/
TCG Plugins
M: Alex Bennée <alex.bennee@linaro.org>
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/
2020-01-01 11:23 ` [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/ Philippe Mathieu-Daudé
@ 2020-01-03 2:42 ` Alistair Francis
0 siblings, 0 replies; 15+ messages in thread
From: Alistair Francis @ 2020-01-03 2:42 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Cornelia Huck, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel@nongnu.org Developers,
Max Filippov, Alistair Francis, Edgar E. Iglesias, Guan Xuetao,
Marek Vasut, open list:New World, Aleksandar Rikalo, David Gibson,
Artyom Tarasenko, Eduardo Habkost, Stefan Weil, Riku Voipio,
qemu-s390x, qemu-arm, Stafford Horne, Richard Henderson,
open list:RISC-V, Bastian Koppelmann, Chris Wulff,
Claudio Fontana, Laurent Vivier, Michael Walle, Palmer Dabbelt,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
On Wed, Jan 1, 2020 at 3:27 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> {tcg => include/tcg}/tcg-gvec-desc.h | 0
> {tcg => include/tcg}/tcg-mo.h | 0
> {tcg => include/tcg}/tcg-op-gvec.h | 0
> {tcg => include/tcg}/tcg-op.h | 0
> {tcg => include/tcg}/tcg-opc.h | 0
> {tcg => include/tcg}/tcg.h | 0
> MAINTAINERS | 1 +
> 7 files changed, 1 insertion(+)
> rename {tcg => include/tcg}/tcg-gvec-desc.h (100%)
> rename {tcg => include/tcg}/tcg-mo.h (100%)
> rename {tcg => include/tcg}/tcg-op-gvec.h (100%)
> rename {tcg => include/tcg}/tcg-op.h (100%)
> rename {tcg => include/tcg}/tcg-opc.h (100%)
> rename {tcg => include/tcg}/tcg.h (100%)
>
> diff --git a/tcg/tcg-gvec-desc.h b/include/tcg/tcg-gvec-desc.h
> similarity index 100%
> rename from tcg/tcg-gvec-desc.h
> rename to include/tcg/tcg-gvec-desc.h
> diff --git a/tcg/tcg-mo.h b/include/tcg/tcg-mo.h
> similarity index 100%
> rename from tcg/tcg-mo.h
> rename to include/tcg/tcg-mo.h
> diff --git a/tcg/tcg-op-gvec.h b/include/tcg/tcg-op-gvec.h
> similarity index 100%
> rename from tcg/tcg-op-gvec.h
> rename to include/tcg/tcg-op-gvec.h
> diff --git a/tcg/tcg-op.h b/include/tcg/tcg-op.h
> similarity index 100%
> rename from tcg/tcg-op.h
> rename to include/tcg/tcg-op.h
> diff --git a/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
> similarity index 100%
> rename from tcg/tcg-opc.h
> rename to include/tcg/tcg-opc.h
> diff --git a/tcg/tcg.h b/include/tcg/tcg.h
> similarity index 100%
> rename from tcg/tcg.h
> rename to include/tcg/tcg.h
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 387879aebc..02e1490895 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2374,6 +2374,7 @@ Common TCG code
> M: Richard Henderson <rth@twiddle.net>
> S: Maintained
> F: tcg/
> +F: include/tcg/
>
> TCG Plugins
> M: Alex Bennée <alex.bennee@linaro.org>
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-01-01 11:23 ` [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/ Philippe Mathieu-Daudé
@ 2020-01-01 11:23 ` Philippe Mathieu-Daudé
2020-01-03 2:42 ` Alistair Francis
2020-01-02 8:46 ` [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Stefan Weil
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-01 11:23 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier,
Philippe Mathieu-Daudé, Michael Walle, qemu-ppc,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
All tcg includes are relative to the repository root directory,
we can safely remove the tcg/ directory from the include search
path list.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure b/configure
index 940bf9e87a..74dad08580 100755
--- a/configure
+++ b/configure
@@ -7436,7 +7436,6 @@ elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then
else
QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
-QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg $QEMU_INCLUDES"
echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list
2020-01-01 11:23 ` [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list Philippe Mathieu-Daudé
@ 2020-01-03 2:42 ` Alistair Francis
0 siblings, 0 replies; 15+ messages in thread
From: Alistair Francis @ 2020-01-03 2:42 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Cornelia Huck, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, qemu-devel@nongnu.org Developers,
Max Filippov, Alistair Francis, Edgar E. Iglesias, Guan Xuetao,
Marek Vasut, open list:New World, Aleksandar Rikalo, David Gibson,
Artyom Tarasenko, Eduardo Habkost, Stefan Weil, Riku Voipio,
qemu-s390x, qemu-arm, Stafford Horne, Richard Henderson,
open list:RISC-V, Bastian Koppelmann, Chris Wulff,
Claudio Fontana, Laurent Vivier, Michael Walle, Palmer Dabbelt,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
On Wed, Jan 1, 2020 at 3:25 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> All tcg includes are relative to the repository root directory,
> we can safely remove the tcg/ directory from the include search
> path list.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> configure | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/configure b/configure
> index 940bf9e87a..74dad08580 100755
> --- a/configure
> +++ b/configure
> @@ -7436,7 +7436,6 @@ elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then
> else
> QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
> fi
> -QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg $QEMU_INCLUDES"
>
> echo "TOOLS=$tools" >> $config_host_mak
> echo "ROMS=$roms" >> $config_host_mak
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2020-01-01 11:23 ` [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list Philippe Mathieu-Daudé
@ 2020-01-02 8:46 ` Stefan Weil
2020-01-03 1:19 ` Richard Henderson
2020-01-07 10:55 ` Paolo Bonzini
6 siblings, 0 replies; 15+ messages in thread
From: Stefan Weil @ 2020-01-02 8:46 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Cornelia Huck, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, qemu-ppc,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Chris Wulff, Claudio Fontana, Laurent Vivier, Michael Walle,
Palmer Dabbelt, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
[-- Attachment #1.1: Type: text/plain, Size: 4053 bytes --]
Am 01.01.20 um 12:22 schrieb Philippe Mathieu-Daudé:
> Noticed we could clean this while reviewing Richard patch last night:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg667606.html
>
> Since v1:
> - moved headers to include/tcg/ (Paolo)
> - include in .inc.c relative to parent (Stefan)
>
> v1: https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg05356.html
>
> Philippe Mathieu-Daudé (4):
> tcg: Search includes from the project root source directory
> tcg: Search includes in the parent source directory
> tcg: Move TCG headers to include/tcg/
> configure: Remove tcg/ from the preprocessor include search list
>
> configure | 1 -
> include/exec/cpu_ldst.h | 2 +-
> {tcg => include/tcg}/tcg-gvec-desc.h | 0
> {tcg => include/tcg}/tcg-mo.h | 0
> {tcg => include/tcg}/tcg-op-gvec.h | 0
> {tcg => include/tcg}/tcg-op.h | 2 +-
> {tcg => include/tcg}/tcg-opc.h | 0
> {tcg => include/tcg}/tcg.h | 4 ++--
> tcg/i386/tcg-target.h | 2 +-
> accel/tcg/cpu-exec.c | 2 +-
> accel/tcg/tcg-runtime-gvec.c | 2 +-
> accel/tcg/translate-all.c | 2 +-
> accel/tcg/user-exec.c | 2 +-
> bsd-user/main.c | 2 +-
> cpus.c | 2 +-
> exec.c | 2 +-
> linux-user/main.c | 2 +-
> target/alpha/translate.c | 2 +-
> target/arm/helper-a64.c | 2 +-
> target/arm/translate-a64.c | 4 ++--
> target/arm/translate-sve.c | 6 +++---
> target/arm/translate.c | 4 ++--
> target/cris/translate.c | 2 +-
> target/hppa/translate.c | 2 +-
> target/i386/mem_helper.c | 2 +-
> target/i386/translate.c | 2 +-
> target/lm32/translate.c | 2 +-
> target/m68k/translate.c | 2 +-
> target/microblaze/translate.c | 2 +-
> target/mips/translate.c | 2 +-
> target/moxie/translate.c | 2 +-
> target/nios2/translate.c | 2 +-
> target/openrisc/translate.c | 2 +-
> target/ppc/mem_helper.c | 2 +-
> target/ppc/translate.c | 4 ++--
> target/riscv/cpu_helper.c | 2 +-
> target/riscv/translate.c | 2 +-
> target/s390x/translate.c | 4 ++--
> target/sh4/translate.c | 2 +-
> target/sparc/ldst_helper.c | 2 +-
> target/sparc/translate.c | 2 +-
> target/tilegx/translate.c | 2 +-
> target/tricore/translate.c | 2 +-
> target/unicore32/translate.c | 2 +-
> target/xtensa/translate.c | 2 +-
> tcg/aarch64/tcg-target.inc.c | 4 ++--
> tcg/arm/tcg-target.inc.c | 4 ++--
> tcg/i386/tcg-target.inc.c | 4 ++--
> tcg/mips/tcg-target.inc.c | 2 +-
> tcg/optimize.c | 2 +-
> tcg/ppc/tcg-target.inc.c | 4 ++--
> tcg/riscv/tcg-target.inc.c | 4 ++--
> tcg/s390/tcg-target.inc.c | 4 ++--
> tcg/sparc/tcg-target.inc.c | 2 +-
> tcg/tcg-common.c | 2 +-
> tcg/tcg-op-gvec.c | 8 ++++----
> tcg/tcg-op-vec.c | 6 +++---
> tcg/tcg-op.c | 6 +++---
> tcg/tcg.c | 2 +-
> tcg/tci.c | 2 +-
> MAINTAINERS | 1 +
> 61 files changed, 76 insertions(+), 76 deletions(-)
> rename {tcg => include/tcg}/tcg-gvec-desc.h (100%)
> rename {tcg => include/tcg}/tcg-mo.h (100%)
> rename {tcg => include/tcg}/tcg-op-gvec.h (100%)
> rename {tcg => include/tcg}/tcg-op.h (99%)
> rename {tcg => include/tcg}/tcg-opc.h (100%)
> rename {tcg => include/tcg}/tcg.h (99%)
Thank you, Philippe and Paolo.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2020-01-02 8:46 ` [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Stefan Weil
@ 2020-01-03 1:19 ` Richard Henderson
2020-01-07 10:55 ` Paolo Bonzini
6 siblings, 0 replies; 15+ messages in thread
From: Richard Henderson @ 2020-01-03 1:19 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Artyom Tarasenko, Eduardo Habkost, Stefan Weil,
Riku Voipio, qemu-s390x, qemu-arm, Stafford Horne, David Gibson,
qemu-riscv, Bastian Koppelmann, Cornelia Huck, Claudio Fontana,
Laurent Vivier, Michael Walle, qemu-ppc, Aleksandar Markovic,
Paolo Bonzini, Aurelien Jarno
On 1/1/20 10:22 PM, Philippe Mathieu-Daudé wrote:
> Noticed we could clean this while reviewing Richard patch last night:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg667606.html
>
> Since v1:
> - moved headers to include/tcg/ (Paolo)
> - include in .inc.c relative to parent (Stefan)
>
> v1: https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg05356.html
>
> Philippe Mathieu-Daudé (4):
> tcg: Search includes from the project root source directory
> tcg: Search includes in the parent source directory
> tcg: Move TCG headers to include/tcg/
> configure: Remove tcg/ from the preprocessor include search list
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Will queue shortly.
r~
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list
2020-01-01 11:22 [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2020-01-03 1:19 ` Richard Henderson
@ 2020-01-07 10:55 ` Paolo Bonzini
6 siblings, 0 replies; 15+ messages in thread
From: Paolo Bonzini @ 2020-01-07 10:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Chris Wulff, Sagar Karandikar, David Hildenbrand,
Anthony Green, Mark Cave-Ayland, Max Filippov, Alistair Francis,
Edgar E. Iglesias, Guan Xuetao, Marek Vasut, Palmer Dabbelt,
Aleksandar Rikalo, Richard Henderson, Artyom Tarasenko,
Eduardo Habkost, Stefan Weil, Riku Voipio, qemu-s390x, qemu-arm,
Stafford Horne, David Gibson, qemu-riscv, Bastian Koppelmann,
Cornelia Huck, Claudio Fontana, Laurent Vivier, Michael Walle,
qemu-ppc, Aleksandar Markovic, Aurelien Jarno
On 01/01/20 12:22, Philippe Mathieu-Daudé wrote:
> Noticed we could clean this while reviewing Richard patch last night:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg667606.html
>
> Since v1:
> - moved headers to include/tcg/ (Paolo)
> - include in .inc.c relative to parent (Stefan)
>
> v1: https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg05356.html
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
but I'll let Richad pick it up.
Paolo
^ permalink raw reply [flat|nested] 15+ messages in thread