From patchwork Thu Jan 4 01:28:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855320 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 3zBqxJ2zrxz9s81 for ; Thu, 4 Jan 2018 12:30:28 +1100 (AEDT) Received: from localhost ([::1]:44662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuMU-0000qK-AA for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:30:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLR-0000p5-Hq for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLP-00075x-Dn for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:21 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:61172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLO-00072L-T7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:19 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LnShi-1f7e8g2mnG-00haFg; Thu, 04 Jan 2018 02:29:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:28:59 +0100 Message-Id: <20180104012913.30763-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:DFU1CO4oUhq2uY+vzHxYm1xVkAbHWoJMNuWYpHEJCxqcRDibCqu WkytUdVwoVo4BuhZuhKQUFppBhk3qPUnL3V4ZukYWsCjpwiEEC+36ClC7kyErxJ+oD7WIBu vM75hL5hG5Q9peek03+wmTRldV2BnZz0GFOyrUQxWQHqLAC9tj+2se1k/Ecrj8StmJjW17E lXzFxbYUBHv/pGUGA1AbA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ir9md/UTWRw=:tewxWw/GH5Cd/6gT8G5EJ6 nvKjMYb+b7d5Hzmdy7RcV6DSYQReyC3Z/mEJVKuEwvs3a7BhGqFYjEEUp66NyLrlaykGszgFl 9cAtcLhU86tJ2TSQ6Or0PdBuMhnK/uHFBU5oldCkM7KdLws5zvwUi6m9YjGcGarxuc5Cbgv/q J1//FnC7itAguGczqnDyh9Er30jm7PYVEUgsYkBoPaId4cyzq6bMO8W+dQ824t2cKYICCxtnF PyMN27v7w1SFu02d16G/gKA955ooEQfO14qrnTk8uzpbN49YIFPW8Khu2+3HrB9KUIJ3zpuvn JYY0f87Xg5O4N7AVVJfeAQ/n8o1j7hxjrtj3FHFxFtZ3pBdmN7K6YxAIESev7OQ+SgH1BGlvg DKBJj9cCu7OGo1TZ9Xhu3AlxJEfJrKrblTrLU+513bTX8+HOEx0zagQgCJU8uKnUwLSeD48TL Gw/MCh6Ub+6EoLnF9gXzDSSNr77vz6BrTdP6M2h2POfws0YGJFmX3ydVggwrPW/Mpp7r/+WJa vssK+QW70ZwL8evEpgZQyS3+NSf7MBzE0CSVsrPPnbuJyXopi3qfvPiiEhbMjx27qS6MaN1As dhRLgn410LYXjR1QLxvVtZvpqOspR/8RFbsy+XkvJ2Dq/RPhDCC80aEyGXmgFYOwMdDzIyK/m u0Yo7cmmPWNhxFJFNLGFQhrCy7POguJoiVYNvS6SxZ2N2uPFIh+vdTixCqIVFfRIKXnf1B0pD 2v428le3PzH7uPQJdEl88WMgMh8m7ZqIAa5edA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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: Thomas Huth , Richard Henderson , 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 --- 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]);