From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGRdk-0002NI-0w for qemu-devel@nongnu.org; Thu, 20 Feb 2014 06:18:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGRdi-0004mH-LU for qemu-devel@nongnu.org; Thu, 20 Feb 2014 06:18:03 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGRdi-0004mA-Fk for qemu-devel@nongnu.org; Thu, 20 Feb 2014 06:18:02 -0500 From: Peter Maydell Date: Thu, 20 Feb 2014 11:17:34 +0000 Message-Id: <1392895054-13232-31-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1392895054-13232-1-git-send-email-peter.maydell@linaro.org> References: <1392895054-13232-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 30/30] linux-user: AArch64: Fix exclusive store of the zero register List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno From: Janne Grunau Signed-off-by: Janne Grunau Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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