From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39033)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WFoR3-0004eO-On
	for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:26:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WFoQz-00022M-Dj
	for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:26:21 -0500
Received: from static.88-198-71-155.clients.your-server.de
	([88.198.71.155]:42146 helo=socrates.bennee.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1WFoQz-00022H-83
	for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:26:17 -0500
References: <1392742003-7380-1-git-send-email-j@jannau.net>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <1392742003-7380-1-git-send-email-j@jannau.net>
Date: Tue, 18 Feb 2014 17:26:17 +0000
Message-ID: <87k3csxrgm.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH 1/1] linux-user: AArch64: Fix exclusive
	store of the zero register
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: Janne Grunau <j@jannau.net>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org


j@jannau.net writes:

> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
>  linux-user/main.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/main.c b/linux-user/main.c
> index cabc9e1..9192977 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -953,7 +953,8 @@ static int do_strex_a64(CPUARMState *env)
>              goto finish;
>          }
>      }
> -    val = env->xregs[rt];
> +    /* handle the zero register */
> +    val = rt == 31 ? 0 : env->xregs[rt];
>      switch (size) {
>      case 0:
>          segv = put_user_u8(val, addr);
> @@ -972,7 +973,8 @@ static int do_strex_a64(CPUARMState *env)
>          goto error;
>      }
>      if (is_pair) {
> -        val = env->xregs[rt2];
> +        /* handle the zero register */
> +        val = rt2 == 31 ? 0 : env->xregs[rt2];
>          if (size == 2) {
>              segv = put_user_u32(val, addr + 4);
>          } else {

Looks good to me. I'll have a scan through the other helpers to see if
we've missed any other similar thinkos.

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


-- 
Alex Bennée