[src/trunk]: src/sys/compat/linux/arch/alpha The conversion of FPU tracking t...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e35aa42b39af
branches:  trunk
changeset: 975641:e35aa42b39af
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Sep 03 14:26:31 2020 +0000

description:
The conversion of FPU tracking to PCU rendered the fpcurlwp variable
unmaintained, which broke FP status info in the COMPAT_LINUX sigcontext.
Use the new API, which will at least be closer to correct.

diffstat:

 sys/compat/linux/arch/alpha/linux_machdep.c |  14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diffs (45 lines):

diff -r 6b8ced610d0b -r e35aa42b39af sys/compat/linux/arch/alpha/linux_machdep.c
--- a/sys/compat/linux/arch/alpha/linux_machdep.c       Thu Sep 03 09:41:21 2020 +0000
+++ b/sys/compat/linux/arch/alpha/linux_machdep.c       Thu Sep 03 14:26:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $  */
+/*     $NetBSD: linux_machdep.c,v 1.51 2020/09/03 14:26:31 thorpej Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51 2020/09/03 14:26:31 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -243,14 +243,11 @@
        frametoreg(tf, (struct reg *)sigframe.sf_sc.sc_regs);
        sigframe.sf_sc.sc_regs[R_SP] = alpha_pal_rdusp();
 
-       if (l == fpcurlwp) {
+       if (fpu_valid_p(l)) {
                struct pcb *pcb = lwp_getpcb(l);
 
-               alpha_pal_wrfen(1);
-               savefpstate(&pcb->pcb_fp);
-               alpha_pal_wrfen(0);
+               fpu_save(l);
                sigframe.sf_sc.sc_fpcr = pcb->pcb_fp.fpr_cr;
-               fpcurlwp = NULL;
        }
        /* XXX ownedfp ? etc...? */
 
@@ -394,9 +391,6 @@
        regtoframe((struct reg *)context.sc_regs, l->l_md.md_tf);
        alpha_pal_wrusp(context.sc_regs[R_SP]);
 
-       if (l == fpcurlwp)
-           fpcurlwp = NULL;
-
        /* Restore fp regs and fpr_cr */
        pcb = lwp_getpcb(l);
        memcpy(&pcb->pcb_fp, (struct fpreg *)context.sc_fpregs,