From patchwork Mon Jul 24 20:27:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9860395 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 0DD3E60385 for ; Mon, 24 Jul 2017 20:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01160285AE for ; Mon, 24 Jul 2017 20:40:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA0F9285C1; Mon, 24 Jul 2017 20:40:35 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 CE964285AE for ; Mon, 24 Jul 2017 20:40:34 +0000 (UTC) Received: from localhost ([::1]:56869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZk9Y-0003aq-HH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 24 Jul 2017 16:40:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZjxm-00038I-0W for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZjxj-000106-JV for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:20 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:36111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZjxj-0000zT-FC for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:19 -0400 Received: by mail-qk0-x243.google.com with SMTP id d136so10952582qkg.3 for ; Mon, 24 Jul 2017 13:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CLwVGOKRQsutBOTTqx5sSDFXFfA6e0rG5H/pxiCA3Yg=; b=ij3hXI+vX0zOHzx/O4XZaH0DAw7F0CnpC08lWGIxjuLzoTlXZjeBXgT4musjPyKZkv a2YvF30hDgXaf7L2HTH710PwlxzWBAccRA7v2No9qDqB6SzhHJIsAIZSo1idIYtEbctW ZN8VXexposbP+l/+vH5zP1qeZf4AtaSPMJDmHYh0Oyh8iqKdwvnh6aav79q89fyZpbqr WZnjTwG8aAQbJ7KnDkYMft9y/StOo/Y5+TGPLmWu/3dWuXrIePTNBRTmq5xTPVn6V2ZY 7EvRucVF9ZELDkY8XbfzwaYYxWYJ0NCrfthGIKcT8kbEu75fO/Cpzuv5NW6lQ8IttvY6 Y9dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CLwVGOKRQsutBOTTqx5sSDFXFfA6e0rG5H/pxiCA3Yg=; b=q3P26DOBcNbsPi8MmKnUy7att1Mw6cM1kAGdcObwAWZI7QeYXs0pyGkoYRexYLh1zb B/hEIQMctWsWzr9iGyaVjcO61RzA33hZL/sH7Y39RkG05w5/IBKgzZgWEipf+ynOonRU 9pKeLjIiy8BE/El2hZTD+FpeUkKlUuwMywYdaZ1zmeKxDiwOEMJDuScE46L9Eao38EX3 I2UcdnXUUhSgmxVUeuzKoLSs44sQ8TyAoAsgxDEcgPAwo8GDUcqhl2K412U3uNCC5Enn sKlu4LOjxhg1cpy1fc4Q5WoGGuDi9e+ZlI3Extthx4BfOFQnbC9Wutcw+jLJgOVHQCUU jspg== X-Gm-Message-State: AIVw111n3lwx/4NMxEveUrmdY6F0pYsYuNfYV3ivBP53S4OyGzy/x/V8 CKbIqMwLJKune9ROePY= X-Received: by 10.55.133.195 with SMTP id h186mr10765196qkd.21.1500928098735; Mon, 24 Jul 2017 13:28:18 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id p52sm9196808qtc.74.2017.07.24.13.28.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 13:28:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 13:27:08 -0700 Message-Id: <20170724202728.25960-13-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724202728.25960-1-rth@twiddle.net> References: <20170724202728.25960-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v15 12/32] target/i386: [tcg] Port to 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: cota@braap.org, vilanova@ac.upc.edu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lluís Vilanova Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís Vilanova Reviewed-by: Emilio G. Cota Reviewed-by: Richard Henderson Message-Id: <150002219289.22386.17959138704858928730.stgit@frigg.lan> Signed-off-by: Richard Henderson --- 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 d350699ae9..8238533c0e 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8487,8 +8487,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) @@ -8501,18 +8499,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) { @@ -8569,23 +8573,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);