From 2ea5a2ca1f1dc302652d2ad5035e0b209ccaa177 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 20 Feb 2014 10:35:56 +0000 Subject: linux-user: AArch64: Fix exclusive store of the zero register 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 cabc9e1a0e..919297736c 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 { -- cgit v1.2.3