Module Name: src
Committed By: thorpej
Date: Thu Sep 3 14:26:31 UTC 2020
Modified Files:
src/sys/compat/linux/arch/alpha: linux_machdep.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/linux/arch/alpha/linux_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/linux_machdep.c
diff -u src/sys/compat/linux/arch/alpha/linux_machdep.c:1.50 src/sys/compat/linux/arch/alpha/linux_machdep.c:1.51
--- src/sys/compat/linux/arch/alpha/linux_machdep.c:1.50 Sun Nov 9 17:48:07 2014
+++ src/sys/compat/linux/arch/alpha/linux_machdep.c Thu Sep 3 14:26:31 2020
@@ -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 @@ void setup_linux_sigframe(struct trapfra
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 @@ linux_restore_sigcontext(struct lwp *l,
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,
