tcg: Include tcg files using tcg/ dirname, reduce cpp search path list
v2 cover tcg: Include tcg files using tcg/ dirname, reduce cpp search path list
Noticed we could clean this while reviewing Richard patch last night:
https://www.mail-archive.com/[email protected]/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%)Signature · 1 line
2.21.0
PATCH v2 1/4 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--- 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(-)
include/exec/cpu_ldst.h +1 -1
@@ -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) {
tcg/i386/tcg-target.h +1 -1
@@ -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)
tcg/tcg-op.h +1 -1
@@ -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"
tcg/tcg.h +2 -2
@@ -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 DEFNB_OPS , } TCGOpcode;
accel/tcg/cpu-exec.c +1 -1
@@ -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"
accel/tcg/tcg-runtime-gvec.c +1 -1
@@ -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
accel/tcg/translate-all.c +1 -1
@@ -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__)
accel/tcg/user-exec.c +1 -1
@@ -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"
bsd-user/main.c +1 -1
@@ -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"
cpus.c +1 -1
@@ -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"
exec.c +1 -1
@@ -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 )
linux-user/main.c +1 -1
@@ -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"
target/alpha/translate.c +1 -1
@@ -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"
target/arm/helper-a64.c +1 -1
@@ -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 */
target/arm/translate-a64.c +2 -2
@@ -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"
target/arm/translate-sve.c +3 -3
@@ -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"
target/arm/translate.c +2 -2
@@ -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"
target/cris/translate.c +1 -1
@@ -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"
target/hppa/translate.c +1 -1
@@ -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"
target/i386/mem_helper.c +1 -1
@@ -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) {
target/i386/translate.c +1 -1
@@ -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"
target/lm32/translate.c +1 -1
@@ -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"
target/m68k/translate.c +1 -1
@@ -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"
target/microblaze/translate.c +1 -1
@@ -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"
target/mips/translate.c +1 -1
@@ -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"
target/moxie/translate.c +1 -1
@@ -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"
target/nios2/translate.c +1 -1
@@ -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"
target/openrisc/translate.c +1 -1
@@ -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"
target/ppc/mem_helper.c +1 -1
@@ -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"
target/ppc/translate.c +2 -2
@@ -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"
target/riscv/cpu_helper.c +1 -1
@@ -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)
target/riscv/translate.c +1 -1
@@ -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"
target/s390x/translate.c +2 -2
@@ -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"
target/sh4/translate.c +1 -1
@@ -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"
target/sparc/ldst_helper.c +1 -1
@@ -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"
target/sparc/translate.c +1 -1
@@ -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"
target/tilegx/translate.c +1 -1
@@ -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"
target/tricore/translate.c +1 -1
@@ -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"
target/unicore32/translate.c +1 -1
@@ -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"
target/xtensa/translate.c +1 -1
@@ -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"
tcg/optimize.c +1 -1
@@ -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): \
tcg/tcg-common.c +1 -1
@@ -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);
tcg/tcg-op-gvec.c +4 -4
@@ -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
tcg/tcg-op-vec.c +3 -3
@@ -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
tcg/tcg-op.c +3 -3
@@ -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"
tcg/tcg.c +1 -1
@@ -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
tcg/tci.c +1 -1
@@ -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 () \
Signature · 1 line
2.21.0
Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
Quoted 14 lines · Philippe Mathieu-Daudé
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 94To simplify the preprocessor search path, unify by expliciting the tcg/ directory.
Patch created mechanically by running:
Quoted 8 lines
$ 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\""); \ doneSigned-off-by Philippe Mathieu-Daudé <[email protected]>
ppc parts
Quoted 697 lines
--- 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(-)include/exec/cpu_ldst.h +1
-1@@ -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) {tcg/i386/tcg-target.h +1
-1@@ -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)tcg/tcg-op.h +1
-1@@ -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" tcg/tcg.h +2
-2@@ -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 DEFNB_OPS , } TCGOpcode;accel/tcg/cpu-exec.c +1
-1@@ -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" accel/tcg/tcg-runtime-gvec.c +1
-1@@ -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 accel/tcg/translate-all.c +1
-1@@ -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__)accel/tcg/user-exec.c +1
-1@@ -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" bsd-user/main.c +1
-1@@ -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" cpus.c +1
-1@@ -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" exec.c +1
-1@@ -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 )linux-user/main.c +1
-1@@ -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" target/alpha/translate.c +1
-1@@ -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" target/arm/helper-a64.c +1
-1@@ -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 */ target/arm/translate-a64.c +2
-2@@ -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" target/arm/translate-sve.c +3
-3@@ -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" target/arm/translate.c +2
-2@@ -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" target/cris/translate.c +1
-1@@ -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" target/hppa/translate.c +1
-1@@ -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" target/i386/mem_helper.c +1
-1@@ -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) {target/i386/translate.c +1
-1@@ -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" target/lm32/translate.c +1
-1@@ -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" target/m68k/translate.c +1
-1@@ -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" target/microblaze/translate.c +1
-1@@ -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" target/mips/translate.c +1
-1@@ -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" target/moxie/translate.c +1
-1@@ -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" target/nios2/translate.c +1
-1@@ -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" target/openrisc/translate.c +1
-1@@ -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" target/ppc/mem_helper.c +1
-1@@ -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" target/ppc/translate.c +2
-2@@ -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" target/riscv/cpu_helper.c +1
-1@@ -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)target/riscv/translate.c +1
-1@@ -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" target/s390x/translate.c +2
-2@@ -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" target/sh4/translate.c +1
-1@@ -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" target/sparc/ldst_helper.c +1
-1@@ -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" target/sparc/translate.c +1
-1@@ -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" target/tilegx/translate.c +1
-1@@ -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" target/tricore/translate.c +1
-1@@ -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" target/unicore32/translate.c +1
-1@@ -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" target/xtensa/translate.c +1
-1@@ -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" tcg/optimize.c +1
-1@@ -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): \tcg/tcg-common.c +1
-1@@ -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);tcg/tcg-op-gvec.c +4
-4@@ -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 4tcg/tcg-op-vec.c +3
-3@@ -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 tcg/tcg-op.c +3
-3@@ -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" tcg/tcg.c +1
-1@@ -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 ELFCLASS32tcg/tci.c +1
-1@@ -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 () \
Signature · 4 lines
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
Re: [PATCH v2 1/4] tcg: Search includes from the project root source directory
In reply to Philippe Mathieu-DaudéQuoted 15 lines · Philippe Mathieu-Daudé
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 94To simplify the preprocessor search path, unify by expliciting the tcg/ directory.
Patch created mechanically by running:
Quoted 8 lines
$ 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\""); \ doneSigned-off-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 701 lines
--- 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(-)include/exec/cpu_ldst.h +1
-1@@ -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) {tcg/i386/tcg-target.h +1
-1@@ -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)tcg/tcg-op.h +1
-1@@ -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" tcg/tcg.h +2
-2@@ -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 DEFNB_OPS , } TCGOpcode;accel/tcg/cpu-exec.c +1
-1@@ -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" accel/tcg/tcg-runtime-gvec.c +1
-1@@ -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 accel/tcg/translate-all.c +1
-1@@ -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__)accel/tcg/user-exec.c +1
-1@@ -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" bsd-user/main.c +1
-1@@ -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" cpus.c +1
-1@@ -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" exec.c +1
-1@@ -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 )linux-user/main.c +1
-1@@ -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" target/alpha/translate.c +1
-1@@ -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" target/arm/helper-a64.c +1
-1@@ -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 */ target/arm/translate-a64.c +2
-2@@ -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" target/arm/translate-sve.c +3
-3@@ -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" target/arm/translate.c +2
-2@@ -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" target/cris/translate.c +1
-1@@ -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" target/hppa/translate.c +1
-1@@ -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" target/i386/mem_helper.c +1
-1@@ -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) {target/i386/translate.c +1
-1@@ -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" target/lm32/translate.c +1
-1@@ -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" target/m68k/translate.c +1
-1@@ -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" target/microblaze/translate.c +1
-1@@ -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" target/mips/translate.c +1
-1@@ -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" target/moxie/translate.c +1
-1@@ -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" target/nios2/translate.c +1
-1@@ -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" target/openrisc/translate.c +1
-1@@ -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" target/ppc/mem_helper.c +1
-1@@ -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" target/ppc/translate.c +2
-2@@ -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" target/riscv/cpu_helper.c +1
-1@@ -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)target/riscv/translate.c +1
-1@@ -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" target/s390x/translate.c +2
-2@@ -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" target/sh4/translate.c +1
-1@@ -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" target/sparc/ldst_helper.c +1
-1@@ -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" target/sparc/translate.c +1
-1@@ -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" target/tilegx/translate.c +1
-1@@ -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" target/tricore/translate.c +1
-1@@ -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" target/unicore32/translate.c +1
-1@@ -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" target/xtensa/translate.c +1
-1@@ -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" tcg/optimize.c +1
-1@@ -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): \tcg/tcg-common.c +1
-1@@ -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);tcg/tcg-op-gvec.c +4
-4@@ -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 4tcg/tcg-op-vec.c +3
-3@@ -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 tcg/tcg-op.c +3
-3@@ -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" tcg/tcg.c +1
-1@@ -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 ELFCLASS32tcg/tci.c +1
-2@@ -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
PATCH v2 2/4 tcg: Search includes in the parent source directory
In reply to Philippe Mathieu-Daudé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--- 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(-)
tcg/aarch64/tcg-target.inc.c +2 -2
@@ -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)
tcg/arm/tcg-target.inc.c +2 -2
@@ -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)
tcg/i386/tcg-target.inc.c +2 -2
@@ -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)
tcg/mips/tcg-target.inc.c +1 -1
@@ -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,
tcg/ppc/tcg-target.inc.c +2 -2
@@ -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)
tcg/riscv/tcg-target.inc.c +2 -2
@@ -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)
tcg/s390/tcg-target.inc.c +2 -2
@@ -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 );
tcg/sparc/tcg-target.inc.c +1 -1
@@ -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] = {
Signature · 1 line
2.21.0
Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
Quoted 4 lines · Philippe Mathieu-Daudé
All the *.inc.c files included by
tcg/$TARGET/tcg-target.inc.care in tcg/, their parent directory. To simplify the preprocessor search path, include the relative parent path: '..'.
Quoted 8 lines
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\""); \ doneSigned-off-by Philippe Mathieu-Daudé <[email protected]>
ppc parts
Quoted 169 lines
--- 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(-)tcg/aarch64/tcg-target.inc.c +2
-2@@ -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) tcg/arm/tcg-target.inc.c +2
-2@@ -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) tcg/i386/tcg-target.inc.c +2
-2@@ -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) tcg/mips/tcg-target.inc.c +1
-1@@ -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,tcg/ppc/tcg-target.inc.c +2
-2@@ -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) tcg/riscv/tcg-target.inc.c +2
-2@@ -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) tcg/s390/tcg-target.inc.c +2
-2@@ -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 );tcg/sparc/tcg-target.inc.c +1
-1@@ -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] = {
Signature · 4 lines
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
Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
In reply to Philippe Mathieu-DaudéQuoted 5 lines · Philippe Mathieu-Daudé
All the *.inc.c files included by
tcg/$TARGET/tcg-target.inc.care in tcg/, their parent directory. To simplify the preprocessor search path, include the relative parent path: '..'.
Quoted 8 lines
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\""); \ doneSigned-off-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 173 lines
--- 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(-)tcg/aarch64/tcg-target.inc.c +2
-2@@ -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) tcg/arm/tcg-target.inc.c +2
-2@@ -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) tcg/i386/tcg-target.inc.c +2
-2@@ -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) tcg/mips/tcg-target.inc.c +1
-1@@ -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,tcg/ppc/tcg-target.inc.c +2
-2@@ -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) tcg/riscv/tcg-target.inc.c +2
-2@@ -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) tcg/s390/tcg-target.inc.c +2
-2@@ -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 );tcg/sparc/tcg-target.inc.c +1
-2@@ -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
Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
All the *.inc.c files included by
tcg/$TARGET/tcg-target.inc.care in tcg/, their parent directory. To simplify the preprocessor search path, include the relative parent path: '..'.
Quoted 8 lines
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\""); \ doneSigned-off-by Philippe Mathieu-Daudé <[email protected]>
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
Quoted 170 lines
--- 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(-)tcg/aarch64/tcg-target.inc.c +2
-2@@ -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) tcg/arm/tcg-target.inc.c +2
-2@@ -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) tcg/i386/tcg-target.inc.c +2
-2@@ -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) tcg/mips/tcg-target.inc.c +1
-1@@ -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,tcg/ppc/tcg-target.inc.c +2
-2@@ -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) tcg/riscv/tcg-target.inc.c +2
-2@@ -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) tcg/s390/tcg-target.inc.c +2
-2@@ -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 );tcg/sparc/tcg-target.inc.c +1
-1@@ -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] = {
PATCH v2 3/4 tcg: Move TCG headers to include/tcg/
In reply to Philippe Mathieu-Daudé---
{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%)include/tcg/tcg-gvec-desc.h renamed from tcg/tcg-gvec-desc.h +0 -0
include/tcg/tcg-mo.h renamed from tcg/tcg-mo.h +0 -0
include/tcg/tcg-op-gvec.h renamed from tcg/tcg-op-gvec.h +0 -0
include/tcg/tcg-op.h renamed from tcg/tcg-op.h +0 -0
include/tcg/tcg-opc.h renamed from tcg/tcg-opc.h +0 -0
include/tcg/tcg.h renamed from tcg/tcg.h +0 -0
MAINTAINERS +1 -0
@@ -2374,6 +2374,7 @@ Common TCG code M: Richard Henderson <[email protected]> S: Maintained F: tcg/ +F: include/tcg/ TCG Plugins M: Alex Bennée <[email protected]>
Signature · 1 line
2.21.0
Re: [PATCH v2 3/4] tcg: Move TCG headers to include/tcg/
Quoted 2 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 56 lines
--- {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%)include/tcg/tcg-gvec-desc.h renamed from tcg/tcg-gvec-desc.h +0
-0include/tcg/tcg-mo.h renamed from tcg/tcg-mo.h +0
-0include/tcg/tcg-op-gvec.h renamed from tcg/tcg-op-gvec.h +0
-0include/tcg/tcg-op.h renamed from tcg/tcg-op.h +0
-0include/tcg/tcg-opc.h renamed from tcg/tcg-opc.h +0
-0include/tcg/tcg.h renamed from tcg/tcg.h +0
-0MAINTAINERS +1
-1@@ -2374,6 +2374,7 @@ Common TCG code M: Richard Henderson <[email protected]> S: Maintained F: tcg/ +F: include/tcg/ TCG Plugins M: Alex Bennée <[email protected]> --2.21.0
PATCH v2 4/4 configure: Remove tcg/ from the preprocessor include search list
In reply to Philippe Mathieu-DaudéAll tcg includes are relative to the repository root directory, we can safely remove the tcg/ directory from the include search path list.
--- configure | 1 - 1 file changed, 1 deletion(-)
configure +0 -1
@@ -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
Signature · 1 line
2.21.0
Re: [PATCH v2 4/4] configure: Remove tcg/ from the preprocessor include search list
Quoted 6 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Alistair
Quoted 20 lines
--- configure | 1 - 1 file changed, 1 deletion(-)configure +0
-2@@ -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
Am 01.01.20 um 12:22 schrieb Philippe Mathieu-Daudé:
Quoted 75 lines
Noticed we could clean this while reviewing Richard patch last night:
https://www.mail-archive.com/[email protected]/msg667606.htmlSince v1:
- moved headers toinclude/tcg/(Paolo)
- include in.inc.crelative 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 toinclude/tcg/
configure: Remove tcg/ from the preprocessor include search listconfigure | 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 +-
Quoted 8 lines
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.
Quoted 7 lines · Philippe Mathieu-Daudé
Noticed we could clean this while reviewing Richard patch last night:
https://www.mail-archive.com/[email protected]/msg667606.htmlSince v1:
- moved headers toinclude/tcg/(Paolo)
- include in.inc.crelative to parent (Stefan)
Quoted 7 lines
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 toinclude/tcg/
configure: Remove tcg/ from the preprocessor include search list
Will queue shortly.
r~
Quoted 8 lines · Philippe Mathieu-Daudé
Noticed we could clean this while reviewing Richard patch last night:
https://www.mail-archive.com/[email protected]/msg667606.htmlSince v1:
- moved headers toinclude/tcg/(Paolo)
- include in.inc.crelative to parent (Stefan)v1: https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg05356.html
but I'll let Richad pick it up.
Paolo