From patchwork Thu Jan 31 13:17:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1034230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ispras.ru Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43r1Z66dpqz9sMr for ; Fri, 1 Feb 2019 00:39:58 +1100 (AEDT) Received: from localhost ([127.0.0.1]:54961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCZQ-00071r-QT for incoming@patchwork.ozlabs.org; Thu, 31 Jan 2019 08:39:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCE0-00064M-Cl for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:17:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCDy-0003Ds-DT for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:17:48 -0500 Received: from mail.ispras.ru ([83.149.199.45]:52504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCDy-0003CI-4L for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:17:46 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 7ED095400A7; Thu, 31 Jan 2019 16:17:40 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 16:17:44 +0300 Message-ID: <20190131131744.23264.80091.stgit@pasha-VirtualBox> In-Reply-To: <20190131131520.23264.75724.stgit@pasha-VirtualBox> References: <20190131131520.23264.75724.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v11 25/25] icount: clean up cpu_can_io before jumping to the next block 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: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, crosthwaite.peter@gmail.com, ciro.santilli@gmail.com, jasowang@redhat.com, quintela@redhat.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Most of IO instructions can be executed only at the end of the block in icount mode. Therefore translator can set cpu_can_io flag when translating the last instruction. But when the blocks are chained, then this flag is not reset and may remain set at the beginning of the next block. This patch resets the flag before "chaining" the translation blocks. Signed-off-by: Pavel Dovgalyuk --- accel/tcg/tcg-runtime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index d0d4484..5871f5a 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -151,6 +151,8 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env) target_ulong cs_base, pc; uint32_t flags; + /* We are going to jump to the next block. can_do_io should be reset */ + cpu->can_do_io = !use_icount; tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, curr_cflags()); if (tb == NULL) { return tcg_ctx->code_gen_epilogue;