From: Yang Zhong <yang.zhong@intel.com>
To: pbonzini@redhat.com
Cc: qemu-devel@nongnu.org, eblake@redhat.com,
laurent.desnogues@gmail.com, anthony.xu@intel.com,
Yang Zhong <yang.zhong@intel.com>
Subject: [Qemu-devel] [PATCH v3 3/4] tcg: move tcg backend files into accel/tcg/
Date: Fri, 2 Jun 2017 14:06:45 +0800 [thread overview]
Message-ID: <1496383606-18060-4-git-send-email-yang.zhong@intel.com> (raw)
In-Reply-To: <1496383606-18060-1-git-send-email-yang.zhong@intel.com>
move tcg-runtime.c, translate-all.(ch) and translate-common.c into
accel/tcg/ subdirectory and updated related trace-events file.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
Makefile.target | 5 +----
accel/tcg/Makefile.objs | 3 ++-
tcg-runtime.c => accel/tcg/tcg-runtime.c | 0
tci.c => accel/tcg/tci.c | 0
accel/tcg/trace-events | 3 +++
translate-all.c => accel/tcg/translate-all.c | 2 +-
translate-all.h => accel/tcg/translate-all.h | 0
translate-common.c => accel/tcg/translate-common.c | 0
configure | 2 +-
trace-events | 4 ----
10 files changed, 8 insertions(+), 11 deletions(-)
rename tcg-runtime.c => accel/tcg/tcg-runtime.c (100%)
rename tci.c => accel/tcg/tci.c (100%)
rename translate-all.c => accel/tcg/translate-all.c (99%)
rename translate-all.h => accel/tcg/translate-all.h (100%)
rename translate-common.c => accel/tcg/translate-common.c (100%)
diff --git a/Makefile.target b/Makefile.target
index 18470dd..8a270c3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -88,17 +88,14 @@ 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-$(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..a9a68ea 100644
--- a/accel/tcg/Makefile.objs
+++ b/accel/tcg/Makefile.objs
@@ -1,3 +1,4 @@
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 tcg-runtime.o translate-all.o translate-common.o
+obj-$(CONFIG_TCG_INTERPRETER) += tci.o
diff --git a/tcg-runtime.c b/accel/tcg/tcg-runtime.c
similarity index 100%
rename from tcg-runtime.c
rename to accel/tcg/tcg-runtime.c
diff --git a/tci.c b/accel/tcg/tci.c
similarity index 100%
rename from tci.c
rename to accel/tcg/tci.c
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
similarity index 99%
rename from translate-all.c
rename to 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
similarity index 100%
rename from translate-all.h
rename to accel/tcg/translate-all.h
diff --git a/translate-common.c b/accel/tcg/translate-common.c
similarity index 100%
rename from translate-common.c
rename to accel/tcg/translate-common.c
diff --git a/configure b/configure
index 1a5ee4b..7fcd291 100755
--- a/configure
+++ b/configure
@@ -402,7 +402,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/trace-events b/trace-events
index ffe5e66..7cf8c76 100644
--- a/trace-events
+++ b/trace-events
@@ -72,10 +72,6 @@ kvm_irqchip_commit_routes(void) ""
kvm_irqchip_add_msi_route(int virq) "Adding MSI route virq=%d"
kvm_irqchip_update_msi_route(int virq) "Updating MSI route 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"
--
1.9.1
next prev parent reply other threads:[~2017-06-02 6:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 6:06 [Qemu-devel] [PATCH v3 0/4] tcg: split the tcg code and separate tcg files Yang Zhong
2017-06-02 6:06 ` [Qemu-devel] [PATCH v3 1/4] accel: split the tcg accelerator from accel.c file Yang Zhong
2017-06-02 6:06 ` [Qemu-devel] [PATCH v3 2/4] tcg: move tcg related files into accel/tcg/ subdirectory Yang Zhong
2017-06-02 6:06 ` Yang Zhong [this message]
2017-06-02 6:06 ` [Qemu-devel] [PATCH v3 4/4] accel: move kvm related accelerator files into accel/ Yang Zhong
2017-06-07 13:28 ` [Qemu-devel] [PATCH v3 0/4] tcg: split the tcg code and separate tcg files Paolo Bonzini
2017-06-08 9:19 ` Zhong Yang
[not found] ` <20170608085503.GA21945@yangzhon-Virtual>
2017-06-08 10:43 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496383606-18060-4-git-send-email-yang.zhong@intel.com \
--to=yang.zhong@intel.com \
--cc=anthony.xu@intel.com \
--cc=eblake@redhat.com \
--cc=laurent.desnogues@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.