[{"id":1787388,"web_url":"http://patchwork.ozlabs.org/comment/1787388/","msgid":"<20171016122738.GA1918@kos.to>","list_archive_url":null,"date":"2017-10-16T12:27:38","subject":"Re: [Qemu-devel] [PATCH v4 1/1] target/m68k,\n\tlinux-user: manage FP registers in ucontext","submitter":{"id":1917,"url":"http://patchwork.ozlabs.org/api/people/1917/","name":"Riku Voipio","email":"riku.voipio@iki.fi"},"content":"On Thu, Sep 14, 2017 at 06:35:05PM +0200, Laurent Vivier wrote:\n> Signed-off-by: Laurent Vivier \n> Reviewed-by: Richard Henderson \n\nApplied to linux-user que, thnanks\n\n> ---\n> linux-user/signal.c | 43 +++++++++++++++++++++++++++++++++++++++++++\n> 1 file changed, 43 insertions(+)\n> \n> diff --git a/linux-user/signal.c b/linux-user/signal.c\n> index cc0c3fcee9..7a238aaea1 100644\n> --- a/linux-user/signal.c\n> +++ b/linux-user/signal.c\n> @@ -5704,6 +5704,24 @@ give_sigsegv:\n> force_sigsegv(sig);\n> }\n> \n> +static inline void target_rt_save_fpu_state(struct target_ucontext *uc,\n> + CPUM68KState *env)\n> +{\n> + int i;\n> + target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;\n> +\n> + __put_user(env->fpcr, &fpregs->f_fpcntl[0]);\n> + __put_user(env->fpsr, &fpregs->f_fpcntl[1]);\n> + /* fpiar is not emulated */\n> +\n> + for (i = 0; i < 8; i++) {\n> + uint32_t high = env->fregs[i].d.high << 16;\n> + __put_user(high, &fpregs->f_fpregs[i * 3]);\n> + __put_user(env->fregs[i].d.low,\n> + (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);\n> + }\n> +}\n> +\n> static inline int target_rt_setup_ucontext(struct target_ucontext *uc,\n> CPUM68KState *env)\n> {\n> @@ -5730,9 +5748,32 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc,\n> __put_user(env->pc, &gregs[16]);\n> __put_user(sr, &gregs[17]);\n> \n> + target_rt_save_fpu_state(uc, env);\n> +\n> return 0;\n> }\n> \n> +static inline void target_rt_restore_fpu_state(CPUM68KState *env,\n> + struct target_ucontext *uc)\n> +{\n> + int i;\n> + target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;\n> + uint32_t fpcr;\n> +\n> + __get_user(fpcr, &fpregs->f_fpcntl[0]);\n> + cpu_m68k_set_fpcr(env, fpcr);\n> + __get_user(env->fpsr, &fpregs->f_fpcntl[1]);\n> + /* fpiar is not emulated */\n> +\n> + for (i = 0; i < 8; i++) {\n> + uint32_t high;\n> + __get_user(high, &fpregs->f_fpregs[i * 3]);\n> + env->fregs[i].d.high = high >> 16;\n> + __get_user(env->fregs[i].d.low,\n> + (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);\n> + }\n> +}\n> +\n> static inline int target_rt_restore_ucontext(CPUM68KState *env,\n> struct target_ucontext *uc)\n> {\n> @@ -5764,6 +5805,8 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env,\n> __get_user(temp, &gregs[17]);\n> cpu_m68k_set_ccr(env, temp);\n> \n> + target_rt_restore_fpu_state(env, uc);\n> +\n> return 0;\n> \n> badframe:\n> -- \n> 2.13.5\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3yFyK30g8Lz9t2W\n\tfor ;\n\tMon, 16 Oct 2017 23:28:07 +1100 (AEDT)","from localhost ([::1]:60998 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1e44V3-00009o-7a\n\tfor incoming@patchwork.ozlabs.org; Mon, 16 Oct 2017 08:28:05 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43875)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1e44Uj-00009C-JJ\n\tfor qemu-devel@nongnu.org; Mon, 16 Oct 2017 08:27:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1e44Ug-0001V0-Uw\n\tfor qemu-devel@nongnu.org; Mon, 16 Oct 2017 08:27:45 -0400","from jessie.kos.to ([212.47.231.226]:52296 helo=pilvi.kos.to)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1e44Ug-0001PO-Od\n\tfor qemu-devel@nongnu.org; Mon, 16 Oct 2017 08:27:42 -0400","from kos.to (jessie.kos.to [212.47.231.226])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby pilvi.kos.to (Postfix) with ESMTPSA id 31B962C19B0;\n\tMon, 16 Oct 2017 12:27:39 +0000 (UTC)","(nullmailer pid 4214 invoked by uid 1000);\n\tMon, 16 Oct 2017 12:27:38 -0000"],"Date":"Mon, 16 Oct 2017 12:27:38 +0000","From":"Riku Voipio ","To":"Laurent Vivier ","Message-ID":"<20171016122738.GA1918@kos.to>","References":"<20170914163505.20558-1-laurent@vivier.eu>\n\t<20170914163505.20558-2-laurent@vivier.eu>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20170914163505.20558-2-laurent@vivier.eu>","User-Agent":"Mutt/1.5.23 (2014-03-12)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"212.47.231.226","Subject":"Re: [Qemu-devel] [PATCH v4 1/1] target/m68k,\n\tlinux-user: manage FP registers in ucontext","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-devel@nongnu.org, Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]