From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCCH-0001xa-Mn for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKCCG-00038l-La for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:13 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCCG-00031Q-Ev for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:12 -0500 From: Peter Maydell Date: Sun, 2 Mar 2014 19:36:38 +0000 Message-Id: <1393789002-29960-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1393789002-29960-1-git-send-email-peter.maydell@linaro.org> References: <1393789002-29960-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/5] linux-user/signal.c: Fix AArch64 big-endian FP register restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andreas Schwab , Riku Voipio , Michael Matz , Alexander Graf , patches@linaro.org Fix the loop restoring the FP registers from the signal frame to match the one used when setting up the signal frame, so that it handles TARGET_WORDS_BIGENDIAN being set. Signed-off-by: Peter Maydell --- linux-user/signal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 04638e2..29734b2 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1233,8 +1233,14 @@ static int target_restore_sigframe(CPUARMState *env, return 1; } - for (i = 0; i < 32 * 2; i++) { - __get_user(env->vfp.regs[i], &aux->fpsimd.vregs[i]); + for (i = 0; i < 32; i++) { +#ifdef TARGET_WORDS_BIGENDIAN + __get_user(env->vfp.regs[i * 2], &aux->fpsimd.vregs[i * 2 + 1]); + __get_user(env->vfp.regs[i * 2 + 1], &aux->fpsimd.vregs[i * 2]); +#else + __get_user(env->vfp.regs[i * 2], &aux->fpsimd.vregs[i * 2]); + __get_user(env->vfp.regs[i * 2 + 1], &aux->fpsimd.vregs[i * 2 + 1]); +#endif } __get_user(fpsr, &aux->fpsimd.fpsr); vfp_set_fpsr(env, fpsr); -- 1.9.0