From patchwork Mon Sep 29 18:26:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 38100 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 358EC201F1 for ; Mon, 29 Sep 2014 18:34:50 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id w62sf7837995wes.3 for ; Mon, 29 Sep 2014 11:34:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=xR4iIRVwhQbgqy9qe9CGXJgy+dGUx36cat06j/HKbnY=; b=EV1L2XQ+FBlH9I50Vf3YvZWRicYxw3EoYA4e7zzTtwmwocZ4D1JW7CmmY4zdqZONmx AKVDSP1m35nkWKbyBzs8XVmHQjy1M/k4Aa1Jv1TyLrzDcZybw1TQFt6EKaU3AYpHYwiV ORdGFmZr4WAOAr8aIzzxlgzhPUDqUiI6FjJcHXd5k+7R4NSEODIV+tLDsia5xaoqPHCu QagzyX5hgft/G/O5h5ViWEJEV8GTwxhWpGSvLSHRe/mnaq2ChSJLgpUZFr/1WQabofv4 UZfbCIrPiF67a45rzl/P3H0uL4T/kLFR9MT8304wHyv4DqTlGuWBKPNl/mMv/xdp281c 5adA== X-Gm-Message-State: ALoCoQkNthj5a5iFp2n51V/mLD0lFaHSEtChmdVd6GB5T9bjlAJVG9IfSCRF6NyvXP3DIrOd+r/i X-Received: by 10.180.106.197 with SMTP id gw5mr2114317wib.1.1412015689418; Mon, 29 Sep 2014 11:34:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.194 with SMTP id 2ls659614law.108.gmail; Mon, 29 Sep 2014 11:34:49 -0700 (PDT) X-Received: by 10.112.198.228 with SMTP id jf4mr39121344lbc.35.1412015689260; Mon, 29 Sep 2014 11:34:49 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id pt7si19341317lbb.120.2014.09.29.11.34.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Sep 2014 11:34:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gi9so8279983lab.19 for ; Mon, 29 Sep 2014 11:34:48 -0700 (PDT) X-Received: by 10.152.7.73 with SMTP id h9mr9674012laa.27.1412015688941; Mon, 29 Sep 2014 11:34:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp225429lbb; Mon, 29 Sep 2014 11:34:48 -0700 (PDT) X-Received: by 10.224.112.3 with SMTP id u3mr20086467qap.17.1412015687716; Mon, 29 Sep 2014 11:34:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a17si14441862qai.28.2014.09.29.11.34.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Sep 2014 11:34:47 -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; Received: from localhost ([::1]:38369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYfmX-0003Xb-WD for patch@linaro.org; Mon, 29 Sep 2014 14:34:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYffE-0008Gr-7U for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYffA-0007W9-2R for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:12 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYff9-0007L2-T5 for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:08 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XYfew-0005ok-F6 for qemu-devel@nongnu.org; Mon, 29 Sep 2014 19:26:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Sep 2014 19:26:48 +0100 Message-Id: <1412015213-22268-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1412015213-22268-1-git-send-email-peter.maydell@linaro.org> References: <1412015213-22268-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 14/19] target-arm: A64: Correct updates to FAR and ESR on exceptions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Not all exception types update both FAR and ESR. Reviewed-by: Alex Bennée Reviewed-by: Greg Bellows Signed-off-by: Edgar E. Iglesias Message-id: 1411718914-6608-7-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/helper-a64.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 4be0784..c6ef8e9 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -466,18 +466,17 @@ void aarch64_cpu_do_interrupt(CPUState *cs) env->exception.syndrome); } - env->cp15.esr_el[new_el] = env->exception.syndrome; - env->cp15.far_el[new_el] = env->exception.vaddress; - switch (cs->exception_index) { case EXCP_PREFETCH_ABORT: case EXCP_DATA_ABORT: + env->cp15.far_el[new_el] = env->exception.vaddress; qemu_log_mask(CPU_LOG_INT, "...with FAR 0x%" PRIx64 "\n", env->cp15.far_el[new_el]); - break; + /* fall through */ case EXCP_BKPT: case EXCP_UDEF: case EXCP_SWI: + env->cp15.esr_el[new_el] = env->exception.syndrome; break; case EXCP_IRQ: addr += 0x80;