tcg: Search includes from the project root source directory

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

Acked-by: David Gibson <david@gibson.dropbear.id.au> (ppc parts)
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200101112303.20724-2-philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 62068d10c3c0f5d9188e9bbf601daaad12683cd7..2560c90eec79eea4892f99f171d714b74b50c315 100644 (file)
--- 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 51cb29ca791a560210f0c9b1f223b7662765c490..5b1902d5919b3342a831bd6ca4a3d529e2ea9a82 100644 (file)
--- 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/tcg-runtime.c b/accel/tcg/tcg-runtime.c
index 4ab2cf7f754f28c5d8ad69244cd408f5dfe97fb1..446465a09a46a366e5037a53f2fa3065a241278c 100644 (file)
--- a/accel/tcg/tcg-runtime.c
+++ b/accel/tcg/tcg-runtime.c
@@ -30,7 +30,7 @@
 #include "exec/tb-lookup.h"
 #include "disas/disas.h"
 #include "exec/log.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
 
 /* 32-bit helpers */
 

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index bb325a2bc44ec2354b00c3023a056715214dc06f..a08ab11f6572bf25046c147f2d5688802ff2ecc7 100644 (file)
--- 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 79da4219bb1c11a977410c493b8544d3f868c1c8..4be78eb9b384693600dc658fcd8953d5462e26f9 100644 (file)
--- 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 7f4e3cd6271a2bcbf613860aaede568c6d085b22..770c2b267ad652f161d30eb4ce5887108f25619f 100644 (file)
--- 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 be2d655f371c55b03bf88f0ca7ac0f0c0501c0a9..b612116f9584c4f7c69a04091476ff1a0464d645 100644 (file)
--- 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 d4b769d0d4619da1cb6917f6fcdc00723ab4dd9a..0f6b087f576c3ca476024d1795d1ceafa175c282 100644 (file)
--- 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/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 62f38d5a227d5722ebb634f23df4974674193bd2..a46116167cebbcf08f21571e90c9442221f2427b 100644 (file)
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -214,7 +214,7 @@ static inline void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr,
 #else
 
 /* Needed for TCG_OVERSIZED_GUEST */
-#include "tcg.h"
+#include "tcg/tcg.h"
 
 static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry)
 {

diff --git a/linux-user/main.c b/linux-user/main.c
index 8718d03ee21c33e0f4c282758fae6928d9b4a907..fba833aac91865e5646db6a8808fdd85972423f0 100644 (file)
--- 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/linux-user/syscall.c b/linux-user/syscall.c
index 34825f15bf3bab56afc9f23ee662859665498bb9..249e4b95fc9f0a24f0164a8302e1f212ee802f43 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -115,7 +115,7 @@
 #include "user/syscall-trace.h"
 #include "qapi/error.h"
 #include "fd-trans.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
 
 #ifndef CLONE_IO
 #define CLONE_IO                0x80000000      /* Clone io context */

diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index f7f1ed0f411800c494fa37b64cd781702489b727..8870284f5742fd4576e174fad1d5a734b061729e 100644 (file)
--- 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 b4cd680fc484d372828655243cb18b1957b90e7a..36aa6badfd93d6a93c29a715aac1186daef4ba1a 100644 (file)
--- 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/sve_helper.c b/target/arm/sve_helper.c
index 83cc7f5bb5caad8175ac7973acf5ead2a6a74153..fdfa652094627317560bb176c50456d1da595f49 100644 (file)
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -25,7 +25,7 @@
 #include "exec/helper-proto.h"
 #include "tcg/tcg-gvec-desc.h"
 #include "fpu/softfloat.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
 
 
 /* Note that vector data is stored in host-endian 64-bit chunks,

diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 8c18cdff8791abfb2eef5309d134c2fa5a62d5ee..96a5be2b372b6aeacdb4ad2cc2a245a37acd7550 100644 (file)
--- 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 5d7edd0907fea20e70d77487e902283d4e72cdf1..b35bad245ece83bd5bfa68cc7107ae8959b2d2ea 100644 (file)
--- 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 5185e08641be2219c907c9091f2168112077d8e4..0c8624fb42ecd83c0b487965c8b0ae9a7985a83b 100644 (file)
--- 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 cb57516a4453d76ab16dca71c45c0eb403bf54cc..aaa46b5bcaaecdacb81158ec87f42692d62217b7 100644 (file)
--- 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 2f8d407a82b7d41078ed23fb7c711b6256ac283f..f25927aecade86b7fa63a67a9c9aeade5a4c6de3 100644 (file)
--- 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 d50d4b0c40c0ff5ae5cf5865a90117f3594a420f..acf41f88857b6c60545b670ddf77b030f6ba6a18 100644 (file)
--- 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 7c99ef138546913a5d940713e4c4a089f649ae85..d9af8f4078b397c1d192d19edd29e2caa295bfcb 100644 (file)
--- 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 73db9654d666f8516cd00d0c7eac49e49cae9c77..e583d52d034a2ebccf1da9b233e5b6f049de08f5 100644 (file)
--- 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 fcdb7bc8e4eeabc2f3b0e336c064bfce634c6e30..31b743717ef55b56221430dbd769c8ab7fa534a6 100644 (file)
--- 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 525115b04136374c18963df8084eb8baf4384ff6..37a844db993fbac104450c7add92ea461b0b3b12 100644 (file)
--- 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 4bff585bd63ce1985b1ebb174cb59915871c1ffe..efe75e6be03709cfde431dc8b945fed6c2e8c175 100644 (file)
--- 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 c87e9ec2b15cff5478145f986215b4d678e5c89f..d5fb27dfb80d746264297b5cca7a1c23af91e9db 100644 (file)
--- 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 82107bf270f1c345e6364ed879e5f886a20c0a29..6c34cd31937650b190a7074a3f3a0ca06d802dbc 100644 (file)
--- 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 8dd28d6cf1705b2ce57d4050b544e82df28e4c54..52323a16df4efde063f68048ba2a9a2a10ce5430 100644 (file)
--- 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 56855f23814703720ef3727c67acc8164142d70a..e8e2a8ac2ac9695e6db33f94069d65777a86059e 100644 (file)
--- 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 f5fe5d06118a7c86d11f38767faba3c57195a09a..9dcf8dc2610a5924a7031e86380d24b95d4da243 100644 (file)
--- 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 767c8762ac42101773604910ce9fdc6e77ec743b..85403da9c83b330286fcc417b81392f45132a344 100644 (file)
--- 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 ab6a891dc381f286c7ea7667148b9e32f731ce65..56b1b1fe7bbcce9654fca134b5062cfdbf160451 100644 (file)
--- 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/mem_helper.c b/target/s390x/mem_helper.c
index 428bde4c54fbf67c5e14e3285a58d6a1778a53bb..a237dec7579e66f9ff3c3bb03d5b0d53cbc13502 100644 (file)
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -27,7 +27,7 @@
 #include "exec/cpu_ldst.h"
 #include "qemu/int128.h"
 #include "qemu/atomic128.h"
-#include "tcg.h"
+#include "tcg/tcg.h"
 
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/s390x/storage-keys.h"

diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 4292bb0dd0787f714951ba63644579a470cff8bc..b764ec3140ffbc2776ee1d09217667c4408c9a0f 100644 (file)
--- 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 922785e225e9893c5b8a8fc5a4054252d8c7d9b9..6192d83e8c660210d0f968d2daf863d89fcf3980 100644 (file)
--- 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 7345827a9661f854a62e7a1eb676ee271747dd27..e91cfdecd3726757d3967fa2ac3100ff46850f53 100644 (file)
--- 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 edc23a7c403f0d8cfc6c45c63e150194093b5c41..9416a551cf461f8b5cc9f3da44d424825e2ba2b4 100644 (file)
--- 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 abce7e1c75708fcb5a834ab1e2a6a9d1eb8b9552..65f1c91f4f647a5144432b7b2796c1666860c20a 100644 (file)
--- 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 c574638c9f753ece0dd27de7aafe660dc06d6c35..609d75ae8a6b91e7dbd479af05f8fc92eac99c01 100644 (file)
--- 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 0f6891b8aa33ec6c7e2ee4296c5c0b432936358a..d4b06df672b21cfe5c3c5437aeb3bad6dfbe147c 100644 (file)
--- 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 e6d910786c872bf54c823d33786c12a3d70dfce1..8aa972cafdf3664fc647f6876418cbe41de972ef 100644 (file)
--- 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/i386/tcg-target.h b/tcg/i386/tcg-target.h
index 928e8b87bbeaf9e4e3ca71b3ce9bfb56503457f8..bfb3f5f6e9e263316aabfdb5fcba244fa88dd40c 100644 (file)
--- 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/optimize.c b/tcg/optimize.c
index f7f4e873c9d0ba46651249a2e339450b2e03d267..53aa8e53292e3881052fcf33dba0701fc8a45cc9 100644 (file)
--- 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 97305a3efc14536e31e1cf7d06122686e8ec9d64..7e1992e79e9e24904bc4b50d08959459f87fae59 100644 (file)
--- 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 5c95ecd51cad57b67addd814b223f82c59f63159..41b4a3c661ff56a1d428615fe3d0b0069f8d987a 100644 (file)
--- 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 6714991bf48825c9554671b37020c39ab8a70988..b6937e8d6484cbdce9c59c805708eb6b3b5c14f3 100644 (file)
--- 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 c245126f98194c312bb3088451813ee3bfcee367..7d782002e3fb1bdd14072540734ce5da240f8a72 100644 (file)
--- 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-op.h b/tcg/tcg-op.h
index 4af272daa5a899988e046956097a59c0e4f3b0d1..230db6e0221c673e926aab3e161c911772084a20 100644 (file)
--- 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.c b/tcg/tcg.c
index 4f616ba38bf0a40e70c39166e85ac888e8c4f801..dd4b3d768445f21197baadc050fa3cb6d5db5d9c 100644 (file)
--- 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/tcg.h b/tcg/tcg.h
index 3b4f79301c282bd5a6c30408799d42cd38036c00..54e544688055470aec02918aa91c173d336b6234 100644 (file)
--- 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/tcg/tci.c b/tcg/tci.c
index a6208653e839ac9e8f600a93a7280af33c0fd15b..46fe9ce63f990f3150370dd9fcfde80c6719f2a1 100644 (file)
--- 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() \