From patchwork Sun May 25 01:08:39 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: 352199 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 8A9AB140085 for ; Sun, 25 May 2014 11:17:00 +1000 (EST) Received: from localhost ([::1]:49894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoN3a-0004YQ-6E for incoming@patchwork.ozlabs.org; Sat, 24 May 2014 21:16:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoN38-0003t3-NV for qemu-devel@nongnu.org; Sat, 24 May 2014 21:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoN32-0005vI-Oi for qemu-devel@nongnu.org; Sat, 24 May 2014 21:16:30 -0400 Received: from mail-yk0-x233.google.com ([2607:f8b0:4002:c07::233]:47640) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoN32-0005vE-KF for qemu-devel@nongnu.org; Sat, 24 May 2014 21:16:24 -0400 Received: by mail-yk0-f179.google.com with SMTP id 19so5140823ykq.10 for ; Sat, 24 May 2014 18:16:24 -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=bcVxyH9vEWsBTPLOMMITuSuWK1vxv5KL9Al0EO+sl7c=; b=o/gAzTOhc0MqkryJm9R/NqwPYEI+YeRrnNl1MiRLm6rGcfenmtR1KVNhFya9mM7QiI ubdE222+0oQNGXNzYxUQF8sFMJHoS8Fotg+53CqAwyFzRGJmKnDalOTvtocoE00cQjlM SZFkJMY0DVfuu1le1RhIMtdbOb6f8j+ACJ9OrKQrJMCMfaqi5xA9esUekvmFo7S4H31b 93ktYVvz7t/ka/2XfddlaIDfVLrEizAOUIihwkPB/KuKjoVJSlTWNF3Muywf7c1spLcY j9UZOV7DFAOiNL5Zzg6Kg2scSebOZ86MJkIi2eGbbgccoeww8Car6QyyYWNAuGzNNyJ/ qIWw== X-Received: by 10.236.14.2 with SMTP id c2mr22170056yhc.73.1400980584301; Sat, 24 May 2014 18:16:24 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id i7sm6794136yhd.46.2014.05.24.18.16.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 24 May 2014 18:16:23 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 25 May 2014 11:08:39 +1000 Message-Id: <1400980132-25949-11-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400980132-25949-1-git-send-email-edgar.iglesias@gmail.com> References: <1400980132-25949-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:4002:c07::233 Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, greg.bellows@linaro.org, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v5 10/23] 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" Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 2 +- target-arm/machine.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index ba1d495..60414ac 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -162,7 +162,7 @@ typedef struct CPUARMState { uint32_t condexec_bits; /* IT bits. cpsr[15:10,26:25]. */ uint64_t daif; /* exception masks, in the bits they are in in PSTATE */ - uint64_t elr_el[2]; /* AArch64 exception link regs */ + uint64_t elr_el[4]; /* 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 7b18a90..233e70d 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -218,8 +218,8 @@ static int cpu_post_load(void *opaque, int version_id) const VMStateDescription vmstate_arm_cpu = { .name = "cpu", - .version_id = 18, - .minimum_version_id = 18, + .version_id = 19, + .minimum_version_id = 19, .pre_save = cpu_pre_save, .post_load = cpu_post_load, .fields = (VMStateField[]) { @@ -238,7 +238,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[1], ARMCPU), + VMSTATE_UINT64_ARRAY(env.elr_el, ARMCPU, 4), VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4), /* The length-check must come before the arrays to avoid * incoming data possibly overflowing the array.