From patchwork Tue May 6 06:08:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 346027 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BBB071412F4 for ; Tue, 6 May 2014 16:14:55 +1000 (EST) Received: from localhost ([::1]:33092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYeT-00008O-BO for incoming@patchwork.ozlabs.org; Tue, 06 May 2014 02:14:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYe2-0007nW-J3 for qemu-devel@nongnu.org; Tue, 06 May 2014 02:14:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhYdw-0001PQ-I1 for qemu-devel@nongnu.org; Tue, 06 May 2014 02:14:26 -0400 Received: from mail-qg0-x229.google.com ([2607:f8b0:400d:c04::229]:38447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYdw-0001P9-F3 for qemu-devel@nongnu.org; Tue, 06 May 2014 02:14:20 -0400 Received: by mail-qg0-f41.google.com with SMTP id j5so1862647qga.0 for ; Mon, 05 May 2014 23:14:20 -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; bh=HP2sgdRt4p8GQd0SBpdHtuP5wLwujlcRo7zHCNQi7NE=; b=OrnX91T2tk2iPqK8ut5sPUb3rfvwX4dYj7J++CX5MbgliwEzhss8FMl//IS4xUABI+ wqFLPQq+w2FjL1OoAtApO5V1UefSICqTvynNtNm468EI+FRhS2k6VBvf9ZnvAmi/ofiH mjJmqItaNRz7oJcRXC7PQ3RVGMUhncTvQvWtTfja4j2nsdDbsl/865MjCJJ0Rmt7nQg4 9vPhlysfpqDnDeV+TrDQJP+YAaMaPmE5IVSN0suHpnYpcvLPytucmc4L0HJ/Pj+XNStE rW7TBu9ryiTIbG6Mvp3tTpwjwMKFb37/7PJG8XQcXyU7vWPYXlk+5M6Qx2FVTuah1K1n rfgg== X-Received: by 10.140.103.74 with SMTP id x68mr47641338qge.82.1399356860137; Mon, 05 May 2014 23:14:20 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id g7sm21691207qaf.14.2014.05.05.23.14.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 05 May 2014 23:14:19 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 6 May 2014 16:08:12 +1000 Message-Id: <1399356506-5609-9-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> References: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::229 Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, john.williams@xilinx.com, alex.bennee@linaro.org, agraf@suse.de Subject: [Qemu-devel] [PATCH v1 08/22] target-arm: A64: Add ELR entries for EL2 and 3 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" Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 2 +- target-arm/machine.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 7bac416..fd8ce70 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -163,7 +163,7 @@ typedef struct CPUARMState { uint64_t daif; /* exception masks, in the bits they are in in PSTATE */ #define ELR_EL_IDX(x) (x - 1) - uint64_t elr_el[1]; /* AArch64 exception link regs */ + uint64_t elr_el[3]; /* AArch64 exception link regs */ uint64_t sp_el[4]; /* AArch64 banked stack pointers */ /* System control coprocessor (cp15) */ diff --git a/target-arm/machine.c b/target-arm/machine.c index 6a87ef6..92ac621 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -222,9 +222,9 @@ static int cpu_post_load(void *opaque, int version_id) const VMStateDescription vmstate_arm_cpu = { .name = "cpu", - .version_id = 18, - .minimum_version_id = 18, - .minimum_version_id_old = 18, + .version_id = 19, + .minimum_version_id = 19, + .minimum_version_id_old = 19, .pre_save = cpu_pre_save, .post_load = cpu_post_load, .fields = (VMStateField[]) { @@ -243,7 +243,7 @@ const VMStateDescription vmstate_arm_cpu = { VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 6), VMSTATE_UINT32_ARRAY(env.usr_regs, ARMCPU, 5), VMSTATE_UINT32_ARRAY(env.fiq_regs, ARMCPU, 5), - VMSTATE_UINT64(env.elr_el[ELR_EL_IDX(1)], ARMCPU), + VMSTATE_UINT64_ARRAY(env.elr_el, ARMCPU, 3), VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4), /* The length-check must come before the arrays to avoid * incoming data possibly overflowing the array.