Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
thorpej 2020-09-03 14:26:31 +00:00
parent 01b235c952
commit c1a69249ed
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/linux/arch/alpha/linux_machdep.c
View File

@ -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. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #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/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -243,14 +243,11 @@ void setup_linux_sigframe(struct trapframe *tf, const ksiginfo_t *ksi,
frametoreg(tf, (struct reg *)sigframe.sf_sc.sc_regs); frametoreg(tf, (struct reg *)sigframe.sf_sc.sc_regs);
sigframe.sf_sc.sc_regs[R_SP] = alpha_pal_rdusp(); sigframe.sf_sc.sc_regs[R_SP] = alpha_pal_rdusp();
if (l == fpcurlwp) { if (fpu_valid_p(l)) {
struct pcb *pcb = lwp_getpcb(l); struct pcb *pcb = lwp_getpcb(l);
alpha_pal_wrfen(1); fpu_save(l);
savefpstate(&pcb->pcb_fp);
alpha_pal_wrfen(0);
sigframe.sf_sc.sc_fpcr = pcb->pcb_fp.fpr_cr; sigframe.sf_sc.sc_fpcr = pcb->pcb_fp.fpr_cr;
fpcurlwp = NULL;
} }
/* XXX ownedfp ? etc...? */ /* XXX ownedfp ? etc...? */
@ -394,9 +391,6 @@ linux_restore_sigcontext(struct lwp *l, struct linux_sigcontext context,
regtoframe((struct reg *)context.sc_regs, l->l_md.md_tf); regtoframe((struct reg *)context.sc_regs, l->l_md.md_tf);
alpha_pal_wrusp(context.sc_regs[R_SP]); alpha_pal_wrusp(context.sc_regs[R_SP]);
if (l == fpcurlwp)
fpcurlwp = NULL;
/* Restore fp regs and fpr_cr */ /* Restore fp regs and fpr_cr */
pcb = lwp_getpcb(l); pcb = lwp_getpcb(l);
memcpy(&pcb->pcb_fp, (struct fpreg *)context.sc_fpregs, memcpy(&pcb->pcb_fp, (struct fpreg *)context.sc_fpregs,