[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/32] target/i386: [tcg] Port to disas_log
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 13/32] target/i386: [tcg] Port to disas_log |
Date: |
Wed, 6 Sep 2017 09:05:53 -0700 |
From: Lluís Vilanova <address@hidden>
Incrementally paves the way towards using the generic instruction translation
loop.
Signed-off-by: Lluís Vilanova <address@hidden>
Reviewed-by: Emilio G. Cota <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
[rth: Move tb->size computation and use that result.]
Signed-off-by: Richard Henderson <address@hidden>
---
target/i386/translate.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 9872f84a03..ad4b2735f4 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -8518,6 +8518,21 @@ static void i386_tr_tb_stop(DisasContextBase *dcbase,
CPUState *cpu)
}
}
+static void i386_tr_disas_log(const DisasContextBase *dcbase,
+ CPUState *cpu)
+{
+ DisasContext *dc = container_of(dcbase, DisasContext, base);
+ int disas_flags = !dc->code32;
+
+ qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
+#ifdef TARGET_X86_64
+ if (dc->code64) {
+ disas_flags = 2;
+ }
+#endif
+ log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flags);
+}
+
/* generate intermediate code for basic block 'tb'. */
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
{
@@ -8593,28 +8608,19 @@ void gen_intermediate_code(CPUState *cs,
TranslationBlock *tb)
gen_io_end();
gen_tb_end(tb, num_insns);
+ tb->size = dc->base.pc_next - dc->base.pc_first;
+ tb->icount = num_insns;
+
#ifdef DEBUG_DISAS
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
&& qemu_log_in_addr_range(dc->base.pc_first)) {
- int disas_flags;
qemu_log_lock();
qemu_log("----------------\n");
- qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
-#ifdef TARGET_X86_64
- if (dc->code64)
- disas_flags = 2;
- else
-#endif
- disas_flags = !dc->code32;
- log_target_disas(cs, dc->base.pc_first, dc->base.pc_next -
dc->base.pc_first,
- disas_flags);
+ i386_tr_disas_log(&dc->base, cs);
qemu_log("\n");
qemu_log_unlock();
}
#endif
-
- tb->size = dc->base.pc_next - dc->base.pc_first;
- tb->icount = num_insns;
}
void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb,
--
2.13.5
- [Qemu-devel] [PULL 04/32] target: [tcg] Use a generic enum for DISAS_ values, (continued)
- [Qemu-devel] [PULL 04/32] target: [tcg] Use a generic enum for DISAS_ values, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 08/32] target/i386: [tcg] Port to init_disas_context, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 12/32] target/i386: [tcg] Port to tb_stop, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 03/32] target/arm: Use DISAS_NORETURN, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 10/32] target/i386: [tcg] Port to breakpoint_check, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 11/32] target/i386: [tcg] Port to translate_insn, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 07/32] target/i386: [tcg] Port to DisasContextBase, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 09/32] target/i386: [tcg] Port to insn_start, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 05/32] target/arm: Delay check for magic kernel page, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 14/32] target/i386: [tcg] Port to generic translation framework, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 13/32] target/i386: [tcg] Port to disas_log,
Richard Henderson <=
- [Qemu-devel] [PULL 18/32] target/arm: [tcg] Port to tb_start, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 20/32] target/arm: [tcg, a64] Port to insn_start, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 16/32] target/arm: [tcg] Port to init_disas_context, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 19/32] target/arm: [tcg] Port to insn_start, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 25/32] target/arm: [tcg,a64] Port to tb_stop, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 15/32] target/arm: [tcg] Port to DisasContextBase, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 24/32] target/arm: [tcg] Port to tb_stop, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 26/32] target/arm: [tcg] Port to disas_log, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 17/32] target/arm: [tcg, a64] Port to init_disas_context, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 22/32] target/arm: [tcg] Port to translate_insn, Richard Henderson, 2017/09/06