mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: kill libdis, move disassemblers to disas/

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-10-24 11:12:21 +02:00
parent c1c9367216
commit 76cad71136
51 changed files with 86 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
config-devices.* config-devices.*
config-all-devices.* config-all-devices.*
config-all-disas.*
config-host.* config-host.*
config-target.* config-target.*
trace.h trace.h

9
Makefile
View File

@ -99,6 +99,7 @@ defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
-include config-all-devices.mak -include config-all-devices.mak
-include config-all-disas.mak
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
@ -129,9 +130,9 @@ $(SRC_PATH)/pixman/configure:
$(SUBDIR_RULES): libqemustub.a $(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_RULES=$(patsubst %,romsubdir-%, $(ROMS))
romsubdir-%: 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 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: clean:
# avoid old build problems by removing potentially incorrect old files # avoid old build problems by removing potentially incorrect old files
@ -255,7 +256,7 @@ qemu-%.tar.bz2:
distclean: clean 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-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 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.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 rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys

20
Makefile.dis
View File

@ -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 *~

19
Makefile.objs
View File

@ -127,24 +127,10 @@ user-obj-y += $(trace-obj-y)
user-obj-y += qom/ user-obj-y += qom/
###################################################################### ######################################################################
# libdis # disassemblers
# NOTE: the disassembler code is only needed for debugging # NOTE: the disassembler code is only needed for debugging
libdis-y = universal-obj-y += disas/
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
###################################################################### ######################################################################
# trace # trace
@ -252,5 +238,6 @@ nested-vars += \
block-obj-y \ block-obj-y \
user-obj-y \ user-obj-y \
common-obj-y \ common-obj-y \
universal-obj-y \
extra-obj-y extra-obj-y
dummy := $(call unnest-vars) dummy := $(call unnest-vars)

5
Makefile.target
View File

@ -70,9 +70,8 @@ obj-y = exec.o translate-all.o cpu-exec.o
obj-y += tcg/tcg.o tcg/optimize.o obj-y += tcg/tcg.o tcg/optimize.o
obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o
obj-y += fpu/softfloat.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 += target-$(TARGET_BASE_ARCH)/
obj-y += disas.o
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci 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 ifdef CONFIG_SOFTMMU
all-obj-y += $(addprefix ../, $(common-obj-y)) all-obj-y += $(addprefix ../, $(common-obj-y))
all-obj-y += $(addprefix ../libdis/, $(libdis-y))
all-obj-y += $(addprefix ../, $(trace-obj-y)) all-obj-y += $(addprefix ../, $(trace-obj-y))
else else
all-obj-y += $(addprefix ../libuser/, $(user-obj-y)) all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
all-obj-y += $(addprefix ../libdis-user/, $(libdis-y))
endif #CONFIG_LINUX_USER endif #CONFIG_LINUX_USER
ifdef QEMU_PROGW ifdef QEMU_PROGW

2
bsd-user/elfload.c
View File

@ -10,7 +10,7 @@
#include <string.h> #include <string.h>
#include "qemu.h" #include "qemu.h"
#include "disas.h" #include "disas/disas.h"
#ifdef _ARCH_PPC64 #ifdef _ARCH_PPC64
#undef ARCH_DLINFO #undef ARCH_DLINFO

45
configure vendored
View File

@ -3697,11 +3697,6 @@ if test -f ${config_host_ld}~ ; then
fi fi
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 # use included Linux headers
if test "$linux" = "yes" ; then if test "$linux" = "yes" ; then
mkdir -p linux-headers mkdir -p linux-headers
@ -4043,83 +4038,77 @@ if test "$linux" = "yes" ; then
includes="-I\$(SRC_PATH)/linux-headers $includes" includes="-I\$(SRC_PATH)/linux-headers $includes"
fi 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 for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in case "$i" in
alpha) alpha)
echo "CONFIG_ALPHA_DIS=y" >> $config_target_mak 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) arm)
echo "CONFIG_ARM_DIS=y" >> $config_target_mak 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) cris)
echo "CONFIG_CRIS_DIS=y" >> $config_target_mak 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) hppa)
echo "CONFIG_HPPA_DIS=y" >> $config_target_mak 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) i386|x86_64)
echo "CONFIG_I386_DIS=y" >> $config_target_mak 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*) ia64*)
echo "CONFIG_IA64_DIS=y" >> $config_target_mak 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) lm32)
echo "CONFIG_LM32_DIS=y" >> $config_target_mak 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) m68k)
echo "CONFIG_M68K_DIS=y" >> $config_target_mak 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*) microblaze*)
echo "CONFIG_MICROBLAZE_DIS=y" >> $config_target_mak 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*) mips*)
echo "CONFIG_MIPS_DIS=y" >> $config_target_mak 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) or32)
echo "CONFIG_OPENRISC_DIS=y" >> $config_target_mak 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*) ppc*)
echo "CONFIG_PPC_DIS=y" >> $config_target_mak 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*) s390*)
echo "CONFIG_S390_DIS=y" >> $config_target_mak 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) sh4)
echo "CONFIG_SH4_DIS=y" >> $config_target_mak 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*) sparc*)
echo "CONFIG_SPARC_DIS=y" >> $config_target_mak 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*) xtensa*)
echo "CONFIG_XTENSA_DIS=y" >> $config_target_mak 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 esac
done done
if test "$tcg_interpreter" = "yes" ; then if test "$tcg_interpreter" = "yes" ; then
echo "CONFIG_TCI_DIS=y" >> $config_target_mak 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 fi
case "$ARCH" in case "$ARCH" in

2
cpu-exec.c
View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg.h" #include "tcg.h"
#include "qemu-barrier.h" #include "qemu-barrier.h"
#include "qtest.h" #include "qtest.h"

4
disas.c
View File

@ -1,11 +1,11 @@
/* General "disassemble this chunk" code. Used for debugging. */ /* General "disassemble this chunk" code. Used for debugging. */
#include "config.h" #include "config.h"
#include "dis-asm.h" #include "disas/bfd.h"
#include "elf.h" #include "elf.h"
#include <errno.h> #include <errno.h>
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
typedef struct CPUDebug { typedef struct CPUDebug {
struct disassemble_info info; struct disassemble_info info;

16
disas/Makefile.objs Normal file
View File

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

2
alpha-dis.c → disas/alpha.c
View File

@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <stdio.h> #include <stdio.h>
#include "dis-asm.h" #include "disas/bfd.h"
/* MAX is redefined below, so remove any previous definition. */ /* MAX is redefined below, so remove any previous definition. */
#undef MAX #undef MAX

2
arm-dis.c → disas/arm.c
View File

@ -22,7 +22,7 @@
/* Start of qemu specific additions. Mostly this is stub definitions /* Start of qemu specific additions. Mostly this is stub definitions
for things we don't care about. */ for things we don't care about. */
#include "dis-asm.h" #include "disas/bfd.h"
#define ATTRIBUTE_UNUSED __attribute__((unused)) #define ATTRIBUTE_UNUSED __attribute__((unused))
#define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n') #define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n')

2
cris-dis.c → disas/cris.c
View File

@ -19,7 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "qemu-common.h" #include "qemu-common.h"
#include "dis-asm.h" #include "disas/bfd.h"
//#include "sysdep.h" //#include "sysdep.h"
#include "target-cris/opcode-cris.h" #include "target-cris/opcode-cris.h"
//#include "libiberty.h" //#include "libiberty.h"

2
hppa-dis.c → disas/hppa.c
View File

@ -18,7 +18,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "dis-asm.h" #include "disas/bfd.h"
/* HP PA-RISC SOM object file format: definitions internal to BFD. /* HP PA-RISC SOM object file format: definitions internal to BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,

2
i386-dis.c → disas/i386.c
View File

@ -32,7 +32,7 @@
the Intel manual for details. */ the Intel manual for details. */
#include <stdlib.h> #include <stdlib.h>
#include "dis-asm.h" #include "disas/bfd.h"
/* include/opcode/i386.h r1.78 */ /* include/opcode/i386.h r1.78 */
/* opcode/i386.h -- Intel 80386 opcode macros /* opcode/i386.h -- Intel 80386 opcode macros

2
ia64-dis.c → disas/ia64.c
View File

@ -21,7 +21,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "dis-asm.h" #include "disas/bfd.h"
/* ia64.h -- Header file for ia64 opcode table /* ia64.h -- Header file for ia64 opcode table
Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006 Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006

2
lm32-dis.c → disas/lm32.c
View File

@ -19,7 +19,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "dis-asm.h" #include "disas/bfd.h"
typedef enum { typedef enum {
LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB, LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB,

2
m68k-dis.c → disas/m68k.c
View File

@ -5,7 +5,7 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include "dis-asm.h" #include "disas/bfd.h"
/* **** floatformat.h from sourceware.org CVS 2005-08-14. */ /* **** floatformat.h from sourceware.org CVS 2005-08-14. */
/* IEEE floating point support declarations, for GDB, the GNU Debugger. /* IEEE floating point support declarations, for GDB, the GNU Debugger.

2
microblaze-dis.c → disas/microblaze.c
View File

@ -582,7 +582,7 @@ char pvr_register_prefix[] = "rpvr";
#endif /* MICROBLAZE_OPC */ #endif /* MICROBLAZE_OPC */
#include "dis-asm.h" #include "disas/bfd.h"
#include <strings.h> #include <strings.h>
#define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW) #define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW)

2
mips-dis.c → disas/mips.c
View File

@ -19,7 +19,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "dis-asm.h" #include "disas/bfd.h"
/* mips.h. Mips opcode list for GDB, the GNU debugger. /* mips.h. Mips opcode list for GDB, the GNU debugger.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003

2
ppc-dis.c → disas/ppc.c
View File

@ -18,7 +18,7 @@ the GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not, along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */ see <http://www.gnu.org/licenses/>. */
#include "dis-asm.h" #include "disas/bfd.h"
#define BFD_DEFAULT_TARGET_SIZE 64 #define BFD_DEFAULT_TARGET_SIZE 64
/* ppc.h -- Header file for PowerPC opcode table /* ppc.h -- Header file for PowerPC opcode table

2
s390-dis.c → disas/s390.c
View File

@ -21,7 +21,7 @@
02110-1301, USA. */ 02110-1301, USA. */
#include "qemu-common.h" #include "qemu-common.h"
#include "dis-asm.h" #include "disas/bfd.h"
/* include/opcode/s390.h revision 1.9 */ /* include/opcode/s390.h revision 1.9 */
/* s390.h -- Header file for S390 opcode table /* s390.h -- Header file for S390 opcode table

2
sh4-dis.c → disas/sh4.c
View File

@ -16,7 +16,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h> #include <stdio.h>
#include "dis-asm.h" #include "disas/bfd.h"
#define DEFINE_TABLE #define DEFINE_TABLE

2
sparc-dis.c → disas/sparc.c
View File

@ -27,7 +27,7 @@
see <http://www.gnu.org/licenses/>. */ see <http://www.gnu.org/licenses/>. */
#include <stdlib.h> #include <stdlib.h>
#include "dis-asm.h" #include "disas/bfd.h"
/* The SPARC opcode table (and other related data) is defined in /* The SPARC opcode table (and other related data) is defined in
the opcodes library in sparc-opc.c. If you change anything here, make the opcodes library in sparc-opc.c. If you change anything here, make

2
tci-dis.c → disas/tci.c
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "dis-asm.h" #include "disas/bfd.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
/* Disassemble TCI bytecode. */ /* Disassemble TCI bytecode. */

2
hw/loader.c
View File

@ -43,7 +43,7 @@
*/ */
#include "hw.h" #include "hw.h"
#include "disas.h" #include "disas/disas.h"
#include "monitor.h" #include "monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "uboot_image.h" #include "uboot_image.h"

0
dis-asm.h → include/disas/bfd.h
View File

0
disas.h → include/disas/disas.h
View File

2
linux-user/elfload.c
View File

@ -14,7 +14,7 @@
#include <time.h> #include <time.h>
#include "qemu.h" #include "qemu.h"
#include "disas.h" #include "disas/disas.h"
#ifdef _ARCH_PPC64 #ifdef _ARCH_PPC64
#undef ARCH_DLINFO #undef ARCH_DLINFO

2
monitor.c
View File

@ -41,7 +41,7 @@
#include "console.h" #include "console.h"
#include "blockdev.h" #include "blockdev.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "disas.h" #include "disas/disas.h"
#include "balloon.h" #include "balloon.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "migration.h" #include "migration.h"

2
qemu-log.h
View File

@ -3,7 +3,7 @@
#include <stdarg.h> #include <stdarg.h>
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
#include "disas.h" #include "disas/disas.h"
#endif #endif
/* Private global variables, don't use */ /* Private global variables, don't use */

2
target-alpha/translate.c
View File

@ -18,7 +18,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "host-utils.h" #include "host-utils.h"
#include "tcg-op.h" #include "tcg-op.h"

2
target-arm/translate.c
View File

@ -25,7 +25,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-log.h" #include "qemu-log.h"

2
target-cris/translate.c
View File

@ -24,7 +24,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "helper.h" #include "helper.h"
#include "mmu.h" #include "mmu.h"

2
target-i386/translate.c
View File

@ -24,7 +24,7 @@
#include <signal.h> #include <signal.h>
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "helper.h" #include "helper.h"

2
target-lm32/translate.c
View File

@ -18,7 +18,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "helper.h" #include "helper.h"
#include "tcg-op.h" #include "tcg-op.h"

2
target-m68k/translate.c
View File

@ -19,7 +19,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-log.h" #include "qemu-log.h"

2
target-microblaze/helper.c
View File

@ -198,7 +198,7 @@ void do_interrupt(CPUMBState *env)
t = (env->sregs[SR_MSR] & (MSR_VM | MSR_UM)) << 1; t = (env->sregs[SR_MSR] & (MSR_VM | MSR_UM)) << 1;
#if 0 #if 0
#include "disas.h" #include "disas/disas.h"
/* Useful instrumentation when debugging interrupt issues in either /* Useful instrumentation when debugging interrupt issues in either
the models or in sw. */ the models or in sw. */

2
target-microblaze/translate.c
View File

@ -19,7 +19,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "helper.h" #include "helper.h"
#include "microblaze-decode.h" #include "microblaze-decode.h"

2
target-mips/translate.c
View File

@ -22,7 +22,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "helper.h" #include "helper.h"

2
target-openrisc/translate.c
View File

@ -20,7 +20,7 @@
#include "cpu.h" #include "cpu.h"
#include "exec-all.h" #include "exec-all.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-log.h" #include "qemu-log.h"

2
target-ppc/translate.c
View File

@ -19,7 +19,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "host-utils.h" #include "host-utils.h"

2
target-ppc/translate_init.c
View File

@ -23,7 +23,7 @@
* inside "#if defined(TODO) ... #endif" statements to make tests easier. * inside "#if defined(TODO) ... #endif" statements to make tests easier.
*/ */
#include "dis-asm.h" #include "disas/bfd.h"
#include "gdbstub.h" #include "gdbstub.h"
#include <kvm.h> #include <kvm.h>
#include "kvm_ppc.h" #include "kvm_ppc.h"

2
target-s390x/translate.c
View File

@ -30,7 +30,7 @@
#endif #endif
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-log.h" #include "qemu-log.h"

2
target-sh4/translate.c
View File

@ -21,7 +21,7 @@
//#define SH4_SINGLE_STEP //#define SH4_SINGLE_STEP
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "helper.h" #include "helper.h"

2
target-sparc/translate.c
View File

@ -25,7 +25,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "helper.h" #include "helper.h"
#include "tcg-op.h" #include "tcg-op.h"

2
target-unicore32/translate.c
View File

@ -15,7 +15,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-log.h" #include "qemu-log.h"

2
target-xtensa/translate.c
View File

@ -32,7 +32,7 @@
#include "cpu.h" #include "cpu.h"
#include "exec-all.h" #include "exec-all.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg-op.h" #include "tcg-op.h"
#include "qemu-log.h" #include "qemu-log.h"
#include "sysemu.h" #include "sysemu.h"

2
translate-all.c
View File

@ -33,7 +33,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#define NO_CPU_IO_DEFS #define NO_CPU_IO_DEFS
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg.h" #include "tcg.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "memory.h" #include "memory.h"

2
user-exec.c
View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "cpu.h" #include "cpu.h"
#include "disas.h" #include "disas/disas.h"
#include "tcg.h" #include "tcg.h"
#undef EAX #undef EAX

2
vl.c
View File

@ -154,7 +154,7 @@ int main(int argc, char **argv)
#endif #endif
#include "qtest.h" #include "qtest.h"
#include "disas.h" #include "disas/disas.h"
#include "qemu_socket.h" #include "qemu_socket.h"