From 9485b7c2e1ff8af3ab80bd4c65838048759128c6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 24 Feb 2018 02:26:26 -0500 Subject: [PATCH] cpu: move exec-all.h inclusion out of cpu.h exec-all.h contains TCG-specific definitions. It is not needed outside TCG-specific files such as translate.c, exec.c or *helper.c. One generic function had snuck into include/exec/exec-all.h; move it to include/qom/cpu.h. Backports commit 63c915526d6a54a95919ebece83fa9ca631b2508 from qemu --- qemu/cpu-exec-common.c | 1 + qemu/cpu-exec.c | 2 ++ qemu/cpus.c | 4 +++- qemu/cputlb.c | 1 + qemu/exec.c | 1 + qemu/include/exec/exec-all.h | 11 +---------- qemu/include/qom/cpu.h | 10 ++++++++++ qemu/memory.c | 4 ++-- qemu/target-arm/arm_ldst.h | 1 + qemu/target-arm/cpu.c | 1 + qemu/target-arm/cpu.h | 2 -- qemu/target-arm/helper-a64.c | 1 + qemu/target-arm/helper.c | 1 + qemu/target-arm/op_helper.c | 1 + qemu/target-arm/psci.c | 2 ++ qemu/target-arm/translate-a64.c | 1 + qemu/target-arm/translate.c | 1 + qemu/target-i386/bpt_helper.c | 1 + qemu/target-i386/cpu.c | 1 + qemu/target-i386/cpu.h | 2 -- qemu/target-i386/excp_helper.c | 1 + qemu/target-i386/fpu_helper.c | 1 + qemu/target-i386/helper.c | 1 + qemu/target-i386/int_helper.c | 1 + qemu/target-i386/mem_helper.c | 1 + qemu/target-i386/misc_helper.c | 1 + qemu/target-i386/mpx_helper.c | 1 + qemu/target-i386/seg_helper.c | 1 + qemu/target-i386/svm_helper.c | 1 + qemu/target-i386/translate.c | 1 + qemu/target-m68k/cpu.c | 1 + qemu/target-m68k/cpu.h | 2 -- qemu/target-m68k/helper.c | 1 + qemu/target-m68k/op_helper.c | 1 + qemu/target-m68k/translate.c | 1 + qemu/target-mips/cpu.c | 1 + qemu/target-mips/cpu.h | 2 -- qemu/target-mips/helper.c | 1 + qemu/target-mips/msa_helper.c | 1 + qemu/target-mips/op_helper.c | 1 + qemu/target-mips/translate.c | 1 + qemu/target-sparc/cpu.c | 1 + qemu/target-sparc/cpu.h | 2 -- qemu/target-sparc/helper.c | 1 + qemu/target-sparc/ldst_helper.c | 1 + qemu/target-sparc/mmu_helper.c | 1 + qemu/target-sparc/translate.c | 1 + qemu/tcg/tcg-op.c | 1 + qemu/tcg/tcg.c | 5 +++++ qemu/translate-all.c | 1 + 50 files changed, 63 insertions(+), 23 deletions(-) diff --git a/qemu/cpu-exec-common.c b/qemu/cpu-exec-common.c index fbb88889..ef134f58 100644 --- a/qemu/cpu-exec-common.c +++ b/qemu/cpu-exec-common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "sysemu/cpus.h" +#include "exec/exec-all.h" #include "exec/memory-internal.h" /* exit the current TB from a signal handler. The host registers are diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c index 00f95f79..e51b49df 100644 --- a/qemu/cpu-exec.c +++ b/qemu/cpu-exec.c @@ -20,6 +20,8 @@ /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */ #include "qemu/osdep.h" +#include "cpu.h" +#include "exec/exec-all.h" #include "tcg.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/qemu/cpus.c b/qemu/cpus.c index 6df60cb7..aeb543cd 100644 --- a/qemu/cpus.c +++ b/qemu/cpus.c @@ -29,8 +29,10 @@ #include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" -#include "sysemu/cpus.h" +#include "exec/exec-all.h" + #include "qemu/thread.h" +#include "sysemu/cpus.h" #include "exec/address-spaces.h" // debug, can be removed later diff --git a/qemu/cputlb.c b/qemu/cputlb.c index 6af71afe..2cdd402c 100644 --- a/qemu/cputlb.c +++ b/qemu/cputlb.c @@ -30,6 +30,7 @@ #include "exec/memory-internal.h" #include "exec/ram_addr.h" +#include "exec/exec-all.h" #include "tcg/tcg.h" #include "uc_priv.h" diff --git a/qemu/exec.c b/qemu/exec.c index a4fe2be5..65cd043d 100644 --- a/qemu/exec.c +++ b/qemu/exec.c @@ -26,6 +26,7 @@ #include "qemu/cutils.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg.h" #include "hw/hw.h" #include "hw/qdev.h" diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h index 1125f48d..9b8e7a9a 100644 --- a/qemu/include/exec/exec-all.h +++ b/qemu/include/exec/exec-all.h @@ -80,15 +80,7 @@ void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc); * Note that with KVM only one address space is supported. */ void cpu_address_space_init(CPUState *cpu, AddressSpace *as, int asidx); -/** - * cpu_get_address_space: - * @cpu: CPU to get address space from - * @asidx: index identifying which address space to get - * - * Return the requested address space of this CPU. @asidx - * specifies which address space to read. - */ -AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx); + /* cputlb.c */ /** * tlb_flush_page: @@ -98,7 +90,6 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx); * Flush one page from the TLB of the specified CPU, for all * MMU indexes. */ - void tlb_flush_page(CPUState *cpu, target_ulong addr); /** * tlb_flush: diff --git a/qemu/include/qom/cpu.h b/qemu/include/qom/cpu.h index 733e05f2..f908f81e 100644 --- a/qemu/include/qom/cpu.h +++ b/qemu/include/qom/cpu.h @@ -702,6 +702,16 @@ int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); void cpu_watchpoint_remove_all(CPUState *cpu, int mask); +/** + * cpu_get_address_space: + * @cpu: CPU to get address space from + * @asidx: index identifying which address space to get + * + * Return the requested address space of this CPU. @asidx + * specifies which address space to read. + */ +AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx); + /* Return true if PC matches an installed breakpoint. */ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask) { diff --git a/qemu/memory.c b/qemu/memory.c index 959a4613..62fdb243 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -16,17 +16,17 @@ /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "exec/exec-all.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "exec/ioport.h" #include "qapi/visitor.h" #include "qemu/bitops.h" #include "qom/object.h" -#include #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/qemu/target-arm/arm_ldst.h b/qemu/target-arm/arm_ldst.h index 35c2c439..a76d89f6 100644 --- a/qemu/target-arm/arm_ldst.h +++ b/qemu/target-arm/arm_ldst.h @@ -20,6 +20,7 @@ #ifndef ARM_LDST_H #define ARM_LDST_H +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "qemu/bswap.h" diff --git a/qemu/target-arm/cpu.c b/qemu/target-arm/cpu.c index 8eb58375..3563e124 100644 --- a/qemu/target-arm/cpu.c +++ b/qemu/target-arm/cpu.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "internals.h" #include "qemu-common.h" +#include "exec/exec-all.h" #include "qapi/qmp/qerror.h" #include "hw/arm/arm.h" #include "sysemu/sysemu.h" diff --git a/qemu/target-arm/cpu.h b/qemu/target-arm/cpu.h index a836571a..232aecc7 100644 --- a/qemu/target-arm/cpu.h +++ b/qemu/target-arm/cpu.h @@ -2364,8 +2364,6 @@ static inline uint64_t *aa64_vfp_qreg(CPUARMState *env, unsigned regno) return &env->vfp.regs[2 * regno]; } -#include "exec/exec-all.h" - enum { QEMU_PSCI_CONDUIT_DISABLED = 0, QEMU_PSCI_CONDUIT_SMC = 1, diff --git a/qemu/target-arm/helper-a64.c b/qemu/target-arm/helper-a64.c index 7e5883ca..81960d40 100644 --- a/qemu/target-arm/helper-a64.c +++ b/qemu/target-arm/helper-a64.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "qemu/log.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "internals.h" diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index 4c5d819c..7874f389 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -6,6 +6,7 @@ #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/crc32c.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "arm_ldst.h" diff --git a/qemu/target-arm/op_helper.c b/qemu/target-arm/op_helper.c index 9e54cc47..c05004c4 100644 --- a/qemu/target-arm/op_helper.c +++ b/qemu/target-arm/op_helper.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "internals.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #define SIGNBIT (uint32_t)0x80000000 diff --git a/qemu/target-arm/psci.c b/qemu/target-arm/psci.c index 5b305b1b..3b42a2d9 100644 --- a/qemu/target-arm/psci.c +++ b/qemu/target-arm/psci.c @@ -15,12 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#include "qemu/osdep.h" #include #include #include #include #include #include "internals.h" +#include "exec/exec-all.h" bool arm_is_psci_call(ARMCPU *cpu, int excp_type) { diff --git a/qemu/target-arm/translate-a64.c b/qemu/target-arm/translate-a64.c index 8847c53c..0f1d1760 100644 --- a/qemu/target-arm/translate-a64.c +++ b/qemu/target-arm/translate-a64.c @@ -20,6 +20,7 @@ #include "unicorn/platform.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "qemu/log.h" #include "arm_ldst.h" diff --git a/qemu/target-arm/translate.c b/qemu/target-arm/translate.c index b6de939d..5d9db937 100644 --- a/qemu/target-arm/translate.c +++ b/qemu/target-arm/translate.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "internals.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "qemu/log.h" #include "qemu/bitops.h" diff --git a/qemu/target-i386/bpt_helper.c b/qemu/target-i386/bpt_helper.c index 2e19fb4f..58c31aae 100644 --- a/qemu/target-i386/bpt_helper.c +++ b/qemu/target-i386/bpt_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "exec/helper-proto.h" #ifndef CONFIG_USER_ONLY diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c index de3497e2..b8f5f62a 100644 --- a/qemu/target-i386/cpu.c +++ b/qemu/target-i386/cpu.c @@ -23,6 +23,7 @@ #include "unicorn/platform.h" #include "cpu.h" +#include "exec/exec-all.h" #include "sysemu/cpus.h" #include "qapi/qmp/qerror.h" diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h index 6c66c43d..c86cec69 100644 --- a/qemu/target-i386/cpu.h +++ b/qemu/target-i386/cpu.h @@ -1351,8 +1351,6 @@ void tcg_x86_init(struct uc_struct *); #include "hw/i386/apic.h" #endif -#include "exec/exec-all.h" - static inline void cpu_get_tb_cpu_state(CPUX86State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) { diff --git a/qemu/target-i386/excp_helper.c b/qemu/target-i386/excp_helper.c index 47fbdbbf..69dcd91f 100644 --- a/qemu/target-i386/excp_helper.c +++ b/qemu/target-i386/excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "qemu/log.h" #include "sysemu/sysemu.h" #include "exec/helper-proto.h" diff --git a/qemu/target-i386/fpu_helper.c b/qemu/target-i386/fpu_helper.c index 6996eb1b..6fb1d8dc 100644 --- a/qemu/target-i386/fpu_helper.c +++ b/qemu/target-i386/fpu_helper.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #define FPU_RC_MASK 0xc00 diff --git a/qemu/target-i386/helper.c b/qemu/target-i386/helper.c index 3692b3a7..4a30f3e1 100644 --- a/qemu/target-i386/helper.c +++ b/qemu/target-i386/helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" #endif diff --git a/qemu/target-i386/int_helper.c b/qemu/target-i386/int_helper.c index 2282a11c..3fa57e6a 100644 --- a/qemu/target-i386/int_helper.c +++ b/qemu/target-i386/int_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/qemu/target-i386/mem_helper.c b/qemu/target-i386/mem_helper.c index 6d0276c3..22878f33 100644 --- a/qemu/target-i386/mem_helper.c +++ b/qemu/target-i386/mem_helper.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "uc_priv.h" diff --git a/qemu/target-i386/misc_helper.c b/qemu/target-i386/misc_helper.c index 520f264e..5ed07430 100644 --- a/qemu/target-i386/misc_helper.c +++ b/qemu/target-i386/misc_helper.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "exec/ioport.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "uc_priv.h" diff --git a/qemu/target-i386/mpx_helper.c b/qemu/target-i386/mpx_helper.c index 7e44a5fe..db6a3179 100644 --- a/qemu/target-i386/mpx_helper.c +++ b/qemu/target-i386/mpx_helper.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" +#include "exec/exec-all.h" void cpu_sync_bndcs_hflags(CPUX86State *env) diff --git a/qemu/target-i386/seg_helper.c b/qemu/target-i386/seg_helper.c index 34fedf09..9513a2c1 100644 --- a/qemu/target-i386/seg_helper.c +++ b/qemu/target-i386/seg_helper.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "qemu/log.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "uc_priv.h" diff --git a/qemu/target-i386/svm_helper.c b/qemu/target-i386/svm_helper.c index b47c1f74..f6f4d4a0 100644 --- a/qemu/target-i386/svm_helper.c +++ b/qemu/target-i386/svm_helper.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "exec/cpu-all.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" /* Secure Virtual Machine helpers */ diff --git a/qemu/target-i386/translate.c b/qemu/target-i386/translate.c index 9b82e3ad..a2c27d67 100644 --- a/qemu/target-i386/translate.c +++ b/qemu/target-i386/translate.c @@ -22,6 +22,7 @@ #include "qemu/host-utils.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" diff --git a/qemu/target-m68k/cpu.c b/qemu/target-m68k/cpu.c index fd1da757..a23627c3 100644 --- a/qemu/target-m68k/cpu.c +++ b/qemu/target-m68k/cpu.c @@ -23,6 +23,7 @@ #include "hw/m68k/m68k.h" #include "cpu.h" #include "qemu-common.h" +#include "exec/exec-all.h" static void m68k_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/qemu/target-m68k/cpu.h b/qemu/target-m68k/cpu.h index 3f55f6ff..1f196633 100644 --- a/qemu/target-m68k/cpu.h +++ b/qemu/target-m68k/cpu.h @@ -282,6 +282,4 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc, | ((env->macsr >> 4) & 0xf); /* Bits 0-3 */ } -#include "exec/exec-all.h" - #endif diff --git a/qemu/target-m68k/helper.c b/qemu/target-m68k/helper.c index 76cc71ca..209b14e7 100644 --- a/qemu/target-m68k/helper.c +++ b/qemu/target-m68k/helper.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/qemu/target-m68k/op_helper.c b/qemu/target-m68k/op_helper.c index e55c6abc..35e7e69b 100644 --- a/qemu/target-m68k/op_helper.c +++ b/qemu/target-m68k/op_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #if defined(CONFIG_USER_ONLY) diff --git a/qemu/target-m68k/translate.c b/qemu/target-m68k/translate.c index 37bb8975..c6a17b6b 100644 --- a/qemu/target-m68k/translate.c +++ b/qemu/target-m68k/translate.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "qemu/log.h" #include "exec/cpu_ldst.h" diff --git a/qemu/target-mips/cpu.c b/qemu/target-mips/cpu.c index c456846c..435b843b 100644 --- a/qemu/target-mips/cpu.c +++ b/qemu/target-mips/cpu.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu-common.h" +#include "exec/exec-all.h" #include "hw/mips/mips.h" diff --git a/qemu/target-mips/cpu.h b/qemu/target-mips/cpu.h index 65724645..3a55dfd5 100644 --- a/qemu/target-mips/cpu.h +++ b/qemu/target-mips/cpu.h @@ -926,8 +926,6 @@ static inline int mips_vp_active(CPUMIPSState *env) return 1; } -#include "exec/exec-all.h" - static inline void compute_hflags(CPUMIPSState *env) { env->hflags &= ~(MIPS_HFLAG_COP1X | MIPS_HFLAG_64 | MIPS_HFLAG_CP0 | diff --git a/qemu/target-mips/helper.c b/qemu/target-mips/helper.c index 8494f5a5..b0a068ea 100644 --- a/qemu/target-mips/helper.c +++ b/qemu/target-mips/helper.c @@ -21,6 +21,7 @@ #include "unicorn/platform.h" #include "cpu.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" enum { diff --git a/qemu/target-mips/msa_helper.c b/qemu/target-mips/msa_helper.c index 2d34877e..b5915da5 100644 --- a/qemu/target-mips/msa_helper.c +++ b/qemu/target-mips/msa_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "exec/helper-proto.h" /* Data format min and max values */ diff --git a/qemu/target-mips/op_helper.c b/qemu/target-mips/op_helper.c index cf17111e..373213e8 100644 --- a/qemu/target-mips/op_helper.c +++ b/qemu/target-mips/op_helper.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" /*****************************************************************************/ diff --git a/qemu/target-mips/translate.c b/qemu/target-mips/translate.c index 2c8ad3d4..553e4c1c 100644 --- a/qemu/target-mips/translate.c +++ b/qemu/target-mips/translate.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "exec/cpu_ldst.h" diff --git a/qemu/target-sparc/cpu.c b/qemu/target-sparc/cpu.c index b8c889bb..0e928bbc 100644 --- a/qemu/target-sparc/cpu.c +++ b/qemu/target-sparc/cpu.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" +#include "exec/exec-all.h" #include "hw/sparc/sparc.h" //#define DEBUG_FEATURES diff --git a/qemu/target-sparc/cpu.h b/qemu/target-sparc/cpu.h index ad84393d..dbe99d2c 100644 --- a/qemu/target-sparc/cpu.h +++ b/qemu/target-sparc/cpu.h @@ -771,6 +771,4 @@ static inline bool tb_am_enabled(int tb_flags) #endif } -#include "exec/exec-all.h" - #endif diff --git a/qemu/target-sparc/helper.c b/qemu/target-sparc/helper.c index 8a926a4a..0263ef1c 100644 --- a/qemu/target-sparc/helper.c +++ b/qemu/target-sparc/helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "sysemu/sysemu.h" diff --git a/qemu/target-sparc/ldst_helper.c b/qemu/target-sparc/ldst_helper.c index 99815924..d2272778 100644 --- a/qemu/target-sparc/ldst_helper.c +++ b/qemu/target-sparc/ldst_helper.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "exec/cpu_ldst.h" //#define DEBUG_MMU diff --git a/qemu/target-sparc/mmu_helper.c b/qemu/target-sparc/mmu_helper.c index ac222e73..3c4a89d0 100644 --- a/qemu/target-sparc/mmu_helper.c +++ b/qemu/target-sparc/mmu_helper.c @@ -18,6 +18,7 @@ */ #include "cpu.h" +#include "exec/exec-all.h" #include "exec/address-spaces.h" /* Sparc MMU emulation */ diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c index 3bbbc624..8df36e05 100644 --- a/qemu/target-sparc/translate.c +++ b/qemu/target-sparc/translate.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #include "tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-gen.h" diff --git a/qemu/tcg/tcg-op.c b/qemu/tcg/tcg-op.c index 504b8f24..0ce45d41 100644 --- a/qemu/tcg/tcg-op.c +++ b/qemu/tcg/tcg-op.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" +#include "exec/exec-all.h" #include "tcg.h" #include "tcg-op.h" diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c index 1b4de3ca..a8d4ba47 100644 --- a/qemu/tcg/tcg.c +++ b/qemu/tcg/tcg.c @@ -41,6 +41,11 @@ #define NO_CPU_IO_DEFS #include "cpu.h" +#include "qemu/host-utils.h" +#include "qemu/timer.h" +#include "exec/cpu-common.h" +#include "exec/exec-all.h" + #include "tcg-op.h" #if UINTPTR_MAX == UINT32_MAX diff --git a/qemu/translate-all.c b/qemu/translate-all.c index 7b963e80..16929bb7 100644 --- a/qemu/translate-all.c +++ b/qemu/translate-all.c @@ -31,6 +31,7 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" +#include "exec/exec-all.h" #include "tcg.h" #if defined(CONFIG_USER_ONLY) #include "qemu.h"