From patchwork Mon Jun 9 15:04:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 357524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CDA89140085 for ; Tue, 10 Jun 2014 01:14:46 +1000 (EST) Received: from localhost ([::1]:33812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1HY-0005LH-BT for incoming@patchwork.ozlabs.org; Mon, 09 Jun 2014 11:14:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1Ga-0003me-Ug for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:13:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu1GW-0003He-22 for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:13:44 -0400 Received: from mail-qc0-x230.google.com ([2607:f8b0:400d:c01::230]:35624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1GV-0003HR-GF for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:13:39 -0400 Received: by mail-qc0-f176.google.com with SMTP id r5so785817qcx.7 for ; Mon, 09 Jun 2014 08:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=lrBU72lRLS8cywsuRfXPk/1HOQPAYviQ9CHAAN3nNGs=; b=X4HJvOFFycnmsDC9QyLq2P0yXmwInOmww8OeUpJpq96sz/1OeoNGeFyeJHJOtvyAZc mKMsb5o2ZYhjPZRmKEpEi1JqbBKoGq6B9w1nujuTJSN2yRLq+0JqOifMugIvis/abMVH Tw52Z934qqz9P1hITXZYcU4hP3VrqwN5xn3x6wxzN+wpGA0XqoU3rDkxj/xTrN2oYrJA p6G/j/s1VP6m9TXzFUqqt2bbV1LaZyduv9fGjJwM2DZWMLkh3k74UxI1gGDW5nS662Hw IS4AadaNTFGKYF8zvRNMV6sY73fhewhd5E+VWyf0MQajbEepM647I+bLG2kN/9k/K4R3 dVLQ== X-Received: by 10.229.106.7 with SMTP id v7mr5210213qco.21.1402326819112; Mon, 09 Jun 2014 08:13:39 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id g10sm30884447qai.5.2014.06.09.08.13.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:13:38 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 10 Jun 2014 01:04:24 +1000 Message-Id: <1402326269-8573-13-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402326269-8573-1-git-send-email-edgar.iglesias@gmail.com> References: <1402326269-8573-1-git-send-email-edgar.iglesias@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::230 Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, blauwirbel@gmail.com, john.williams@xilinx.com, greg.bellows@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v2 12/17] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Not all exception types update both FAR and ESR. Reviewed-by: Alex Bennée Signed-off-by: Edgar E. Iglesias Reviewed-by: Greg Bellows --- target-arm/helper-a64.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 7d94a74..c91005f 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -466,18 +466,16 @@ 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; case EXCP_BKPT: case EXCP_UDEF: case EXCP_SWI: + env->cp15.esr_el[new_el] = env->exception.syndrome; break; case EXCP_IRQ: addr += 0x80;