From patchwork Mon Jun 9 15:04:14 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: 357513 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 26129140079 for ; Tue, 10 Jun 2014 01:07:29 +1000 (EST) Received: from localhost ([::1]:33689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1AU-0002fW-Lq for incoming@patchwork.ozlabs.org; Mon, 09 Jun 2014 11:07:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu19v-0001hv-Tj for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:06:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu19o-0000hv-QS for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:06:51 -0400 Received: from mail-qc0-x232.google.com ([2607:f8b0:400d:c01::232]:35215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu19o-0000hk-MB for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:06:44 -0400 Received: by mail-qc0-f178.google.com with SMTP id c9so768688qcz.37 for ; Mon, 09 Jun 2014 08:06:44 -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=u7fhL6FMS1witMSH0o4FdeHi+1Lgwjs1UyACQ0EJQlM=; b=O4VFg9O1yAubtv+FtCmswIkYanuz1oGuJzSZvVdJjG/mxQjPVAaO9M3NUN/KrFNw29 2RBlNFuk9QZvv9lTNhsqUDNPzwhQCVJcud/L/cQeHwG/JQjAPHoX+6uKF5j5nlaPLRxK f1tzBh7rI0enaFT7tF2uN4cqtw1tia9pD1+w6eFYGrWS+nQmCPw4NaeK9tdh9q7dTuhe QGe3OtiZ4uBOrIdGB0MYXlDAATDQGBch2x4+3Pypwo/wTLYSHiWB4n62ML3E7xHRI+5P 4bo6vP4OrrflSXpkPZeNAvHO3mDAGorcIsbAv27Ke+zbphmokrh4lt5QNfGIBpW6Dwev HdwA== X-Received: by 10.229.48.133 with SMTP id r5mr33328142qcf.13.1402326404084; Mon, 09 Jun 2014 08:06:44 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id b5sm11829961qgb.16.2014.06.09.08.06.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:06:43 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 10 Jun 2014 01:04:14 +1000 Message-Id: <1402326269-8573-3-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402326269-8573-1-git-send-email-edgar.iglesias@gmail.com> References: <1402326269-8573-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:c01::232 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 v2 02/17] 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" 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]; }