yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-29 20:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-log: Improve the exec TB execution logging

Browse source 
Improve the TB execution logging so that it is easier to identify
what is happening from trace logs:
* move the "Trace" logging of executed TBs into cpu_tb_exec()
so that it is emitted if and only if we actually execute a TB,
and for consistency for the CPU state logging
* log when we link two TBs together via tb_add_jump()
* log when cpu_tb_exec() returns early from a chain of TBs

The new style logging looks like this:

Trace 0x7fb7cc822ca0 [ffffffc0000dce00]
Linking TBs 0x7fb7cc822ca0 [ffffffc0000dce00] index 0 -> 0x7fb7cc823110 [ffffffc0000dce10]
Trace 0x7fb7cc823110 [ffffffc0000dce10]
Trace 0x7fb7cc823420 [ffffffc000302688]
Trace 0x7fb7cc8234a0 [ffffffc000302698]
Trace 0x7fb7cc823520 [ffffffc0003026a4]
Trace 0x7fb7cc823560 [ffffffc0000dce44]
Linking TBs 0x7fb7cc823560 [ffffffc0000dce44] index 1 -> 0x7fb7cc8235d0 [ffffffc0000dce70]
Trace 0x7fb7cc8235d0 [ffffffc0000dce70]
Stopped execution of TB chain before 0x7fb7cc8235d0 [ffffffc0000dce70]
Trace 0x7fb7cc8235d0 [ffffffc0000dce70]
Trace 0x7fb7cc822fd0 [ffffffc0000dd52c]

Backports commit 1a830635229e14c403600167823ea6b3b79d3097 from qemu
This commit is contained in:
Peter Maydell 2018-02-22 09:37:45 -05:00 committed by Lioncash
parent 66e1bacd64
commit 3f5e36e15f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qemu/cpu-exec.c
View file

@ -27,7 +27,7 @@
#include "uc_priv.h" #include "uc_priv.h"
static tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr); static tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb);
static TranslationBlock *tb_find_slow(CPUState *cpu, target_ulong pc, static TranslationBlock *tb_find_slow(CPUState *cpu, target_ulong pc,
target_ulong cs_base, uint64_t flags); target_ulong cs_base, uint64_t flags);
static TranslationBlock *tb_find_fast(CPUState *cpu); static TranslationBlock *tb_find_fast(CPUState *cpu);
@ -45,7 +45,6 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
#endif #endif
int ret, interrupt_request; int ret, interrupt_request;
TranslationBlock *tb; TranslationBlock *tb;
uint8_t *tc_ptr;
uintptr_t next_tb; uintptr_t next_tb;
struct hook *hook; struct hook *hook;
@ -209,10 +208,9 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
} }
if (likely(!cpu->exit_request)) { if (likely(!cpu->exit_request)) {
tc_ptr = tb->tc_ptr;
cpu->current_tb = tb; cpu->current_tb = tb;
/* execute the generated code */ /* execute the generated code */
next_tb = cpu_tb_exec(cpu, tc_ptr); // UNICORN next_tb = cpu_tb_exec(cpu, tb);
cpu->current_tb = NULL; cpu->current_tb = NULL;
switch (next_tb & TB_EXIT_MASK) { switch (next_tb & TB_EXIT_MASK) {
@ -278,11 +276,16 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
} }
/* Execute a TB, and fix up the CPU state afterwards if necessary */ /* Execute a TB, and fix up the CPU state afterwards if necessary */
static tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr) static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
{ {
CPUArchState *env = cpu->env_ptr; CPUArchState *env = cpu->env_ptr;
TCGContext *tcg_ctx = env->uc->tcg_ctx; TCGContext *tcg_ctx = env->uc->tcg_ctx;
uintptr_t next_tb; uintptr_t next_tb;
uint8_t *tb_ptr = itb->tc_ptr;
// Unicorn: commented out
//qemu_log_mask(CPU_LOG_EXEC, "Trace %p [" TARGET_FMT_lx "] %s\n",
// itb->tc_ptr, itb->pc, lookup_symbol(itb->pc));
next_tb = tcg_qemu_tb_exec(env, tb_ptr); next_tb = tcg_qemu_tb_exec(env, tb_ptr);
@ -293,6 +296,11 @@ static tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr)
*/ */
CPUClass *cc = CPU_GET_CLASS(env->uc, cpu); CPUClass *cc = CPU_GET_CLASS(env->uc, cpu);
TranslationBlock *tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK); TranslationBlock *tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);
// Unicorn: commented out
//qemu_log_mask(CPU_LOG_EXEC,
// "Stopped execution of TB chain before %p ["
// TARGET_FMT_lx "] %s\n",
// itb->tc_ptr, itb->pc, lookup_symbol(itb->pc));
if (cc->synchronize_from_tb) { if (cc->synchronize_from_tb) {
// avoid sync twice when helper_uc_tracecode() already did this. // avoid sync twice when helper_uc_tracecode() already did this.
if (env->uc->emu_counter <= env->uc->emu_count && if (env->uc->emu_counter <= env->uc->emu_count &&

3
qemu/include/exec/exec-all.h
View file

@ -373,6 +373,9 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
{ {
/* NOTE: this test is only needed for thread safety */ /* NOTE: this test is only needed for thread safety */
if (!tb->jmp_next[n]) { if (!tb->jmp_next[n]) {
qemu_log_mask(CPU_LOG_EXEC, "Linking TBs %p [" TARGET_FMT_lx
"] index %d -> %p [" TARGET_FMT_lx "]\n",
tb->tc_ptr, tb->pc, n, tb_next->tc_ptr, tb_next->pc);
/* patch the native jump address */ /* patch the native jump address */
tb_set_jmp_target(tb, n, (uintptr_t)tb_next->tc_ptr); tb_set_jmp_target(tb, n, (uintptr_t)tb_next->tc_ptr);