From patchwork Mon Feb 27 22:33:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9594375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5929604AB for ; Mon, 27 Feb 2017 22:34:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7C9326CF9 for ; Mon, 27 Feb 2017 22:34:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACB4F27D45; Mon, 27 Feb 2017 22:34:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6125726CF9 for ; Mon, 27 Feb 2017 22:34:38 +0000 (UTC) Received: from localhost ([::1]:57288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciTsJ-0001TP-4x for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Feb 2017 17:34:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciTrh-0001Qm-5b for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:33:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciTrc-00046S-GQ for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:33:57 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:59488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ciTrc-00041A-7e for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:33:52 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MLgGJ-1cjJ4e0CO3-000t3s; Mon, 27 Feb 2017 23:33:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 27 Feb 2017 23:33:35 +0100 Message-Id: <20170227223337.17434-5-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170227223337.17434-1-laurent@vivier.eu> References: <20170227223337.17434-1-laurent@vivier.eu> X-Provags-ID: V03:K0:7+fDW61jTyM7noGxRh/nu5ddiIOZf00aoM5drz575gqVIgvLJkj EZObbWhJ4YFVwc+w1AoSpQQcNpT+6sEAPXYcfoJDWE+sbL1J9qxlo2gXChB5HQn/M03JoxB AHHDkHkRrESrkWcSFOVQYifmExubJCcgM8n3IuEmjzZxLc6nIrSHKlizu9YoK6kpLNtNQEo 4kpX402DgmKU42JEJHMfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:S4koxu0J1GI=:10TQZQjLJYrv+INixmJq9/ Fk7GhbmvM6cdHxsH2LT/6abYTW7kbsLSu2oLpQFen+2b2nlRFfERijLqDmcXkVL77CIhg8y3W eK2Fvm/9lv9rAuLtvG8vO41P/jN8+7AmcfKsBKdQI4VdT4tMQQU/6EXocOHex/5bjLfaZJTM9 kvdd95TsrUdR/2tp+w/i84l3ZUA117ioaDMoySFZXGpp3eX1nqFcaoXTAM8FApJA1raAdQgzi 7cIlqJ6b9EVzzbjfmFRohbBnL9V5GNqsvH8mz/um2mK9K/CHpXy7+/JgL1Z9X97JdjQ8f+tAN ALsSRvkpyAGtLC+lvFpBvMAjDN7qoFNiyerit6sT0a5JdiFIiyyNPTcDLc9MRtu0C6CTN3S6J nsAS/xD3OvM3JMEXV/hTZHFvM6/1hCa81VtQnhaw6IpnuhJDMi+XWuds4fuS/CyXEfn4WJ3Qb N1Hv436sYHnYUiTJUBB0r4ervkHjRlhYYxnGnaOXI1x/h/I1Tq99U14ZHHtETQr+76MCGawhf lvioEi5ZZNLnfJ/sdUlj+KGeOJnp7CxsZyi0tVmxI7cclmo4fWV6LmsOUKA1lmJTerPvFaUYx XVVESIPPsZAELgQz7VShnZix7NCcAhichle0ITbYB0IlNTFnp5Ik+8Vxw0Qupav4M+vEo0TL5 QHfUfwx9OgZG5aP9uaYixvToWTGRxGdcBV52oln+SJO/WvQyg/M1ZydxetVSDR34cuv8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 4/6] linux-user: correctly manage SR in ucontext 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use cpu_m68k_get_ccr()/cpu_m68k_set_ccr() to setup and restore correctly the value of SR in the ucontext structure Signed-off-by: Laurent Vivier Message-Id: <20170225110517.2832-2-laurent@vivier.eu> --- linux-user/signal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 5dae87e..99adfc2 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5676,6 +5676,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); __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(env->dregs[0], &gregs[0]); @@ -5695,7 +5696,7 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc, __put_user(env->aregs[6], &gregs[14]); __put_user(env->aregs[7], &gregs[15]); __put_user(env->pc, &gregs[16]); - __put_user(env->sr, &gregs[17]); + __put_user(sr, &gregs[17]); return 0; } @@ -5729,7 +5730,7 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env, __get_user(env->aregs[7], &gregs[15]); __get_user(env->pc, &gregs[16]); __get_user(temp, &gregs[17]); - env->sr = (env->sr & 0xff00) | (temp & 0xff); + cpu_m68k_set_ccr(env, temp); return 0;