From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41946)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WrOvN-0007xs-KY
	for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:53:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WrOvJ-0005Qt-6a
	for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:53:01 -0400
Received: from static.88-198-71-155.clients.your-server.de
	([88.198.71.155]:37351 helo=socrates.bennee.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WrOvJ-0005Qp-0c
	for qemu-devel@nongnu.org; Mon, 02 Jun 2014 05:52:57 -0400
References: <1401434911-26992-1-git-send-email-edgar.iglesias@gmail.com>
	<1401434911-26992-3-git-send-email-edgar.iglesias@gmail.com>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <1401434911-26992-3-git-send-email-edgar.iglesias@gmail.com>
Date: Mon, 02 Jun 2014 10:52:53 +0100
Message-ID: <87tx83skne.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH v1 02/16] target-arm: A64: Respect SPSEL in
	ERET SP restore
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
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" <edgar.iglesias@xilinx.com>
>
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
>  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 2e2429a..581dc09 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -425,7 +425,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];
>      }

It might be worth putting the Aarch64 ARM reference next to the aarch64_
functions to make it easier to find in future.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée