From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFx8i-0002th-90 for qemu-devel@nongnu.org; Wed, 31 May 2017 02:29:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFx8g-000374-9H for qemu-devel@nongnu.org; Wed, 31 May 2017 02:29:52 -0400 Received: from mga09.intel.com ([134.134.136.24]:28402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dFx8g-00036p-0C for qemu-devel@nongnu.org; Wed, 31 May 2017 02:29:50 -0400 From: Yang Zhong Date: Wed, 31 May 2017 14:29:00 +0800 Message-Id: <1496212144-14947-3-git-send-email-yang.zhong@intel.com> In-Reply-To: <1496212144-14947-1-git-send-email-yang.zhong@intel.com> References: <1496212144-14947-1-git-send-email-yang.zhong@intel.com> Subject: [Qemu-devel] [PATCH v2 2/6] tcg: move translate-all.c to tcg/ subdirectory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eblake@redhat.com Cc: qemu-devel@nongnu.org, pbonzini@redhat.com, anthony.xu@intel.com, Yang Zhong tcg: move translate-all.c to tcg/ subdirectory and also update related trace-events file. Signed-off-by: Yang Zhong --- Makefile.objs | 1 + Makefile.target | 3 ++- tcg/trace-events | 6 ++++++ translate-all.c => tcg/translate-all.c | 2 +- trace-events | 3 --- 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 tcg/trace-events rename translate-all.c => tcg/translate-all.c (99%) diff --git a/Makefile.objs b/Makefile.objs index 2100845..1de6462 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -163,6 +163,7 @@ trace-events-subdirs += target/ppc trace-events-subdirs += qom trace-events-subdirs += linux-user trace-events-subdirs += qapi +trace-events-subdirs += tcg trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events) diff --git a/Makefile.target b/Makefile.target index 3ba2074..5d33174 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,7 +88,8 @@ all: $(PROGS) stap ######################################################### # cpu emulator library -obj-y = exec.o translate-all.o cpu-exec.o +obj-y = exec.o cpu-exec.o +obj-y += tcg/translate-all.o obj-y += translate-common.o obj-y += cpu-exec-common.o obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o diff --git a/tcg/trace-events b/tcg/trace-events new file mode 100644 index 0000000..989a06e --- /dev/null +++ b/tcg/trace-events @@ -0,0 +1,6 @@ +# Trace events for debugging and performance instrumentation +# +# 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" + diff --git a/translate-all.c b/tcg/translate-all.c similarity index 99% rename from translate-all.c rename to tcg/translate-all.c index b3ee876..7b25a16 100644 --- a/translate-all.c +++ b/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/trace-events b/trace-events index 433865f..a25db67 100644 --- a/trace-events +++ b/trace-events @@ -78,9 +78,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" - # 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" -- 1.9.1