From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFnoo-0008S3-Gn for qemu-devel@nongnu.org; Tue, 18 Feb 2014 11:46:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFnoi-0004aa-Fn for qemu-devel@nongnu.org; Tue, 18 Feb 2014 11:46:50 -0500 Received: from soltyk.jannau.net ([185.27.253.110]:36998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFnoi-0004aI-AB for qemu-devel@nongnu.org; Tue, 18 Feb 2014 11:46:44 -0500 From: Janne Grunau Date: Tue, 18 Feb 2014 17:46:43 +0100 Message-Id: <1392742003-7380-1-git-send-email-j@jannau.net> Subject: [Qemu-devel] [PATCH 1/1] linux-user: AArch64: Fix exclusive store of the zero register List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Signed-off-by: Janne Grunau --- 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 { -- 1.8.5.5