From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: "Edgar E. Iglesias" Date: Tue, 10 Jun 2014 01:04:14 +1000 Message-Id: <1402326269-8573-3-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1402326269-8573-1-git-send-email-edgar.iglesias@gmail.com> References: <1402326269-8573-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v2 02/17] target-arm: A64: Respect SPSEL in ERET SP restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org 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 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]; } -- 1.8.3.2