From patchwork Tue Jun 17 08:45:32 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: 360383 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 DD47E140087 for ; Tue, 17 Jun 2014 18:49:54 +1000 (EST) Received: from localhost ([::1]:48162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwp5U-0005rZ-Ta for incoming@patchwork.ozlabs.org; Tue, 17 Jun 2014 04:49:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwp3c-0003jO-Cf for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:48:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wwp3X-0003V0-Kx for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:47:56 -0400 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]:47609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwp3X-0003Uw-Fe for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:47:51 -0400 Received: by mail-pa0-f53.google.com with SMTP id ey11so2015055pad.40 for ; Tue, 17 Jun 2014 01:47:50 -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=IhOAjfdhWGlWwpbSjplSYwnCRnhijM78UIWaBRuK8Uk=; b=Faqa2ASWOw47qjcsgVZxuPZunbBNIazsiEDUGxpGKXOJaRAXkksSfOGsMUv00ATKqD bLJpS3jn2ufz18u+WJX57UvDHCtTXU1pQsI1oxxe41AVQnVkQwDePF2XZcG+J/7EEQqb tG1I0Mwz3U0MrgMkOii1a3mT7Q3cMVVnYKcxuWhH0STibW7hUtc+71TcHUCdmHwr/ew4 58r13+A5toQQ6oWvNNxkZqCNezPeagMvT5GBI2g7KcFt2fpk1WpPo7m2eVa2j8KTWLnz B+gdz2WiDTz8GMzx3PPXW26FDv+jYK5uLURfP2yHJp+Y2/+tg/3LQFDbFWHE0KWR/lTS XORg== X-Received: by 10.66.118.71 with SMTP id kk7mr2057645pab.147.1402994870533; Tue, 17 Jun 2014 01:47:50 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id qf10sm22826192pbc.23.2014.06.17.01.47.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Jun 2014 01:47:50 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 17 Jun 2014 18:45:32 +1000 Message-Id: <1402994746-8328-3-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402994746-8328-1-git-send-email-edgar.iglesias@gmail.com> References: <1402994746-8328-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:400e:c03::235 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 v3 02/16] target-arm: A64: Respect SPSEL in ERET SP restore 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: Alex Bennée Signed-off-by: Edgar E. Iglesias --- target-arm/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 90a946a..25ad902 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -410,7 +410,7 @@ void HELPER(exception_return)(CPUARMState *env) } env->aarch64 = 1; pstate_write(env, spsr); - env->xregs[31] = env->sp_el[new_el]; + aarch64_restore_sp(env, new_el); env->pc = env->elr_el[cur_el]; }