[Qemu-devel] [PATCH] tcg: add cs_base and flags to -d exec output

[Qemu-devel] [PATCH] tcg: add cs_base and flags to -d exec output

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 accel/tcg/cpu-exec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 4318441e4c..18c1a2aedb 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -146,8 +146,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
     uint8_t *tb_ptr = itb->tc.ptr;
 
     qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
-                           "Trace %p [%d: " TARGET_FMT_lx "] %s\n",
-                           itb->tc.ptr, cpu->cpu_index, itb->pc,
+                           "Trace %d: %p ["
+                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%d] %s\n",
+                           cpu->cpu_index, itb->tc.ptr,
+                           itb->cs_base, itb->pc, itb->flags,
                            lookup_symbol(itb->pc));
 
 #if defined(DEBUG_DISAS)
-- 
2.14.3

Re: [Qemu-devel] [PATCH] tcg: add cs_base and flags to -d exec output

[Richard Henderson]

On 12/16/2017 09:50 PM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  accel/tcg/cpu-exec.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 4318441e4c..18c1a2aedb 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -146,8 +146,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
>      uint8_t *tb_ptr = itb->tc.ptr;
>  
>      qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
> -                           "Trace %p [%d: " TARGET_FMT_lx "] %s\n",
> -                           itb->tc.ptr, cpu->cpu_index, itb->pc,
> +                           "Trace %d: %p ["
> +                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%d] %s\n",
> +                           cpu->cpu_index, itb->tc.ptr,
> +                           itb->cs_base, itb->pc, itb->flags,
>                             lookup_symbol(itb->pc));


Thanks, applied to tcg-next.


r~

Re: [Qemu-devel] [PATCH] tcg: add cs_base and flags to -d exec output

[Peter Maydell]

On 17 December 2017 at 05:50, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  accel/tcg/cpu-exec.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 4318441e4c..18c1a2aedb 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -146,8 +146,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
>      uint8_t *tb_ptr = itb->tc.ptr;
>
>      qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
> -                           "Trace %p [%d: " TARGET_FMT_lx "] %s\n",
> -                           itb->tc.ptr, cpu->cpu_index, itb->pc,
> +                           "Trace %d: %p ["
> +                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%d] %s\n",
> +                           cpu->cpu_index, itb->tc.ptr,
> +                           itb->cs_base, itb->pc, itb->flags,
>                             lookup_symbol(itb->pc));

At the risk of having to update my log-parsing scripts again, I
notice that the output now looks a bit odd:

Trace 0: 0x7f70942390c0 [00000000/6aa01000/0x51080001] someFunction

in that the first two items in the [] have no preceding 0x but the
last one does.

thanks
-- PMM