From patchwork Sat Feb 25 11:05:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 732355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3vVlXf6f3Cz9s7v for ; Sat, 25 Feb 2017 22:06:42 +1100 (AEDT) Received: from localhost ([::1]:42110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaBU-0008FI-Ea for incoming@patchwork.ozlabs.org; Sat, 25 Feb 2017 06:06:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaAO-0007ap-Ea for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chaAL-0007an-3j for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:32 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:49181) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chaAK-0007ZX-Pk for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LbO0s-1c2Rqc1Wwc-00kyJd; Sat, 25 Feb 2017 12:05:20 +0100 From: Laurent Vivier To: Riku Voipio Date: Sat, 25 Feb 2017 12:05:16 +0100 Message-Id: <20170225110517.2832-2-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170225110517.2832-1-laurent@vivier.eu> References: <20170225110517.2832-1-laurent@vivier.eu> X-Provags-ID: V03:K0:36lckqh63Lj/jO8PAULwMnmGHn9jBvIAIUJZ+P/Zn0f6Qlr+elo 1IX/nCIYTZzYcVD74VEg2T4V1UnucTDuR4JL5/Sv6pFkBzVWmmhAOTFaeAxECzThGpXY7Kj Roaw8GPIh6Zj+PaI4BFaUsgugcKW3IUHEqohHH/51zQlc02Mi3lPK230GKXjZ+GzSQj9s30 vdEPQ69Xg0ExKhIU3yphQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Pwn5aqMM2fM=:BLUFcg8EtgQQpUL1oE6yXc n6XBEWK/8Z02xHTGHAdhguHcIlaqPC7+rYeFOaE0fH/LvQXg8CAeA+BsxYw2VFWSiHuPCy09N 38k5ZCovohORHtyP6Fz8ZSxdfsPECkVr5j0tQ/Ty6A+5Zf9mkDRBgqYG1Xy7IDvw9aSl+qPau d3k0f2gE5ExD9DPs/TfcQoIa3ZS1g4zhoAi1D5CNmdyxdRPcUMVEZwGA7pVfdr4eBaK7nSkjd m/238nKdyYPDOzizvOccFlSK3wqD1vdYpGfp4wFXMsDT5MGWE1iEST4fkqwZa5Be1fJdFfrao CkuP64hwBV/RSWdi3ZWleB3Gll6BnICR2MeqkpQpqlpV/P+0klkcVSwKHWhuE9TCfjFbitIg4 fCr8NzGr6jWkpKvkwwMCyvVCEVTX+j3J2zMnHKRnnP5G4t7mXWWK+CvtPOSUXKk5TY/q8D9Af B6ll3FXUVprePC/Oy+fVShe3+miXhuGXovLCJ3aZY73m4xatOvJPN2YEYVkePJcmqKpdvgEUP qxbnQuNv/Ru6KU4RStY7gUo186l2+qF9XpddhXOwVKv+T4YfOVyoqBcFzWXYEz1WUT0gWW1Rq us+Y7DXfyAAsyQye/wYaPP/QMiFUUKceXxkNmS6Pyrxe/GBzBOqIhNE3CvNCeVs33VkFhPRy6 F9pdX3xL+lb8FNM/IrRVbdhpzgva37lcBzU1B74/mB1Ijv6vXG4OPDJm9oRyr2LS2mLo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH 1/2] 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: qemu-devel@nongnu.org, 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 ucontext structure Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- 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 5064de0..df452ba 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5495,6 +5495,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]); @@ -5514,7 +5515,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; } @@ -5548,7 +5549,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;