Commit 4013f7fc authored by Lluís Vilanova's avatar Lluís Vilanova Committed by Richard Henderson
Browse files

target/arm: [tcg] Port to disas_log 



Incrementally paves the way towards using the generic instruction translation
loop.

Signed-off-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarAlex 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: default avatarRichard Henderson <rth@twiddle.net>
parent be407964

target/arm/translate.c

+13 −5
Original line number Diff line number Diff line
@@ -12171,6 +12171,15 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) 
    }

}



static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu)

{

    DisasContext *dc = container_of(dcbase, DisasContext, base);



    qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));

    log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size,

                     dc->thumb | (dc->sctlr_b << 1));

}



/* generate intermediate code for basic block 'tb'.  */

void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)

{
@@ -12251,20 +12260,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) 


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



    tb->size = dc->pc - dc->base.pc_first;

    tb->icount = dc->base.num_insns;



#ifdef DEBUG_DISAS

    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) &&

        qemu_log_in_addr_range(dc->base.pc_first)) {

        qemu_log_lock();

        qemu_log("----------------\n");

        qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));

        log_target_disas(cs, dc->base.pc_first, dc->pc - dc->base.pc_first,

                         dc->thumb | (dc->sctlr_b << 1));

        arm_tr_disas_log(&dc->base, cs);

        qemu_log("\n");

        qemu_log_unlock();

    }

#endif

    tb->size = dc->pc - dc->base.pc_first;

    tb->icount = dc->base.num_insns;

}



static const char *cpu_mode_names[16] = {