Skip to content

Commit 4013f7f

Browse files
Lluís Vilanovarth7680
authored andcommitted
target/arm: [tcg] Port to disas_log
Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Reviewed-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Alex Benneé <alex.benee@linaro.org> Message-Id: <150002582711.22386.191527630537864599.stgit@frigg.lan> [rth: Move tb->size computation and use that result.] Signed-off-by: Richard Henderson <rth@twiddle.net>
1 parent be40796 commit 4013f7f

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

target/arm/translate.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12171,6 +12171,15 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
1217112171
}
1217212172
}
1217312173

12174+
static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu)
12175+
{
12176+
DisasContext *dc = container_of(dcbase, DisasContext, base);
12177+
12178+
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
12179+
log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size,
12180+
dc->thumb | (dc->sctlr_b << 1));
12181+
}
12182+
1217412183
/* generate intermediate code for basic block 'tb'. */
1217512184
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
1217612185
{
@@ -12251,20 +12260,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
1225112260

1225212261
gen_tb_end(tb, dc->base.num_insns);
1225312262

12263+
tb->size = dc->pc - dc->base.pc_first;
12264+
tb->icount = dc->base.num_insns;
12265+
1225412266
#ifdef DEBUG_DISAS
1225512267
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) &&
1225612268
qemu_log_in_addr_range(dc->base.pc_first)) {
1225712269
qemu_log_lock();
1225812270
qemu_log("----------------\n");
12259-
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
12260-
log_target_disas(cs, dc->base.pc_first, dc->pc - dc->base.pc_first,
12261-
dc->thumb | (dc->sctlr_b << 1));
12271+
arm_tr_disas_log(&dc->base, cs);
1226212272
qemu_log("\n");
1226312273
qemu_log_unlock();
1226412274
}
1226512275
#endif
12266-
tb->size = dc->pc - dc->base.pc_first;
12267-
tb->icount = dc->base.num_insns;
1226812276
}
1226912277

1227012278
static const char *cpu_mode_names[16] = {

0 commit comments

Comments
 (0)