Re: [PATCH] accel/tcg: Init tb size and icount before plugin_gen_tb_end

[Pierrick Bouvier <pierrick.bouvier@linaro.org>]

On 5/21/24 14:06, Richard Henderson wrote:
> When passing disassembly data to plugin callbacks,
> translator_st_len relies on db->tb->size having been set.
> 
> Fixes: 4c833c60e047 ("disas: Use translator_st to get disassembly data")
> Reported-by: Bernhard Beschow <shentey@gmail.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   accel/tcg/translator.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index c56967eecd..113edcffe3 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -214,14 +214,14 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
>       set_can_do_io(db, true);
>       tcg_ctx->emit_before_op = NULL;
>   
> +    /* May be used by disas_log or plugin callbacks. */
> +    tb->size = db->pc_next - db->pc_first;
> +    tb->icount = db->num_insns;
> +
>       if (plugin_enabled) {
>           plugin_gen_tb_end(cpu, db->num_insns);
>       }
>   
> -    /* The disas_log hook may use these values rather than recompute.  */
> -    tb->size = db->pc_next - db->pc_first;
> -    tb->icount = db->num_insns;
> -
>       if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
>           && qemu_log_in_addr_range(db->pc_first)) {
>           FILE *logfile = qemu_log_trylock();

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>