From patchwork Mon Jun 30 23:09:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 32804 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2BE77203F4 for ; Mon, 30 Jun 2014 23:12:13 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id r10sf42562920pdi.10 for ; Mon, 30 Jun 2014 16:12:13 -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=qSMg5leqD5fL5ep/EOALbOWIjaJiQ1Qx8CesJGQcevQ=; b=c3T8lRBWsUw0ckXYshUz67R0YuAg9ir//KA/PGF15Ya2a8PcsA3uGJ6ZguTuioFOhG GDTq1fQ+5XgaS1y7ltWzDKy9u+zh8edtg0kswGjnAXAD1dg7kAMPTUENk4/NGJPfQqlo QxiEJ/IUbxclLlHNyktSthyhkLzu4UXx3cVCb5Q5HliOlwibq7/u+Z2flqjA4tDt8Ky/ PwbOdykXumIHdOYPPUBL8qzqTaBIMu8IZqo5bLT0ILyCT+PMrYlGc9a2vPrcYyJEGBR4 GX+kEFM9r9lv+i8xTrgI8u9U1gcbiCQEHl94S2SLkzkZUware1gbAkpY/PddHyZH+0OQ 9dww== X-Gm-Message-State: ALoCoQmcn3ssg+IKMHH+HRHenIMepQ5FZkLa7RDE+VdzyAGC47HtQSG5o4T7Mv91HXhWMf24QWEV X-Received: by 10.66.189.163 with SMTP id gj3mr24882694pac.32.1404169933365; Mon, 30 Jun 2014 16:12:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.171 with SMTP id 40ls1212806qgx.9.gmail; Mon, 30 Jun 2014 16:12:13 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr40700664vcm.11.1404169933220; Mon, 30 Jun 2014 16:12:13 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id fv10si10683836vdc.39.2014.06.30.16.12.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:12:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id il7so8380631vcb.27 for ; Mon, 30 Jun 2014 16:12:12 -0700 (PDT) X-Received: by 10.221.42.135 with SMTP id ty7mr40731769vcb.14.1404169932923; Mon, 30 Jun 2014 16:12:12 -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.221.37.5 with SMTP id tc5csp174840vcb; Mon, 30 Jun 2014 16:12:12 -0700 (PDT) X-Received: by 10.140.92.20 with SMTP id a20mr10586142qge.23.1404169932465; Mon, 30 Jun 2014 16:12:12 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k15si27010234qab.72.2014.06.30.16.12.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:12:12 -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]:37010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kk7-0006w0-Ui for patch@linaro.org; Mon, 30 Jun 2014 19:12:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kic-0005Y5-Ix for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kiR-00036O-J5 for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:38 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:44101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kiR-000360-Dh for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:27 -0400 Received: by mail-ob0-f173.google.com with SMTP id va2so9747362obc.32 for ; Mon, 30 Jun 2014 16:10:27 -0700 (PDT) X-Received: by 10.60.140.227 with SMTP id rj3mr12334869oeb.10.1404169827067; Mon, 30 Jun 2014 16:10:27 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id cu7sm76370192oec.12.2014.06.30.16.10.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:10:26 -0700 (PDT) From: greg.bellows@linaro.org To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 18:09:03 -0500 Message-Id: <1404169773-20264-4-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-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.214.173 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v4 03/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.220.182 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 5accbde..ffc51f2 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 3bcc7cc..5ed495e 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -234,8 +234,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),