[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 12/29] target/i386: [tcg] Refactor disas_log
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v11 12/29] target/i386: [tcg] Refactor disas_log |
Date: |
Wed, 28 Jun 2017 16:05:04 +0300 |
User-agent: |
StGit/0.17.1-dirty |
Incrementally paves the way towards using the generic instruction translation
loop.
Signed-off-by: Lluís Vilanova <address@hidden>
---
target/i386/translate.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 1ca40c2fe4..3950fe95a4 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -8526,6 +8526,24 @@ static void i386_trblock_tb_stop(DisasContextBase
*dcbase, CPUState *cpu)
}
}
+static void i386_trblock_disas_log(const DisasContextBase *dcbase,
+ CPUState *cpu)
+{
+ DisasContext *dc = container_of(dcbase, DisasContext, base);
+ int disas_flags;
+
+ 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(cpu, dc->base.pc_first, dc->base.pc_next -
dc->base.pc_first,
+ disas_flags);
+
+}
+
/* generate intermediate code for basic block 'tb'. */
void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb)
{
@@ -8621,18 +8639,9 @@ done_generating:
#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(cpu, dc->base.pc_first, dc->base.pc_next -
dc->base.pc_first,
- disas_flags);
+ i386_trblock_disas_log(&dc->base, cpu);
qemu_log("\n");
qemu_log_unlock();
}
- [Qemu-devel] [PATCH v11 07/29] target/i386: [tcg] Refactor init_globals, (continued)
- [Qemu-devel] [PATCH v11 07/29] target/i386: [tcg] Refactor init_globals, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 08/29] target/i386: [tcg] Refactor insn_start, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 09/29] target/i386: [tcg] Refactor breakpoint_check, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 10/29] target/i386: [tcg] Refactor translate_insn, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 11/29] target/i386: [tcg] Refactor tb_stop, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 12/29] target/i386: [tcg] Refactor disas_log,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v11 13/29] target/i386: [tcg] Port to generic translation framework, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 14/29] target/arm: [tcg] Port to DisasContextBase, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 15/29] target/arm: [tcg] Port to init_disas_context, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 16/29] target/arm: [tcg, a64] Port to init_disas_context, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 17/29] target/arm: [tcg] Port to init_globals, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 18/29] target/arm: [tcg] Port to tb_start, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 19/29] target/arm: [tcg] Port to insn_start, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 20/29] target/arm: [tcg, a64] Port to insn_start, Lluís Vilanova, 2017/06/28