[v9,12/26] target: [tcg,i386] Refactor tb_stop

Commit Message

Lluís Vilanova June 25, 2017, 9:32 a.m. UTC

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

Signed-off-by: Lluís Vilanova <[e-mail]>
---
 target/i386/translate.c |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Patch

diff --git a/target/i386/translate.c b/target/i386/translate.c
index 34e7cf6788..e7b46d282a 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -8510,8 +8510,6 @@  static target_ulong i386_trblock_disas_insn(DisasContextBase *db, CPUState *cpu)
         /* if irq were inhibited with HF_INHIBIT_IRQ_MASK, we clear
            the flag and abort the translation to give the irqs a
            change to be happen */
-        gen_jmp_im(pc_next - dc->cs_base);
-        gen_eob(dc);
         db->is_jmp = DJ_TOO_MANY;
     } else if ((db->tb->cflags & CF_USE_ICOUNT)
                && ((db->pc_next & TARGET_PAGE_MASK)
@@ -8524,18 +8522,24 @@  static target_ulong i386_trblock_disas_insn(DisasContextBase *db, 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);
         db->is_jmp = DJ_TOO_MANY;
     } else if ((pc_next - db->pc_first) >= (TARGET_PAGE_SIZE - 32)) {
-        gen_jmp_im(pc_next - dc->cs_base);
-        gen_eob(dc);
         db->is_jmp = DJ_TOO_MANY;
     }
 
     return pc_next;
 }
 
+static void i386_trblock_tb_stop(DisasContextBase *db, CPUState *cpu)
+{
+    DisasContext *dc = container_of(db, DisasContext, base);
+
+    if (db->is_jmp == DJ_TOO_MANY) {
+        gen_jmp_im(db->pc_next - dc->cs_base);
+        gen_eob(dc);
+    }
+}
+
 /* generate intermediate code for basic block 'tb'.  */
 void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb)
 {
@@ -8596,23 +8600,21 @@  void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb)
         /* if single step mode, we generate only one instruction and
            generate an exception */
         if (db->singlestep_enabled) {
-            gen_jmp_im(db->pc_next - dc->cs_base);
-            gen_eob(dc);
+            db->is_jmp = DJ_TOO_MANY;
             break;
         }
         /* if too long translation, stop generation too */
         if (tcg_op_buf_full() ||
             num_insns >= max_insns) {
-            gen_jmp_im(db->pc_next - dc->cs_base);
-            gen_eob(dc);
+            db->is_jmp = DJ_TOO_MANY;
             break;
         }
         if (singlestep) {
-            gen_jmp_im(db->pc_next - dc->cs_base);
-            gen_eob(dc);
+            db->is_jmp = DJ_TOO_MANY;
             break;
         }
     }
+    i386_trblock_tb_stop(db, cpu);
     if (tb->cflags & CF_LAST_IO)
         gen_io_end(cpu_env);
 done_generating: