From patchwork Mon Jul 17 12:44:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107926 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4475091qge; Mon, 17 Jul 2017 05:53:27 -0700 (PDT) X-Received: by 10.55.140.71 with SMTP id o68mr25127099qkd.18.1500296007543; Mon, 17 Jul 2017 05:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500296007; cv=none; d=google.com; s=arc-20160816; b=CnluhXfWkgXfrP4EagZrh92ylSealEzLmZNWD7JETbiYmoKNysgfMKHGUeEXduOedV d6Vb/3hvwtUWNOL4plfJxbUYBsd34Us+k4m+2+2dZ/dir/WK1PvuInFFMB9fz+uwSUxv TNQZQp8EWVu775NGFL00duYTzbqH5vey1IrgmT//FQtF88moiKX+XfJsuhoIVptQsUe2 4XF6XLIPMBmsZ+YqZPoL0fQZVen1gmAPXS7hDvC4Q3/gFuGXgbnp532grhgE1Es1B154 oyvhEvuCkYCsBak5gzcxhi83+xAu4yAf2KuYc+ZXR7oDz0cB4AMnripdzdxbfsxugug3 wkbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=0jEmJ/QktPQsLmJm0ep81jL2HpBeQvlv5r5juaFBgqo=; b=LeBLOOb+XzPyNFDAe4kyy8PaFHofCQgUUv/oSM+q+ODMpvixemxCAeMnAAeNkRyip7 xYegKe9GjkA0Fx4heBXONOAv3GqS4/w4f6IDMylDoJksB5FGuFE3s5btEGOGCSo6pE54 1/lZbcrjc3rGVM4EdsAQPnXuQ2/ajtWHSiPQFV3aX6r5ECTFGjbAaLKufWApQwbd+AqT p+UPb/ZvZUdZJui0a1TRKYLhT3TBPiJAL+eVlqti679nqRiRx7/Ojk5owmBohxCpFSmd uB59p7TegkZX2C0Kd5xWDZPtcBHN97BGAfFTMXEZIzzTLhe1Riwlx3aFtupeCXT5i5AW /1Dg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n1si1547163qtd.175.2017.07.17.05.53.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 05:53:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5Wf-0006Bo-5K for patch@linaro.org; Mon, 17 Jul 2017 08:53:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5Og-0007xR-NM for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX5Of-0002Jw-Od for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:10 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37640) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX5Of-0002Ci-HY for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:09 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dX5OT-0003Ss-K0 for qemu-devel@nongnu.org; Mon, 17 Jul 2017 13:44:57 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 13:44:41 +0100 Message-Id: <1500295494-8991-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> References: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 05/18] target/arm/translate: make DISAS_UPDATE match declared semantics 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée DISAS_UPDATE should be used when the wider CPU state other than just the PC has been updated and we should therefore exit the TCG runtime and return to the main execution loop rather assuming DISAS_JUMP would do that. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-id: 20170713141928.25419-3-alex.bennee@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 14 +++++++------- target/arm/translate.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e55547d..66139b6 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11364,16 +11364,9 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) case DISAS_NEXT: gen_goto_tb(dc, 1, dc->pc); break; - default: - case DISAS_UPDATE: - gen_a64_set_pc_im(dc->pc); - /* fall through */ case DISAS_JUMP: tcg_gen_lookup_and_goto_ptr(cpu_pc); break; - case DISAS_EXIT: - tcg_gen_exit_tb(0); - break; case DISAS_TB_JUMP: case DISAS_EXC: case DISAS_SWI: @@ -11397,6 +11390,13 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) */ tcg_gen_exit_tb(0); break; + case DISAS_UPDATE: + gen_a64_set_pc_im(dc->pc); + /* fall through */ + case DISAS_EXIT: + default: + tcg_gen_exit_tb(0); + break; } } diff --git a/target/arm/translate.c b/target/arm/translate.c index 0862f9e..5f2cea8 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -12095,12 +12095,12 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) case DISAS_NEXT: gen_goto_tb(dc, 1, dc->pc); break; - case DISAS_UPDATE: - gen_set_pc_im(dc, dc->pc); - /* fall through */ case DISAS_JUMP: gen_goto_ptr(); break; + case DISAS_UPDATE: + gen_set_pc_im(dc, dc->pc); + /* fall through */ default: /* indicate that the hash table must be used to find the next TB */ tcg_gen_exit_tb(0);