diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-18 16:07:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-18 16:07:48 -0700 |
| commit | 3ea24be7cceb4dc4557fb33f758a83380725bc83 (patch) | |
| tree | 03c1fe1155ee0bf37180a5ed9dd9a90b083a697d | |
| parent | 144065e79ef20c254c68ddf4f1a3a951cd1fed2a (diff) | |
| parent | 013978687addfae64dbb8e8a179af10922bd2802 (diff) | |
| download | external_qemu-3ea24be7cceb4dc4557fb33f758a83380725bc83.zip external_qemu-3ea24be7cceb4dc4557fb33f758a83380725bc83.tar.gz external_qemu-3ea24be7cceb4dc4557fb33f758a83380725bc83.tar.bz2 | |
Merge change 1914 into donut
* changes:
Fix critical bug with emulator tracing where the basic block addresses were wrong.
| -rw-r--r-- | target-arm/translate.c | 2 | ||||
| -rw-r--r-- | trace.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c index ff27d28..87bae82 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -5691,7 +5691,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s) insn = ldl_code(s->pc); #ifdef CONFIG_TRACE if (tracing) { - trace_add_insn(insn); + trace_add_insn(insn, 0); ticks = get_insn_ticks_arm(insn); gen_helper_traceInsn(); } @@ -130,7 +130,7 @@ extern void start_tracing(); extern void stop_tracing(); extern void trace_init(const char *filename); extern void trace_bb_start(uint32_t bb_addr); -extern void trace_add_insn_arm(uint32_t insn, int is_thumb); +extern void trace_add_insn(uint32_t insn, int is_thumb); extern void trace_bb_end(); extern int get_insn_ticks_arm(uint32_t insn); |