From patchwork Tue Sep 30 21:49:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38185 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0259B2055D for ; Tue, 30 Sep 2014 21:51:55 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id y10sf834843wgg.9 for ; Tue, 30 Sep 2014 14:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc: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; bh=EppXUNOY/p1yj24lT5Jy/z+7juMS0JBksrMrZSQAwdA=; b=fW5Ot6KLICNl5OCTPqkSFKkWtdHnVNWaZlpf2kEsnjE6bf5och6A56vr5eXmRLEWC6 dBiSx6llKI0udfmbdFkzTVtpgPzjy5DKw6+TMdR/Ho/X2lysQ8s26ZChkQjKabhNiXZl IaqaIaqDAQjVfxMeImP1T6by86JWlRaCRfwPrhFDktBRJ6N+iYDCKaMdUpO86xNfXO/R p0ko+9Ak7+dRu2eAbbYOZ48N/d/IiLTl5eaf4RnHFQva3HJhuDMp8ER2er3jPlhqEg7/ jmUV1HSaG9go9d6HjtOIaN12iBsCecPfNnDggTL/AXys3J+Fhs2taDwrUyqXT49b1dHq 3WyQ== X-Gm-Message-State: ALoCoQmyBn7IqvRDVoIXRQ87rkbrZ79fvNEcUSULmtKb5QnZbUwAy8DEPxj8Z9as1qmvXHNeyZAV X-Received: by 10.180.74.14 with SMTP id p14mr1364676wiv.6.1412113915240; Tue, 30 Sep 2014 14:51:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.229 with SMTP id h5ls100207lam.4.gmail; Tue, 30 Sep 2014 14:51:55 -0700 (PDT) X-Received: by 10.153.6.11 with SMTP id cq11mr15411938lad.55.1412113915068; Tue, 30 Sep 2014 14:51:55 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id q1si8414553laj.55.2014.09.30.14.51.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:51:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id b6so5437296lbj.31 for ; Tue, 30 Sep 2014 14:51:55 -0700 (PDT) X-Received: by 10.152.42.136 with SMTP id o8mr50218962lal.71.1412113914996; Tue, 30 Sep 2014 14:51:54 -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 of9csp429249lbb; Tue, 30 Sep 2014 14:51:54 -0700 (PDT) X-Received: by 10.229.84.133 with SMTP id j5mr64039307qcl.14.1412113913889; Tue, 30 Sep 2014 14:51:53 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b9si20405421qas.3.2014.09.30.14.51.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:51:53 -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]:46542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5Kn-0001lt-Ib for patch@linaro.org; Tue, 30 Sep 2014 17:51:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5JB-0000Ii-6X for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ5J6-0003SD-6M for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:09 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:59433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5J5-0003B9-VR for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:04 -0400 Received: by mail-pa0-f41.google.com with SMTP id eu11so4978928pac.14 for ; Tue, 30 Sep 2014 14:49:55 -0700 (PDT) X-Received: by 10.66.139.106 with SMTP id qx10mr72877205pab.126.1412113795507; Tue, 30 Sep 2014 14:49:55 -0700 (PDT) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id qy1sm16027662pbc.27.2014.09.30.14.49.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:49:54 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch Date: Tue, 30 Sep 2014 16:49:13 -0500 Message-Id: <1412113785-21525-2-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412113785-21525-1-git-send-email-greg.bellows@linaro.org> References: <1412113785-21525-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.41 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v5 01/33] target-arm: increase arrays of registers R13 & R14 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: greg.bellows@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.217.172 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: Fabian Aggeler Increasing banked_r13 and banked_r14 to store LR_mon and SP_mon (bank index 7). Signed-off-by: Fabian Aggeler Reviewed-by: Edgar E. Iglesias Signed-off-by: Greg Bellows --- target-arm/cpu.h | 4 ++-- target-arm/machine.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 65a3417..81fffd2 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -153,8 +153,8 @@ typedef struct CPUARMState { /* Banked registers. */ uint64_t banked_spsr[8]; - uint32_t banked_r13[6]; - uint32_t banked_r14[6]; + uint32_t banked_r13[8]; + uint32_t banked_r14[8]; /* These hold r8-r12. */ uint32_t usr_regs[5]; diff --git a/target-arm/machine.c b/target-arm/machine.c index ddb7d05..7e69127 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -238,8 +238,8 @@ const VMStateDescription vmstate_arm_cpu = { }, VMSTATE_UINT32(env.spsr, ARMCPU), VMSTATE_UINT64_ARRAY(env.banked_spsr, ARMCPU, 8), - VMSTATE_UINT32_ARRAY(env.banked_r13, ARMCPU, 6), - VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 6), + VMSTATE_UINT32_ARRAY(env.banked_r13, ARMCPU, 8), + VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 8), VMSTATE_UINT32_ARRAY(env.usr_regs, ARMCPU, 5), VMSTATE_UINT32_ARRAY(env.fiq_regs, ARMCPU, 5), VMSTATE_UINT64_ARRAY(env.elr_el, ARMCPU, 4),