From patchwork Fri Jan 27 10:39:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92628 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp152544obz; Fri, 27 Jan 2017 03:16:58 -0800 (PST) X-Received: by 10.237.35.8 with SMTP id h8mr7012620qtc.250.1485515818618; Fri, 27 Jan 2017 03:16:58 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o6si3305460qtd.124.2017.01.27.03.16.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 03:16:58 -0800 (PST) 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; dkim=fail header.i=@linaro.org; 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]:44440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX4WW-0005OJ-0m for patch@linaro.org; Fri, 27 Jan 2017 06:16:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3wU-0003Uz-JL for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX3wT-0003bH-Lv for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:42 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:37941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX3wT-0003an-GB for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:41 -0500 Received: by mail-wm0-x235.google.com with SMTP id r144so130020576wme.1 for ; Fri, 27 Jan 2017 02:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jTdkzqovOaa/vHi9qgvcJFTj3jqkbsRN9xvWUg//VFM=; b=fxlduF9iAWa1MfHnbJl63UFQWn9/77/gXqYi87Uur6quMOWQKTrZxoJ3BgZvZo8FW/ vuaXShphrjlc2tLWDuLr60WedtvXAx7DbOLzm2yeaKh1T+CMNY0hCHInOXKisHwP4G4s x9Rk1Edr6pQvaTNmcTb/5E2vBwL/rIUS7NAJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jTdkzqovOaa/vHi9qgvcJFTj3jqkbsRN9xvWUg//VFM=; b=N9NkkANDnKoL/zAVDmcz/N1RETWLcXV0bl1DGi2bP6taGSrhkR9rPBegNTaHhAwwAT 86pYoy2CIa8C9IAkRqDrQNOcY02Z8gJUkx1/R1BtnLvNOWIV8ca64jD6UhZBgG1Bzwm6 N5PMWL+Nf+tt5eFBcQXuf/vC4N4bfqXUWXX5eCTBPrLk0XVX9sk8yrEq/Vu+BhF1kykQ DMkOrGW88KY02ejjJwiMYGBpWcnlDcUIcWWKvBL0rRdJu0OYFm69sEgr5LQ1oWpISnuJ lDqSNk2LV9HnnduThoDbL7u0pCxX/gw/1u4y9ZXqRBpVcAHzhcuB2dm2bB6+wP/xQoUb czdQ== X-Gm-Message-State: AIkVDXJEqSqprl/iukgKnxwDpvxJ+v4K8DM6nflnXnZlJTxQwPl90+hSYjU4eUYchJMV/vNx X-Received: by 10.28.131.132 with SMTP id f126mr2679043wmd.61.1485513580381; Fri, 27 Jan 2017 02:39:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v102sm7195864wrb.11.2017.01.27.02.39.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 02:39:35 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4705A3E377B; Fri, 27 Jan 2017 10:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com Date: Fri, 27 Jan 2017 10:39:20 +0000 Message-Id: <20170127103922.19658-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170127103922.19658-1-alex.bennee@linaro.org> References: <20170127103922.19658-1-alex.bennee@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: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH v8 23/25] target-arm: introduce ARM_CP_EXIT_PC 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: peter.maydell@linaro.org, claudio.fontana@huawei.com, jan.kiszka@siemens.com, mark.burton@greensocs.com, "open list:ARM" , serge.fdrv@gmail.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, rth@twiddle.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Some helpers may trigger an immediate exit of the cpu_loop. If this happens the PC need to be rectified to ensure the restart will begin on the next instruction. Signed-off-by: Alex Bennée --- target/arm/cpu.h | 3 ++- target/arm/translate-a64.c | 4 ++++ target/arm/translate.c | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index f56a96c675..1b0670ae11 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1411,7 +1411,8 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid) #define ARM_CP_NZCV (ARM_CP_SPECIAL | (3 << 8)) #define ARM_CP_CURRENTEL (ARM_CP_SPECIAL | (4 << 8)) #define ARM_CP_DC_ZVA (ARM_CP_SPECIAL | (5 << 8)) -#define ARM_LAST_SPECIAL ARM_CP_DC_ZVA +#define ARM_CP_EXIT_PC (ARM_CP_SPECIAL | (6 << 8)) +#define ARM_LAST_SPECIAL ARM_CP_EXIT_PC /* Used only as a terminator for ARMCPRegInfo lists */ #define ARM_CP_SENTINEL 0xffff /* Mask of only the flag bits in a type field */ diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 05162f335e..a3f37d8bec 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1561,6 +1561,10 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, tcg_rt = cpu_reg(s, rt); gen_helper_dc_zva(cpu_env, tcg_rt); return; + case ARM_CP_EXIT_PC: + /* The helper may exit the cpu_loop so ensure PC is correct */ + gen_a64_set_pc_im(s->pc); + break; default: break; } diff --git a/target/arm/translate.c b/target/arm/translate.c index 444a24c2b6..7bd18cd25d 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -7508,6 +7508,10 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) gen_set_pc_im(s, s->pc); s->is_jmp = DISAS_WFI; return 0; + case ARM_CP_EXIT_PC: + /* The helper may exit the cpu_loop so ensure PC is correct */ + gen_set_pc_im(s, s->pc); + break; default: break; }