[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/32] target/i386: [tcg] Port to tb_stop
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 12/32] target/i386: [tcg] Port to tb_stop |
Date: |
Wed, 6 Sep 2017 09:05:52 -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>
Signed-off-by: Richard Henderson <address@hidden>
---
target/i386/translate.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 0f38896f17..9872f84a03 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -8488,8 +8488,6 @@ static void i386_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cpu)
/* if irq were inhibited with HF_INHIBIT_IRQ_MASK, we clear
the flag and abort the translation to give the irqs a
chance to happen */
- gen_jmp_im(pc_next - dc->cs_base);
- gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY;
} else if ((dc->base.tb->cflags & CF_USE_ICOUNT)
&& ((dc->base.pc_next & TARGET_PAGE_MASK)
@@ -8502,18 +8500,24 @@ static void i386_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cpu)
If current instruction already crossed the bound - it's ok,
because an exception hasn't stopped this code.
*/
- gen_jmp_im(pc_next - dc->cs_base);
- gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY;
} else if ((pc_next - dc->base.pc_first) >= (TARGET_PAGE_SIZE - 32)) {
- gen_jmp_im(pc_next - dc->cs_base);
- gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY;
}
dc->base.pc_next = pc_next;
}
+static void i386_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
+{
+ DisasContext *dc = container_of(dcbase, DisasContext, base);
+
+ if (dc->base.is_jmp == DISAS_TOO_MANY) {
+ gen_jmp_im(dc->base.pc_next - dc->cs_base);
+ gen_eob(dc);
+ }
+}
+
/* generate intermediate code for basic block 'tb'. */
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
{
@@ -8570,23 +8574,21 @@ void gen_intermediate_code(CPUState *cs,
TranslationBlock *tb)
/* if single step mode, we generate only one instruction and
generate an exception */
if (dc->base.singlestep_enabled) {
- gen_jmp_im(dc->base.pc_next - dc->cs_base);
- gen_eob(dc);
+ dc->base.is_jmp = DISAS_TOO_MANY;
break;
}
/* if too long translation, stop generation too */
if (tcg_op_buf_full() ||
num_insns >= max_insns) {
- gen_jmp_im(dc->base.pc_next - dc->cs_base);
- gen_eob(dc);
+ dc->base.is_jmp = DISAS_TOO_MANY;
break;
}
if (singlestep) {
- gen_jmp_im(dc->base.pc_next - dc->cs_base);
- gen_eob(dc);
+ dc->base.is_jmp = DISAS_TOO_MANY;
break;
}
}
+ i386_tr_tb_stop(&dc->base, cs);
if (tb->cflags & CF_LAST_IO)
gen_io_end();
gen_tb_end(tb, num_insns);
--
2.13.5
- [Qemu-devel] [PULL 00/32] tcg generic translate loop, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 01/32] tcg: Add generic DISAS_NORETURN, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 02/32] target/i386: Use generic DISAS_* enumerators, Richard Henderson, 2017/09/06
- [Qemu-devel] [PULL 06/32] tcg: Add generic translation framework, Richard Henderson, 2017/09/06
- [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 <=
- [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, 2017/09/06
- [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