diff options
-rw-r--r-- | Makefile.target | 6 | ||||
-rw-r--r-- | accel/tcg/Makefile.objs | 2 | ||||
-rw-r--r-- | accel/tcg/trace-events | 3 | ||||
-rw-r--r-- | accel/tcg/translate-all.c (renamed from translate-all.c) | 2 | ||||
-rw-r--r-- | accel/tcg/translate-all.h (renamed from translate-all.h) | 0 | ||||
-rw-r--r-- | accel/tcg/translate-common.c (renamed from translate-common.c) | 0 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | tcg/tcg-runtime.c (renamed from tcg-runtime.c) | 0 | ||||
-rw-r--r-- | tcg/tci.c (renamed from tci.c) | 0 | ||||
-rw-r--r-- | trace-events | 4 |
10 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.target b/Makefile.target index 18470dd..73cd9c6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,17 +88,15 @@ all: $(PROGS) stap ######################################################### # cpu emulator library -obj-y = exec.o translate-all.o +obj-y = exec.o obj-y += accel/ -obj-y += translate-common.o obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o +obj-y += tcg/tcg-common.o tcg/tcg-runtime.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o -obj-y += tcg/tcg-common.o obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-y += fpu/softfloat.o obj-y += target/$(TARGET_BASE_ARCH)/ obj-y += disas.o -obj-y += tcg-runtime.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 940379b..f173cd5 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -1,3 +1,3 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o -obj-y += cpu-exec.o cpu-exec-common.o +obj-y += cpu-exec.o cpu-exec-common.o translate-all.o translate-common.o diff --git a/accel/tcg/trace-events b/accel/tcg/trace-events index f2db388..2de8359 100644 --- a/accel/tcg/trace-events +++ b/accel/tcg/trace-events @@ -5,3 +5,6 @@ disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=%x" + +# translate-all.c +translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p" diff --git a/translate-all.c b/accel/tcg/translate-all.c index b3ee876..7b25a16 100644 --- a/translate-all.c +++ b/accel/tcg/translate-all.c @@ -25,7 +25,7 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" -#include "trace-root.h" +#include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" diff --git a/translate-all.h b/accel/tcg/translate-all.h index ba8e4d6..ba8e4d6 100644 --- a/translate-all.h +++ b/accel/tcg/translate-all.h diff --git a/translate-common.c b/accel/tcg/translate-common.c index 40fe5a1..40fe5a1 100644 --- a/translate-common.c +++ b/accel/tcg/translate-common.c @@ -407,7 +407,7 @@ QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv $QEMU_CFLAGS" QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" -QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include" +QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/accel/tcg -I\$(SRC_PATH)/include" if test "$debug_info" = "yes"; then CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" diff --git a/tcg-runtime.c b/tcg/tcg-runtime.c index 7fa90ce..7fa90ce 100644 --- a/tcg-runtime.c +++ b/tcg/tcg-runtime.c diff --git a/trace-events b/trace-events index 279aede..62d8100 100644 --- a/trace-events +++ b/trace-events @@ -68,10 +68,6 @@ kvm_irqchip_add_msi_route(char *name, int vector, int virq) "dev %s vector %d vi kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d" kvm_irqchip_release_virq(int virq) "virq %d" -# TCG related tracing (mostly disabled by default) -# translate-all.c -translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p" - # memory.c memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr %#"PRIx64" value %#"PRIx64" size %u" memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr %#"PRIx64" value %#"PRIx64" size %u" |