From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrOxt-0000ue-CO for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:55:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrOxj-0006FD-7Z for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:55:36 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:37376 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrOxj-0006Eh-0q for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:55:27 -0400 References: <1401434911-26992-1-git-send-email-edgar.iglesias@gmail.com> <1401434911-26992-4-git-send-email-edgar.iglesias@gmail.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1401434911-26992-4-git-send-email-edgar.iglesias@gmail.com> Date: Mon, 02 Jun 2014 10:55:25 +0100 Message-ID: <87sinnskj6.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v1 03/16] target-arm: A64: Respect SPSEL when taking exceptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Edgar E. Iglesias" Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, rob.herring@linaro.org, aggelerf@ethz.ch, qemu-devel@nongnu.org, agraf@suse.de, blauwirbel@gmail.com, john.williams@xilinx.com, greg.bellows@linaro.org, pbonzini@redhat.com, christoffer.dall@linaro.org, rth@twiddle.net Edgar E. Iglesias writes: > From: "Edgar E. Iglesias" > > Signed-off-by: Edgar E. Iglesias > --- > target-arm/helper-a64.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c > index cccda74..bc153cb 100644 > --- a/target-arm/helper-a64.c > +++ b/target-arm/helper-a64.c > @@ -489,8 +489,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) > > if (is_a64(env)) { > env->banked_spsr[aarch64_banked_spsr_index(1)] = pstate_read(env); > - env->sp_el[arm_current_pl(env)] = env->xregs[31]; > - env->xregs[31] = env->sp_el[1]; > + aarch64_save_sp(env, arm_current_pl(env)); > env->elr_el[1] = env->pc; > } else { > env->banked_spsr[0] = cpsr_read(env); > @@ -508,6 +507,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) > > pstate_write(env, PSTATE_DAIF | PSTATE_MODE_EL1h); > env->aarch64 = 1; > + aarch64_restore_sp(env, 1); > > env->pc = addr; > cs->interrupt_request |= CPU_INTERRUPT_EXITTB; Reviewed-by: Alex Bennée -- Alex Bennée