From nobody Thu May 2 04:05:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505407007872375.79726190296697; Thu, 14 Sep 2017 09:36:47 -0700 (PDT) Received: from localhost ([::1]:48886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsX8B-0001sR-4i for importer@patchew.org; Thu, 14 Sep 2017 12:36:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsX6s-00011M-N7 for qemu-devel@nongnu.org; Thu, 14 Sep 2017 12:35:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsX6o-0003KI-5I for qemu-devel@nongnu.org; Thu, 14 Sep 2017 12:35:26 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63095) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dsX6n-0003JW-Ps for qemu-devel@nongnu.org; Thu, 14 Sep 2017 12:35:22 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MDpnS-1ddeS30Zyg-00H63B; Thu, 14 Sep 2017 18:35:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 18:35:05 +0200 Message-Id: <20170914163505.20558-2-laurent@vivier.eu> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170914163505.20558-1-laurent@vivier.eu> References: <20170914163505.20558-1-laurent@vivier.eu> X-Provags-ID: V03:K0:PzyGmqUpIxikNM9g/KdYEz68Hq6ShY7ji0CrsFHugWtc/Y/ML6u 3rHpjmGOZjJFE8y/D/uW9OsIPgmNFUSb49OdkKxEm47JD8AvYyXS6At50rFCLL6BDM8Fh4M nKBIVqcaHOWElYWwzs5bie1D1vDB7oDPrvQjHEGQQ38nxOvuIsALapxap00t3N0VqG7Qsq1 zCFxVvq+DwGNAO6xrQScw== X-UI-Out-Filterresults: notjunk:1;V01:K0:JXCnIZuhv4o=:+H1Yveov4fa0TInWS9FZ6n kzbDNK20eUSBrTu0e2GUk0bnvVUpsUTM9eDXx4phhm2MHy2CP+asRArxaNOKx/SuNjU8W5fZb OKEh3Uo3+bldJ1ThDGN2CaThA/AFs1UsGsWjB9jWtHpChQYCXl5PY2VOispPhkRUpEGWLsmDR EH8siKQQMAyot12TbeHvOJBycq+sDjQbZSN+g0TzLGUJP1aeBamx4qXFqvMkmK9IMQYcEo/+j xc2Jlh7yoGIjhweVaZhTItJfEpt81M7qdfZqmgCrjSVuZrdNGF8vSrKHR9rjWF/r8f+Tyw18H hS9T044+VCZNjT9ycGyCddqKtREzl7x2cXxhg8F6ozpu43Aa67a64KKHGhAlPDaNBYEvMvg9y P/tRjZgGHL+xiE+8Aj39q4PMQdV6JdbnuMyPoD4B3IgHTHYamHQlehkF9pDP4Bg7q4/yYUo4G TnN8JR0Xoj9LShdkAeLY2/a9pRYnl8NmJK8ma11idLJ0Pm9kmYNe+a/v+7tfueLdMZ2NsqNQK OnMx1PctY/MUsd5ctzbCoEqk8xou6NvZ9NObfIF+JbCn2ihH/HufIsJlBl3wgHn//qj3T47Qc +yrry5Y9dcA9mrpwqPYX/QuHrlSaJEAgtL6iG/bWo4C208C6XilBUeQFdPfEduQHwRxthYu3p UAxRQ2CI0l7O7Qt7sGYNOowDKEW5QKiA9b2F5dq0tAB0DaUSH1b7rfCgvwDJjHT4TswEe5ZKV j5ghfW8lryr0WiSRg5Kp3n0YCBMz1ND6vKOmCQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v4 1/1] target/m68k, linux-user: manage FP registers 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 , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/signal.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c index cc0c3fcee9..7a238aaea1 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5704,6 +5704,24 @@ give_sigsegv: force_sigsegv(sig); } =20 +static inline void target_rt_save_fpu_state(struct target_ucontext *uc, + CPUM68KState *env) +{ + int i; + target_fpregset_t *fpregs =3D &uc->tuc_mcontext.fpregs; + + __put_user(env->fpcr, &fpregs->f_fpcntl[0]); + __put_user(env->fpsr, &fpregs->f_fpcntl[1]); + /* fpiar is not emulated */ + + for (i =3D 0; i < 8; i++) { + uint32_t high =3D env->fregs[i].d.high << 16; + __put_user(high, &fpregs->f_fpregs[i * 3]); + __put_user(env->fregs[i].d.low, + (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]); + } +} + static inline int target_rt_setup_ucontext(struct target_ucontext *uc, CPUM68KState *env) { @@ -5730,9 +5748,32 @@ static inline int target_rt_setup_ucontext(struct ta= rget_ucontext *uc, __put_user(env->pc, &gregs[16]); __put_user(sr, &gregs[17]); =20 + target_rt_save_fpu_state(uc, env); + return 0; } =20 +static inline void target_rt_restore_fpu_state(CPUM68KState *env, + struct target_ucontext *uc) +{ + int i; + target_fpregset_t *fpregs =3D &uc->tuc_mcontext.fpregs; + uint32_t fpcr; + + __get_user(fpcr, &fpregs->f_fpcntl[0]); + cpu_m68k_set_fpcr(env, fpcr); + __get_user(env->fpsr, &fpregs->f_fpcntl[1]); + /* fpiar is not emulated */ + + for (i =3D 0; i < 8; i++) { + uint32_t high; + __get_user(high, &fpregs->f_fpregs[i * 3]); + env->fregs[i].d.high =3D high >> 16; + __get_user(env->fregs[i].d.low, + (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]); + } +} + static inline int target_rt_restore_ucontext(CPUM68KState *env, struct target_ucontext *uc) { @@ -5764,6 +5805,8 @@ static inline int target_rt_restore_ucontext(CPUM68KS= tate *env, __get_user(temp, &gregs[17]); cpu_m68k_set_ccr(env, temp); =20 + target_rt_restore_fpu_state(env, uc); + return 0; =20 badframe: --=20 2.13.5