Re: [PATCH v2 1/4] tcg: Search includes from the project root source dir

qemu-devel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v2 1/4] tcg: Search includes from the project root source dir

From:	Alistair Francis
Subject:	Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
Date:	Thu, 2 Jan 2020 18:40:51 -0800

On Wed, Jan 1, 2020 at 3:24 AM Philippe Mathieu-Daudé <address@hidden> 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é <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

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
>
>

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list, Philippe Mathieu-Daudé, 2020/01/01
- [PATCH v2 1/4] tcg: Search includes from the project root source directory, Philippe Mathieu-Daudé, 2020/01/01
  - Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory, David Gibson, 2020/01/01
  - Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory, Alistair Francis <=
- [PATCH v2 2/4] tcg: Search includes in the parent source directory, Philippe Mathieu-Daudé, 2020/01/01
  - Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory, David Gibson, 2020/01/01
  - Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory, Alistair Francis, 2020/01/02
  - Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory, Paolo Bonzini, 2020/01/07
- [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/, Philippe Mathieu-Daudé, 2020/01/01
  - Re: [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/, Alistair Francis, 2020/01/02
- [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list, Philippe Mathieu-Daudé, 2020/01/01
  - Re: [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list, Alistair Francis, 2020/01/02
- Re: [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list, Stefan Weil, 2020/01/02
- Re: [PATCH v2 0/4] tcg: Include tcg files using tcg/ dirname, reduce cpp search path list, Richard Henderson, 2020/01/02

Prev by Date: Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls
Next by Date: Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
Previous by thread: Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
Next by thread: [PATCH v2 2/4] tcg: Search includes in the parent source directory
Index(es):
- Date
- Thread