From patchwork Sun Jun 25 09:32:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 9808015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D23CC603F3 for ; Sun, 25 Jun 2017 09:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7795283C3 for ; Sun, 25 Jun 2017 09:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AADBA285E9; Sun, 25 Jun 2017 09:33:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FEA4283C3 for ; Sun, 25 Jun 2017 09:33:01 +0000 (UTC) Received: from localhost ([::1]:41818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP3ue-0007xj-Ad for patchwork-qemu-devel@patchwork.kernel.org; Sun, 25 Jun 2017 05:33:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP3u4-0007xS-Tt for qemu-devel@nongnu.org; Sun, 25 Jun 2017 05:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dP3u1-0006HF-RD for qemu-devel@nongnu.org; Sun, 25 Jun 2017 05:32:24 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:36429 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP3u1-0006Gc-G6 for qemu-devel@nongnu.org; Sun, 25 Jun 2017 05:32:21 -0400 Received: from correu-2.ac.upc.es (correu-2.ac.upc.es [147.83.30.92]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v5P9WGkn019790; Sun, 25 Jun 2017 11:32:16 +0200 Received: from localhost (unknown [132.68.53.125]) by correu-2.ac.upc.es (Postfix) with ESMTPSA id 513133B1; Sun, 25 Jun 2017 11:32:11 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Sun, 25 Jun 2017 12:32:10 +0300 Message-Id: <149838312996.6497.2215207449313720373.stgit@frigg.lan> X-Mailer: git-send-email 2.11.0 In-Reply-To: <149838022308.6497.2104916050645246693.stgit@frigg.lan> References: <149838022308.6497.2104916050645246693.stgit@frigg.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v5P9WGkn019790 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 v9 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís 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(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: