From patchwork Thu Jan 4 16:42:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCDKw1Y6cz9sQm for ; Fri, 5 Jan 2018 03:49:40 +1100 (AEDT) Received: from localhost ([::1]:50001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8i2-0005Xp-96 for incoming@patchwork.ozlabs.org; Thu, 04 Jan 2018 11:49:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8ba-0007Xp-BB for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:43:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX8bX-0003Vl-T2 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:42:58 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:63278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX8bX-0003U0-I4 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:42:55 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Louat-1f8NAT0PDH-00gn1w; Thu, 04 Jan 2018 17:42:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 17:42:37 +0100 Message-Id: <20180104164251.26494-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104164251.26494-1-laurent@vivier.eu> References: <20180104164251.26494-1-laurent@vivier.eu> X-Provags-ID: V03:K0:oaTPpn58dZfmpTBjX3rOE/4wR7GZmCov1ZzXaGnNuNGdVVPhCZr NWYmg5w3NnSxoebLn+flKU0Ealg8ikth4VkvtCU5/S6irNl+vvwQfGu0Pgv8vVpUaJcYlnV LQFaj59vxZycwjSkm4kLXIObGnnfxk4O4nBys/61J3epQbeVY7l0+2q0oE5YzGvLrxr6WsY +pp5LpU+94KggwhZVYZVw== X-UI-Out-Filterresults: notjunk:1; V01:K0:HD5irGltZ4Q=:hMpT4uxtOFdWFXaQKF8CKG w4P3p5FfyfI4Fp4e23O6XsfkniLwaG5KJ5K1L7KjshvQ4kPLDvbiN4t+1yV/4ENeI3xxwMdTY Upi3lGcL/sUMQukdmI2m/DJWqAZvESkzM7c3/rg+OnyrIokfOeXDqthcf1SiQAE6eCJjacjrX pVUYqpU5bfgiyEjlU5WSk9FFRGv5ELxQaBTW9SY0a2nR5fSJ7uZlW2/AFlDldxovpqPlNPPny iMilPsl4A/atp8VXizIjodeEFSBw3N5NGtcWE/iTNThaSlBoBO6+zAAs11X7PxIDYlvbawvlz FLIrTGu3boPPvT8RXkOdT4qQN2y6+pDl2kCgvnW7i4WM6UYEPR6wE6V4yvdo4scOWNLK++px1 35O6P+07f9QyiqufnXvnVPNsL2SIKi1gEZN3TlvPzTkgk+V1Xu4y4vDgn5U5LO+ssX7Kjsxwa e507NHX+VBbg5sXFSew/GFzQ7emZM0Lfoege7LgGocWUyMS8DlHSvev2K1oM0BrFVxVK06U35 0eBUX5gvaYeShpSt42ONiHO/zOqHuGjTd684BZ7R+v2430eCsPTEaPwVxfjV7HMs12E1LpibV ACdck3O9UDkCvyI2Twjx1fZzbbqDd+h0TX7fQ6k+VhgsKKeQG3VAlowEr9nAZxGKpL6ajaS8g einqyhKZ24t+YZAyZwG/hZsDOZp+hJVeTSpqaQU+ka57c96k2QLx9NS93EGg57b5GRP90ip+B BxAkAFVQJmYChx+Vmz+5VapuxXCy3SNUfgEHdc4/Xc4CwJfFvWve3xB7Ec4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 03/17] linux-user, m68k: correctly manage SR in context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use cpu_m68k_get_ccr()/cpu_m68k_set_ccr() to setup and restore correctly the value of SR in the context structure. Fix target_rt_setup_ucontext(). Fixes: 3219de458c ("linux-user: correctly manage SR in ucontext") Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20180104012913.30763-4-laurent@vivier.eu> --- linux-user/signal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index dae14d4a89..74fa03f96d 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5612,13 +5612,14 @@ struct target_rt_sigframe static void setup_sigcontext(struct target_sigcontext *sc, CPUM68KState *env, abi_ulong mask) { + uint32_t sr = (env->sr & 0xff00) | cpu_m68k_get_ccr(env); __put_user(mask, &sc->sc_mask); __put_user(env->aregs[7], &sc->sc_usp); __put_user(env->dregs[0], &sc->sc_d0); __put_user(env->dregs[1], &sc->sc_d1); __put_user(env->aregs[0], &sc->sc_a0); __put_user(env->aregs[1], &sc->sc_a1); - __put_user(env->sr, &sc->sc_sr); + __put_user(sr, &sc->sc_sr); __put_user(env->pc, &sc->sc_pc); } @@ -5634,7 +5635,7 @@ restore_sigcontext(CPUM68KState *env, struct target_sigcontext *sc) __get_user(env->aregs[1], &sc->sc_a1); __get_user(env->pc, &sc->sc_pc); __get_user(temp, &sc->sc_sr); - env->sr = (env->sr & 0xff00) | (temp & 0xff); + cpu_m68k_set_ccr(env, temp); } /* @@ -5726,7 +5727,7 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc, CPUM68KState *env) { target_greg_t *gregs = uc->tuc_mcontext.gregs; - uint32_t sr = cpu_m68k_get_ccr(env); + uint32_t sr = (env->sr & 0xff00) | cpu_m68k_get_ccr(env); __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(env->dregs[0], &gregs[0]);