From: Paolo Bonzini Date: Wed, 24 Oct 2012 09:12:21 +0000 (+0200) Subject: build: kill libdis, move disassemblers to disas/ X-Git-Tag: v1.4.0-rc0~251^2~5^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76cad71136b7eb371cf2a2a4e1621cfe8d9c769a;p=thirdparty%2Fqemu.git build: kill libdis, move disassemblers to disas/ Signed-off-by: Paolo Bonzini --- diff --git a/.gitignore b/.gitignore index bd6ba1c71e9..ca52f01ab24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ config-devices.* config-all-devices.* +config-all-disas.* config-host.* config-target.* trace.h diff --git a/Makefile b/Makefile index 58107180fb6..da47cb85726 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,7 @@ defconfig: rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) -include config-all-devices.mak +-include config-all-disas.mak all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all @@ -129,9 +130,9 @@ $(SRC_PATH)/pixman/configure: $(SUBDIR_RULES): libqemustub.a -$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis +$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) -$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser +$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: @@ -223,7 +224,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a -QEMULIBS=libuser libdis libdis-user +QEMULIBS=libuser clean: # avoid old build problems by removing potentially incorrect old files @@ -255,7 +256,7 @@ qemu-%.tar.bz2: distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi - rm -f config-all-devices.mak + rm -f config-all-devices.mak config-all-disas.mak rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys diff --git a/Makefile.dis b/Makefile.dis deleted file mode 100644 index 2cfec6a3588..00000000000 --- a/Makefile.dis +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile for disassemblers. - -include ../config-host.mak -include config.mak -include $(SRC_PATH)/rules.mak - -.PHONY: all - -$(call set-vpath, $(SRC_PATH)) - -QEMU_CFLAGS+=-I.. - -include $(SRC_PATH)/Makefile.objs - -all: $(libdis-y) -# Dummy command so that make thinks it has done something - @true - -clean: - rm -f *.o *.d *.a *~ diff --git a/Makefile.objs b/Makefile.objs index 20fb2c54f00..3248eafe326 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,24 +127,10 @@ user-obj-y += $(trace-obj-y) user-obj-y += qom/ ###################################################################### -# libdis +# disassemblers # NOTE: the disassembler code is only needed for debugging -libdis-y = -libdis-$(CONFIG_ALPHA_DIS) += alpha-dis.o -libdis-$(CONFIG_ARM_DIS) += arm-dis.o -libdis-$(CONFIG_CRIS_DIS) += cris-dis.o -libdis-$(CONFIG_HPPA_DIS) += hppa-dis.o -libdis-$(CONFIG_I386_DIS) += i386-dis.o -libdis-$(CONFIG_IA64_DIS) += ia64-dis.o -libdis-$(CONFIG_M68K_DIS) += m68k-dis.o -libdis-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o -libdis-$(CONFIG_MIPS_DIS) += mips-dis.o -libdis-$(CONFIG_PPC_DIS) += ppc-dis.o -libdis-$(CONFIG_S390_DIS) += s390-dis.o -libdis-$(CONFIG_SH4_DIS) += sh4-dis.o -libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o -libdis-$(CONFIG_LM32_DIS) += lm32-dis.o +universal-obj-y += disas/ ###################################################################### # trace @@ -252,5 +238,6 @@ nested-vars += \ block-obj-y \ user-obj-y \ common-obj-y \ + universal-obj-y \ extra-obj-y dummy := $(call unnest-vars) diff --git a/Makefile.target b/Makefile.target index 927347bac28..f3536513693 100644 --- a/Makefile.target +++ b/Makefile.target @@ -70,9 +70,8 @@ obj-y = exec.o translate-all.o cpu-exec.o obj-y += tcg/tcg.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-y += fpu/softfloat.o -obj-y += disas.o -obj-$(CONFIG_TCI_DIS) += tci-dis.o obj-y += target-$(TARGET_BASE_ARCH)/ +obj-y += disas.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci @@ -156,11 +155,9 @@ all-obj-y += $(addprefix ../, $(universal-obj-y)) ifdef CONFIG_SOFTMMU all-obj-y += $(addprefix ../, $(common-obj-y)) -all-obj-y += $(addprefix ../libdis/, $(libdis-y)) all-obj-y += $(addprefix ../, $(trace-obj-y)) else all-obj-y += $(addprefix ../libuser/, $(user-obj-y)) -all-obj-y += $(addprefix ../libdis-user/, $(libdis-y)) endif #CONFIG_LINUX_USER ifdef QEMU_PROGW diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 55b213609e8..a6cd3ab4f36 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -10,7 +10,7 @@ #include #include "qemu.h" -#include "disas.h" +#include "disas/disas.h" #ifdef _ARCH_PPC64 #undef ARCH_DLINFO diff --git a/configure b/configure index d2ad1819d5c..f180e172a77 100755 --- a/configure +++ b/configure @@ -3697,11 +3697,6 @@ if test -f ${config_host_ld}~ ; then fi fi -for d in libdis libdis-user; do - symlink "$source_path/Makefile.dis" "$d/Makefile" - echo > $d/config.mak -done - # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers @@ -4043,83 +4038,77 @@ if test "$linux" = "yes" ; then includes="-I\$(SRC_PATH)/linux-headers $includes" fi -if test "$target_user_only" = "yes" ; then - libdis_config_mak=libdis-user/config.mak -else - libdis_config_mak=libdis/config.mak -fi - for i in $ARCH $TARGET_BASE_ARCH ; do case "$i" in alpha) echo "CONFIG_ALPHA_DIS=y" >> $config_target_mak - echo "CONFIG_ALPHA_DIS=y" >> $libdis_config_mak + echo "CONFIG_ALPHA_DIS=y" >> config-all-disas.mak ;; arm) echo "CONFIG_ARM_DIS=y" >> $config_target_mak - echo "CONFIG_ARM_DIS=y" >> $libdis_config_mak + echo "CONFIG_ARM_DIS=y" >> config-all-disas.mak ;; cris) echo "CONFIG_CRIS_DIS=y" >> $config_target_mak - echo "CONFIG_CRIS_DIS=y" >> $libdis_config_mak + echo "CONFIG_CRIS_DIS=y" >> config-all-disas.mak ;; hppa) echo "CONFIG_HPPA_DIS=y" >> $config_target_mak - echo "CONFIG_HPPA_DIS=y" >> $libdis_config_mak + echo "CONFIG_HPPA_DIS=y" >> config-all-disas.mak ;; i386|x86_64) echo "CONFIG_I386_DIS=y" >> $config_target_mak - echo "CONFIG_I386_DIS=y" >> $libdis_config_mak + echo "CONFIG_I386_DIS=y" >> config-all-disas.mak ;; ia64*) echo "CONFIG_IA64_DIS=y" >> $config_target_mak - echo "CONFIG_IA64_DIS=y" >> $libdis_config_mak + echo "CONFIG_IA64_DIS=y" >> config-all-disas.mak ;; lm32) echo "CONFIG_LM32_DIS=y" >> $config_target_mak - echo "CONFIG_LM32_DIS=y" >> $libdis_config_mak + echo "CONFIG_LM32_DIS=y" >> config-all-disas.mak ;; m68k) echo "CONFIG_M68K_DIS=y" >> $config_target_mak - echo "CONFIG_M68K_DIS=y" >> $libdis_config_mak + echo "CONFIG_M68K_DIS=y" >> config-all-disas.mak ;; microblaze*) echo "CONFIG_MICROBLAZE_DIS=y" >> $config_target_mak - echo "CONFIG_MICROBLAZE_DIS=y" >> $libdis_config_mak + echo "CONFIG_MICROBLAZE_DIS=y" >> config-all-disas.mak ;; mips*) echo "CONFIG_MIPS_DIS=y" >> $config_target_mak - echo "CONFIG_MIPS_DIS=y" >> $libdis_config_mak + echo "CONFIG_MIPS_DIS=y" >> config-all-disas.mak ;; or32) echo "CONFIG_OPENRISC_DIS=y" >> $config_target_mak - echo "CONFIG_OPENRISC_DIS=y" >> $libdis_config_mak + echo "CONFIG_OPENRISC_DIS=y" >> config-all-disas.mak ;; ppc*) echo "CONFIG_PPC_DIS=y" >> $config_target_mak - echo "CONFIG_PPC_DIS=y" >> $libdis_config_mak + echo "CONFIG_PPC_DIS=y" >> config-all-disas.mak ;; s390*) echo "CONFIG_S390_DIS=y" >> $config_target_mak - echo "CONFIG_S390_DIS=y" >> $libdis_config_mak + echo "CONFIG_S390_DIS=y" >> config-all-disas.mak ;; sh4) echo "CONFIG_SH4_DIS=y" >> $config_target_mak - echo "CONFIG_SH4_DIS=y" >> $libdis_config_mak + echo "CONFIG_SH4_DIS=y" >> config-all-disas.mak ;; sparc*) echo "CONFIG_SPARC_DIS=y" >> $config_target_mak - echo "CONFIG_SPARC_DIS=y" >> $libdis_config_mak + echo "CONFIG_SPARC_DIS=y" >> config-all-disas.mak ;; xtensa*) echo "CONFIG_XTENSA_DIS=y" >> $config_target_mak - echo "CONFIG_XTENSA_DIS=y" >> $libdis_config_mak + echo "CONFIG_XTENSA_DIS=y" >> config-all-disas.mak ;; esac done if test "$tcg_interpreter" = "yes" ; then echo "CONFIG_TCI_DIS=y" >> $config_target_mak - echo "CONFIG_TCI_DIS=y" >> $libdis_config_mak + echo "CONFIG_TCI_DIS=y" >> config-all-disas.mak fi case "$ARCH" in diff --git a/cpu-exec.c b/cpu-exec.c index 904ee73c7b5..b5a32b84e45 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -18,7 +18,7 @@ */ #include "config.h" #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg.h" #include "qemu-barrier.h" #include "qtest.h" diff --git a/disas.c b/disas.c index 6da1dd09f48..8157b96fc1f 100644 --- a/disas.c +++ b/disas.c @@ -1,11 +1,11 @@ /* General "disassemble this chunk" code. Used for debugging. */ #include "config.h" -#include "dis-asm.h" +#include "disas/bfd.h" #include "elf.h" #include #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" typedef struct CPUDebug { struct disassemble_info info; diff --git a/disas/Makefile.objs b/disas/Makefile.objs new file mode 100644 index 00000000000..91344298450 --- /dev/null +++ b/disas/Makefile.objs @@ -0,0 +1,16 @@ +universal-obj-$(CONFIG_ALPHA_DIS) += alpha.o +universal-obj-$(CONFIG_ARM_DIS) += arm.o +universal-obj-$(CONFIG_CRIS_DIS) += cris.o +universal-obj-$(CONFIG_HPPA_DIS) += hppa.o +universal-obj-$(CONFIG_I386_DIS) += i386.o +universal-obj-$(CONFIG_IA64_DIS) += ia64.o +universal-obj-$(CONFIG_M68K_DIS) += m68k.o +universal-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o +universal-obj-$(CONFIG_MIPS_DIS) += mips.o +universal-obj-$(CONFIG_PPC_DIS) += ppc.o +universal-obj-$(CONFIG_S390_DIS) += s390.o +universal-obj-$(CONFIG_SH4_DIS) += sh4.o +universal-obj-$(CONFIG_SPARC_DIS) += sparc.o +universal-obj-$(CONFIG_LM32_DIS) += lm32.o + +universal-obj-$(CONFIG_TCI_DIS) += tci.o diff --git a/alpha-dis.c b/disas/alpha.c similarity index 99% rename from alpha-dis.c rename to disas/alpha.c index ae331b35b8f..a950b9cee0c 100644 --- a/alpha-dis.c +++ b/disas/alpha.c @@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see . */ #include -#include "dis-asm.h" +#include "disas/bfd.h" /* MAX is redefined below, so remove any previous definition. */ #undef MAX diff --git a/arm-dis.c b/disas/arm.c similarity index 99% rename from arm-dis.c rename to disas/arm.c index 6bc4d716981..4927d8ad7ca 100644 --- a/arm-dis.c +++ b/disas/arm.c @@ -22,7 +22,7 @@ /* Start of qemu specific additions. Mostly this is stub definitions for things we don't care about. */ -#include "dis-asm.h" +#include "disas/bfd.h" #define ATTRIBUTE_UNUSED __attribute__((unused)) #define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n') diff --git a/cris-dis.c b/disas/cris.c similarity index 99% rename from cris-dis.c rename to disas/cris.c index 1d174ba8ccf..9dfb4e38855 100644 --- a/cris-dis.c +++ b/disas/cris.c @@ -19,7 +19,7 @@ along with this program; if not, see . */ #include "qemu-common.h" -#include "dis-asm.h" +#include "disas/bfd.h" //#include "sysdep.h" #include "target-cris/opcode-cris.h" //#include "libiberty.h" diff --git a/hppa-dis.c b/disas/hppa.c similarity index 99% rename from hppa-dis.c rename to disas/hppa.c index 420a7d22d0f..c7c8be66a28 100644 --- a/hppa-dis.c +++ b/disas/hppa.c @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#include "dis-asm.h" +#include "disas/bfd.h" /* HP PA-RISC SOM object file format: definitions internal to BFD. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, diff --git a/i386-dis.c b/disas/i386.c similarity index 99% rename from i386-dis.c rename to disas/i386.c index c4a81c99ad5..3b006b13e09 100644 --- a/i386-dis.c +++ b/disas/i386.c @@ -32,7 +32,7 @@ the Intel manual for details. */ #include -#include "dis-asm.h" +#include "disas/bfd.h" /* include/opcode/i386.h r1.78 */ /* opcode/i386.h -- Intel 80386 opcode macros diff --git a/ia64-dis.c b/disas/ia64.c similarity index 99% rename from ia64-dis.c rename to disas/ia64.c index 2a103e6b5cb..a8fe26c4136 100644 --- a/ia64-dis.c +++ b/disas/ia64.c @@ -21,7 +21,7 @@ #include #include -#include "dis-asm.h" +#include "disas/bfd.h" /* ia64.h -- Header file for ia64 opcode table Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006 diff --git a/lm32-dis.c b/disas/lm32.c similarity index 99% rename from lm32-dis.c rename to disas/lm32.c index 709ed3215cd..a8eefe05b18 100644 --- a/lm32-dis.c +++ b/disas/lm32.c @@ -19,7 +19,7 @@ */ #include -#include "dis-asm.h" +#include "disas/bfd.h" typedef enum { LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB, diff --git a/m68k-dis.c b/disas/m68k.c similarity index 99% rename from m68k-dis.c rename to disas/m68k.c index 2b155de51c4..c950241f790 100644 --- a/m68k-dis.c +++ b/disas/m68k.c @@ -5,7 +5,7 @@ #include #include -#include "dis-asm.h" +#include "disas/bfd.h" /* **** floatformat.h from sourceware.org CVS 2005-08-14. */ /* IEEE floating point support declarations, for GDB, the GNU Debugger. diff --git a/microblaze-dis.c b/disas/microblaze.c similarity index 99% rename from microblaze-dis.c rename to disas/microblaze.c index 16c312f2f5d..ec91af386d6 100644 --- a/microblaze-dis.c +++ b/disas/microblaze.c @@ -582,7 +582,7 @@ char pvr_register_prefix[] = "rpvr"; #endif /* MICROBLAZE_OPC */ -#include "dis-asm.h" +#include "disas/bfd.h" #include #define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW) diff --git a/mips-dis.c b/disas/mips.c similarity index 99% rename from mips-dis.c rename to disas/mips.c index e3a6e0b49ec..2106b574cbd 100644 --- a/mips-dis.c +++ b/disas/mips.c @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#include "dis-asm.h" +#include "disas/bfd.h" /* mips.h. Mips opcode list for GDB, the GNU debugger. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/ppc-dis.c b/disas/ppc.c similarity index 99% rename from ppc-dis.c rename to disas/ppc.c index bc98cbe655d..c149506fd88 100644 --- a/ppc-dis.c +++ b/disas/ppc.c @@ -18,7 +18,7 @@ the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this file; see the file COPYING. If not, see . */ -#include "dis-asm.h" +#include "disas/bfd.h" #define BFD_DEFAULT_TARGET_SIZE 64 /* ppc.h -- Header file for PowerPC opcode table diff --git a/s390-dis.c b/disas/s390.c similarity index 99% rename from s390-dis.c rename to disas/s390.c index 8abcdf0128a..0859dfa19fe 100644 --- a/s390-dis.c +++ b/disas/s390.c @@ -21,7 +21,7 @@ 02110-1301, USA. */ #include "qemu-common.h" -#include "dis-asm.h" +#include "disas/bfd.h" /* include/opcode/s390.h revision 1.9 */ /* s390.h -- Header file for S390 opcode table diff --git a/sh4-dis.c b/disas/sh4.c similarity index 99% rename from sh4-dis.c rename to disas/sh4.c index 673bc783801..f6cadd55c00 100644 --- a/sh4-dis.c +++ b/disas/sh4.c @@ -16,7 +16,7 @@ along with this program; if not, see . */ #include -#include "dis-asm.h" +#include "disas/bfd.h" #define DEFINE_TABLE diff --git a/sparc-dis.c b/disas/sparc.c similarity index 99% rename from sparc-dis.c rename to disas/sparc.c index 1d017faaa32..8eb22e6fc3a 100644 --- a/sparc-dis.c +++ b/disas/sparc.c @@ -27,7 +27,7 @@ see . */ #include -#include "dis-asm.h" +#include "disas/bfd.h" /* The SPARC opcode table (and other related data) is defined in the opcodes library in sparc-opc.c. If you change anything here, make diff --git a/tci-dis.c b/disas/tci.c similarity index 98% rename from tci-dis.c rename to disas/tci.c index 10c411be8c1..a606b63a2a8 100644 --- a/tci-dis.c +++ b/disas/tci.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "dis-asm.h" +#include "disas/bfd.h" #include "tcg/tcg.h" /* Disassemble TCI bytecode. */ diff --git a/hw/loader.c b/hw/loader.c index ba01ca6638c..52f09407786 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -43,7 +43,7 @@ */ #include "hw.h" -#include "disas.h" +#include "disas/disas.h" #include "monitor.h" #include "sysemu.h" #include "uboot_image.h" diff --git a/dis-asm.h b/include/disas/bfd.h similarity index 100% rename from dis-asm.h rename to include/disas/bfd.h diff --git a/disas.h b/include/disas/disas.h similarity index 100% rename from disas.h rename to include/disas/disas.h diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 1d8bcb4e798..89db49ccaac 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -14,7 +14,7 @@ #include #include "qemu.h" -#include "disas.h" +#include "disas/disas.h" #ifdef _ARCH_PPC64 #undef ARCH_DLINFO diff --git a/monitor.c b/monitor.c index a92ab44384e..bd63768c271 100644 --- a/monitor.c +++ b/monitor.c @@ -41,7 +41,7 @@ #include "console.h" #include "blockdev.h" #include "audio/audio.h" -#include "disas.h" +#include "disas/disas.h" #include "balloon.h" #include "qemu-timer.h" #include "migration.h" diff --git a/qemu-log.h b/qemu-log.h index 344eca3f1b0..58f69cb494d 100644 --- a/qemu-log.h +++ b/qemu-log.h @@ -3,7 +3,7 @@ #include #ifdef NEED_CPU_H -#include "disas.h" +#include "disas/disas.h" #endif /* Private global variables, don't use */ diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 71fe1a1ab01..f57c8fd91fe 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -18,7 +18,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "host-utils.h" #include "tcg-op.h" diff --git a/target-arm/translate.c b/target-arm/translate.c index 3cf36045177..10c548d5ba4 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -25,7 +25,7 @@ #include #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-log.h" diff --git a/target-cris/translate.c b/target-cris/translate.c index 60bdc241ef0..2a92727843d 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -24,7 +24,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "helper.h" #include "mmu.h" diff --git a/target-i386/translate.c b/target-i386/translate.c index f394ea69a56..026201e98e2 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -24,7 +24,7 @@ #include #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "helper.h" diff --git a/target-lm32/translate.c b/target-lm32/translate.c index e131ad1b5fa..9683b9a4b54 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -18,7 +18,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "helper.h" #include "tcg-op.h" diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 11defc6e040..d955c7a4093 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -19,7 +19,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-log.h" diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c index efaa123a14b..530e0b5fb0f 100644 --- a/target-microblaze/helper.c +++ b/target-microblaze/helper.c @@ -198,7 +198,7 @@ void do_interrupt(CPUMBState *env) t = (env->sregs[SR_MSR] & (MSR_VM | MSR_UM)) << 1; #if 0 -#include "disas.h" +#include "disas/disas.h" /* Useful instrumentation when debugging interrupt issues in either the models or in sw. */ diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 6ceff02a12c..5946a5ba5c5 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -19,7 +19,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "helper.h" #include "microblaze-decode.h" diff --git a/target-mips/translate.c b/target-mips/translate.c index 65e6725cc91..44e7617395a 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -22,7 +22,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "helper.h" diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index 9ac999a9c81..2cb9d69826c 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -20,7 +20,7 @@ #include "cpu.h" #include "exec-all.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-common.h" #include "qemu-log.h" diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 653c2fdb1f4..8a53105f89b 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -19,7 +19,7 @@ */ #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "host-utils.h" diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index e63627cac15..984ca9fc63c 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -23,7 +23,7 @@ * inside "#if defined(TODO) ... #endif" statements to make tests easier. */ -#include "dis-asm.h" +#include "disas/bfd.h" #include "gdbstub.h" #include #include "kvm_ppc.h" diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 787e3c6963e..6e144a67a2f 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -30,7 +30,7 @@ #endif #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-log.h" diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 86493e1b03a..41d53e5c514 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -21,7 +21,7 @@ //#define SH4_SINGLE_STEP #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "helper.h" diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 5859f2e8018..88802b84867 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -25,7 +25,7 @@ #include #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "helper.h" #include "tcg-op.h" diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index 3951758fc89..8c49f4d7016 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -15,7 +15,7 @@ #include #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-log.h" diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 5d8762c0ca9..4e81cbd9ecc 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -32,7 +32,7 @@ #include "cpu.h" #include "exec-all.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" #include "qemu-log.h" #include "sysemu.h" diff --git a/translate-all.c b/translate-all.c index 164870a68cc..bbe06db6eb4 100644 --- a/translate-all.c +++ b/translate-all.c @@ -33,7 +33,7 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg.h" #include "qemu-timer.h" #include "memory.h" diff --git a/user-exec.c b/user-exec.c index 1185cb03c8c..63fb05384f9 100644 --- a/user-exec.c +++ b/user-exec.c @@ -18,7 +18,7 @@ */ #include "config.h" #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg.h" #undef EAX diff --git a/vl.c b/vl.c index 3ebf01f8f16..571a49b9315 100644 --- a/vl.c +++ b/vl.c @@ -154,7 +154,7 @@ int main(int argc, char **argv) #endif #include "qtest.h" -#include "disas.h" +#include "disas/disas.h" #include "qemu_socket.h"