From nobody Wed Nov 5 13:43:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498154021820778.420666644496; Thu, 22 Jun 2017 10:53:41 -0700 (PDT) Received: from localhost ([::1]:60312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO6IW-00078w-Ne for importer@patchew.org; Thu, 22 Jun 2017 13:53:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO6Ep-0004CG-05 for qemu-devel@nongnu.org; Thu, 22 Jun 2017 13:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO6El-0002AB-2v for qemu-devel@nongnu.org; Thu, 22 Jun 2017 13:49:51 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:53779 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO6Ek-00029y-N2 for qemu-devel@nongnu.org; Thu, 22 Jun 2017 13:49:47 -0400 Received: from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v5MHnixY009984; Thu, 22 Jun 2017 19:49:45 +0200 Received: from localhost (unknown [31.210.182.235]) by correu-1.ac.upc.es (Postfix) with ESMTPSA id 2C4E510EA; Thu, 22 Jun 2017 19:49:32 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Thu, 22 Jun 2017 20:49:31 +0300 Message-Id: <149815377083.1830.11276135502606087693.stgit@frigg.lan> X-Mailer: git-send-email 2.11.0 In-Reply-To: <149815338558.1830.8107719559183631163.stgit@frigg.lan> References: <149815338558.1830.8107719559183631163.stgit@frigg.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v5MHnixY009984 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH v7 12/26] target: [tcg,i386] Refactor tb_stop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Peter Crosthwaite , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Incrementally paves the way towards using the generic instruction translati= on loop. Signed-off-by: Llu=C3=ADs Vilanova --- 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 34e7cf6788..e7b46d282a 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8510,8 +8510,6 @@ static target_ulong i386_trblock_disas_insn(DisasCont= extBase *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 =3D 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(DisasCo= ntextBase *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 =3D DJ_TOO_MANY; } else if ((pc_next - db->pc_first) >=3D (TARGET_PAGE_SIZE - 32)) { - gen_jmp_im(pc_next - dc->cs_base); - gen_eob(dc); db->is_jmp =3D DJ_TOO_MANY; } =20 return pc_next; } =20 +static void i386_trblock_tb_stop(DisasContextBase *db, CPUState *cpu) +{ + DisasContext *dc =3D container_of(db, DisasContext, base); + + if (db->is_jmp =3D=3D 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, Translati= onBlock *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 =3D DJ_TOO_MANY; break; } /* if too long translation, stop generation too */ if (tcg_op_buf_full() || num_insns >=3D max_insns) { - gen_jmp_im(db->pc_next - dc->cs_base); - gen_eob(dc); + db->is_jmp =3D DJ_TOO_MANY; break; } if (singlestep) { - gen_jmp_im(db->pc_next - dc->cs_base); - gen_eob(dc); + db->is_jmp =3D DJ_TOO_MANY; break; } } + i386_trblock_tb_stop(db, cpu); if (tb->cflags & CF_LAST_IO) gen_io_end(cpu_env); done_generating: