Module Name: src
Committed By: maxv
Date: Sun May 19 08:46:15 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c
src/sys/arch/i386/i386: compat_16_machdep.c machdep.c
src/sys/arch/x86/include: fpu.h
src/sys/arch/x86/x86: fpu.c
src/sys/compat/linux/arch/amd64: linux_machdep.c
src/sys/compat/linux/arch/i386: linux_machdep.c
src/sys/compat/linux32/arch/amd64: linux32_machdep.c
Log Message:
Rename
fpu_save_area_clear -> fpu_clear
fpu_save_area_reset -> fpu_sigreset
Clearer, and reduces a future diff. No real functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.819 -r1.820 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/include/fpu.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs rdiff -u -r1.165 -r1.166 src/sys/compat/linux/arch/i386/linux_machdep.c
cvs rdiff -u -r1.44 -r1.45 \
src/sys/compat/linux32/arch/amd64/linux32_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/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.330 src/sys/arch/amd64/amd64/machdep.c:1.331
--- src/sys/arch/amd64/amd64/machdep.c:1.330 Sun May 19 08:17:02 2019
+++ src/sys/arch/amd64/amd64/machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.330 2019/05/19 08:17:02 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.331 2019/05/19 08:46:15 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.330 2019/05/19 08:17:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.331 2019/05/19 08:46:15 maxv Exp $");
#include "opt_modular.h"
#include "opt_user_ldt.h"
@@ -585,7 +585,7 @@ buildcontext(struct lwp *l, void *catche
tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
/* Ensure FP state is sane */
- fpu_save_area_reset(l);
+ fpu_sigreset(l);
}
void
@@ -1369,7 +1369,7 @@ setregs(struct lwp *l, struct exec_packa
pmap_ldt_cleanup(l);
#endif
- fpu_save_area_clear(l, pack->ep_osversion >= 699002600
+ fpu_clear(l, pack->ep_osversion >= 699002600
? __NetBSD_NPXCW__ : __NetBSD_COMPAT_NPXCW__);
x86_dbregs_clear(l);
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.120 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.121
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.120 Sun Mar 24 15:58:32 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.120 2019/03/24 15:58:32 maxv Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.121 2019/05/19 08:46:15 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.120 2019/03/24 15:58:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.121 2019/05/19 08:46:15 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -138,7 +138,7 @@ netbsd32_setregs(struct lwp *l, struct e
netbsd32_adjust_limits(p);
- fpu_save_area_clear(l, pack->ep_osversion >= 699002600
+ fpu_clear(l, pack->ep_osversion >= 699002600
? __NetBSD_NPXCW__ : __NetBSD_COMPAT_NPXCW__);
x86_dbregs_clear(l);
@@ -183,7 +183,7 @@ netbsd32_buildcontext(struct lwp *l, str
#endif
/* Ensure FP state is sane. */
- fpu_save_area_reset(l);
+ fpu_sigreset(l);
tf->tf_rip = (uint64_t)catcher;
tf->tf_cs = GSEL(GUCODE32_SEL, SEL_UPL);
Index: src/sys/arch/i386/i386/compat_16_machdep.c
diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.30 src/sys/arch/i386/i386/compat_16_machdep.c:1.31
--- src/sys/arch/i386/i386/compat_16_machdep.c:1.30 Sun Sep 17 09:41:35 2017
+++ src/sys/arch/i386/i386/compat_16_machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.30 2017/09/17 09:41:35 maxv Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.31 2019/05/19 08:46:15 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.30 2017/09/17 09:41:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.31 2019/05/19 08:46:15 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -232,7 +232,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi
/* NOTREACHED */
}
- fpu_save_area_reset(l);
+ fpu_sigreset(l);
buildcontext(l, sel, catcher, fp);
/* Remember that we're now on the signal stack. */
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.819 src/sys/arch/i386/i386/machdep.c:1.820
--- src/sys/arch/i386/i386/machdep.c:1.819 Sun May 19 08:17:02 2019
+++ src/sys/arch/i386/i386/machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.819 2019/05/19 08:17:02 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.820 2019/05/19 08:46:15 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.819 2019/05/19 08:17:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.820 2019/05/19 08:46:15 maxv Exp $");
#include "opt_beep.h"
#include "opt_compat_freebsd.h"
@@ -666,7 +666,7 @@ buildcontext(struct lwp *l, int sel, voi
tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
/* Ensure FP state is reset. */
- fpu_save_area_reset(l);
+ fpu_sigreset(l);
}
void
@@ -865,7 +865,7 @@ setregs(struct lwp *l, struct exec_packa
pmap_ldt_cleanup(l);
#endif
- fpu_save_area_clear(l, pack->ep_osversion >= 699002600
+ fpu_clear(l, pack->ep_osversion >= 699002600
? __INITIAL_NPXCW__ : __NetBSD_COMPAT_NPXCW__);
memcpy(&pcb->pcb_fsd, &gdtstore[GUDATA_SEL], sizeof(pcb->pcb_fsd));
Index: src/sys/arch/x86/include/fpu.h
diff -u src/sys/arch/x86/include/fpu.h:1.15 src/sys/arch/x86/include/fpu.h:1.16
--- src/sys/arch/x86/include/fpu.h:1.15 Sun May 19 08:17:02 2019
+++ src/sys/arch/x86/include/fpu.h Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.15 2019/05/19 08:17:02 maxv Exp $ */
+/* $NetBSD: fpu.h,v 1.16 2019/05/19 08:46:15 maxv Exp $ */
#ifndef _X86_FPU_H_
#define _X86_FPU_H_
@@ -27,8 +27,8 @@ void fpu_set_default_cw(struct lwp *, un
void fputrap(struct trapframe *);
void fpudna(struct trapframe *);
-void fpu_save_area_clear(struct lwp *, unsigned int);
-void fpu_save_area_reset(struct lwp *);
+void fpu_clear(struct lwp *, unsigned int);
+void fpu_sigreset(struct lwp *);
void fpu_save_area_fork(struct pcb *, const struct pcb *);
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.51 src/sys/arch/x86/x86/fpu.c:1.52
--- src/sys/arch/x86/x86/fpu.c:1.51 Sun May 19 08:17:02 2019
+++ src/sys/arch/x86/x86/fpu.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.51 2019/05/19 08:17:02 maxv Exp $ */
+/* $NetBSD: fpu.c,v 1.52 2019/05/19 08:46:15 maxv Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.51 2019/05/19 08:17:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.52 2019/05/19 08:46:15 maxv Exp $");
#include "opt_multiprocessor.h"
@@ -610,7 +610,7 @@ fpu_set_default_cw(struct lwp *l, unsign
}
void
-fpu_save_area_clear(struct lwp *l, unsigned int x87_cw)
+fpu_clear(struct lwp *l, unsigned int x87_cw)
{
union savefpu *fpu_save;
struct pcb *pcb;
@@ -671,7 +671,7 @@ fpu_save_area_clear(struct lwp *l, unsig
}
void
-fpu_save_area_reset(struct lwp *l)
+fpu_sigreset(struct lwp *l)
{
union savefpu *fpu_save = lwp_fpuarea(l);
struct pcb *pcb = lwp_getpcb(l);
Index: src/sys/compat/linux/arch/amd64/linux_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.57 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.58
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.57 Sun Mar 24 13:15:43 2019
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.57 2019/03/24 13:15:43 maxv Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.58 2019/05/19 08:46:15 maxv Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.57 2019/03/24 13:15:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.58 2019/05/19 08:46:15 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -90,7 +90,7 @@ linux_setregs(struct lwp *l, struct exec
pmap_ldt_cleanup(l);
#endif
- fpu_save_area_clear(l, __NetBSD_NPXCW__);
+ fpu_clear(l, __NetBSD_NPXCW__);
kpreempt_disable();
pcb->pcb_flags = 0;
Index: src/sys/compat/linux/arch/i386/linux_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_machdep.c:1.165 src/sys/compat/linux/arch/i386/linux_machdep.c:1.166
--- src/sys/compat/linux/arch/i386/linux_machdep.c:1.165 Sun Sep 17 09:41:35 2017
+++ src/sys/compat/linux/arch/i386/linux_machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.165 2017/09/17 09:41:35 maxv Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.166 2019/05/19 08:46:15 maxv Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.165 2017/09/17 09:41:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.166 2019/05/19 08:46:15 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_user_ldt.h"
@@ -132,7 +132,7 @@ linux_setregs(struct lwp *l, struct exec
pmap_ldt_cleanup(l);
#endif
- fpu_save_area_clear(l, __Linux_NPXCW__);
+ fpu_clear(l, __Linux_NPXCW__);
tf = l->l_md.md_regs;
tf->tf_gs = 0;
Index: src/sys/compat/linux32/arch/amd64/linux32_machdep.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.44 src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.45
--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.44 Sun Mar 24 15:58:32 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c Sun May 19 08:46:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_machdep.c,v 1.44 2019/03/24 15:58:32 maxv Exp $ */
+/* $NetBSD: linux32_machdep.c,v 1.45 2019/05/19 08:46:15 maxv Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.44 2019/03/24 15:58:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.45 2019/05/19 08:46:15 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_user_ldt.h"
@@ -285,7 +285,7 @@ linux32_setregs(struct lwp *l, struct ex
netbsd32_adjust_limits(p);
- fpu_save_area_clear(l, __Linux_NPXCW__);
+ fpu_clear(l, __Linux_NPXCW__);
kpreempt_disable();
pcb->pcb_flags = PCB_COMPAT32;
