From: Richard Henderson Date: Tue, 21 May 2024 20:56:14 +0000 (-0700) Subject: accel/tcg: Init tb size and icount before plugin_gen_tb_end X-Git-Tag: v9.1.0-rc0~97^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfd43cccab9fb77b8405ca556fc2f2ed3b2920a3;p=thirdparty%2Fqemu.git accel/tcg: Init tb size and icount before plugin_gen_tb_end 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 Signed-off-by: Richard Henderson Tested-by: Bernhard Beschow Reviewed-by: Pierrick Bouvier --- diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index c56967eecd3..113edcffe35 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();