Convert the VM86 option from a global option to an option only depended

on by the files that use it.  Changing the VM86 option now only causes
a recompile of a dozen files or so rather than the entire kernel.
This commit is contained in:
Peter Wemm 1997-10-10 09:44:12 +00:00
parent 65201e4a29
commit 98823b2366
34 changed files with 80 additions and 39 deletions

View File

@ -33,11 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: swtch.s,v 1.62 1997/09/07 22:04:09 fsmp Exp $
* $Id: swtch.s,v 1.63 1997/09/21 15:03:58 peter Exp $
*/
#include "npx.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
#include <sys/rtprio.h>

View File

@ -30,10 +30,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: exception.s,v 1.22 1997/09/07 19:26:26 smp Exp smp $
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
*/
#include "npx.h" /* NNPX */
#include "opt_vm86.h"
#include "assym.s" /* system defines */
#include <machine/ipl.h> /* SWI_AST_MASK ... */
#include <machine/psl.h> /* PSL_I */

View File

@ -30,10 +30,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: exception.s,v 1.22 1997/09/07 19:26:26 smp Exp smp $
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
*/
#include "npx.h" /* NNPX */
#include "opt_vm86.h"
#include "assym.s" /* system defines */
#include <machine/ipl.h> /* SWI_AST_MASK ... */
#include <machine/psl.h> /* PSL_I */

View File

@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
* $Id: genassym.c,v 1.47 1997/06/07 04:36:09 bde Exp $
* $Id: genassym.c,v 1.48 1997/08/09 00:02:32 dyson Exp $
*/
#include "opt_vm86.h"
#include <stdio.h>
#include <sys/param.h>
#include <sys/buf.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.98 1997/09/21 05:49:56 dyson Exp $
* $Id: locore.s,v 1.99 1997/09/21 15:03:56 peter Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@ -47,6 +47,7 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
#include <sys/syscall.h>
#include <sys/reboot.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.98 1997/09/21 05:49:56 dyson Exp $
* $Id: locore.s,v 1.99 1997/09/21 15:03:56 peter Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@ -47,6 +47,7 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
#include <sys/syscall.h>
#include <sys/reboot.h>

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.265 1997/09/21 21:38:04 gibbs Exp $
* $Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $
*/
#include "apm.h"
@ -47,6 +47,7 @@
#include "opt_perfmon.h"
#include "opt_smp.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -31,9 +31,11 @@
* mpboot.s: FreeBSD machine support for the Intel MP Spec
* multiprocessor systems.
*
* $Id: mpboot.s,v 1.4 1997/08/26 18:10:32 peter Exp $
* $Id: mpboot.s,v 1.5 1997/09/22 05:03:03 peter Exp $
*/
#include "opt_vm86.h"
#include <machine/asmacros.h> /* miscellaneous asm macros */
#include <machine/apic.h>
#include <machine/specialreg.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -33,11 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: swtch.s,v 1.62 1997/09/07 22:04:09 fsmp Exp $
* $Id: swtch.s,v 1.63 1997/09/21 15:03:58 peter Exp $
*/
#include "npx.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
#include <sys/rtprio.h>

View File

@ -31,11 +31,13 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
* $Id: sys_machdep.c,v 1.24 1997/08/28 14:36:54 jlemon Exp $
* $Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $
*
*/
#include "opt_user_ldt.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.110 1997/09/05 08:54:54 peter Exp $
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
*/
/*
@ -44,6 +44,7 @@
#include "opt_ktrace.h"
#include "opt_ddb.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -38,11 +38,12 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
* $Id: vm_machdep.c,v 1.88 1997/09/10 12:31:28 joerg Exp $
* $Id: vm_machdep.c,v 1.89 1997/09/13 16:12:04 joerg Exp $
*/
#include "npx.h"
#include "opt_bounce.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
# $Id: Makefile.i386,v 1.101 1997/07/25 11:53:20 phk Exp $
#
# Makefile for FreeBSD
#
@ -162,7 +162,7 @@ assym.s: genassym
# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h opt_vm86.h
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
# $Id: Makefile.i386,v 1.101 1997/07/25 11:53:20 phk Exp $
#
# Makefile for FreeBSD
#
@ -162,7 +162,7 @@ assym.s: genassym
# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h opt_vm86.h
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o

View File

@ -1,10 +1,10 @@
# $Id: options.i386,v 1.59 1997/09/16 07:45:33 joerg Exp $
# $Id: options.i386,v 1.60 1997/09/19 15:25:49 jmg Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
GPL_MATH_EMULATE opt_math_emulate.h
VM86 opt_global.h
VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
# $Id: Makefile.i386,v 1.101 1997/07/25 11:53:20 phk Exp $
#
# Makefile for FreeBSD
#
@ -162,7 +162,7 @@ assym.s: genassym
# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h opt_vm86.h
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o

View File

@ -1,10 +1,10 @@
# $Id: options.i386,v 1.59 1997/09/16 07:45:33 joerg Exp $
# $Id: options.i386,v 1.60 1997/09/19 15:25:49 jmg Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
GPL_MATH_EMULATE opt_math_emulate.h
VM86 opt_global.h
VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h

View File

@ -30,10 +30,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: exception.s,v 1.22 1997/09/07 19:26:26 smp Exp smp $
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
*/
#include "npx.h" /* NNPX */
#include "opt_vm86.h"
#include "assym.s" /* system defines */
#include <machine/ipl.h> /* SWI_AST_MASK ... */
#include <machine/psl.h> /* PSL_I */

View File

@ -34,9 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
* $Id: genassym.c,v 1.47 1997/06/07 04:36:09 bde Exp $
* $Id: genassym.c,v 1.48 1997/08/09 00:02:32 dyson Exp $
*/
#include "opt_vm86.h"
#include <stdio.h>
#include <sys/param.h>
#include <sys/buf.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.98 1997/09/21 05:49:56 dyson Exp $
* $Id: locore.s,v 1.99 1997/09/21 15:03:56 peter Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@ -47,6 +47,7 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
#include <sys/syscall.h>
#include <sys/reboot.h>

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.265 1997/09/21 21:38:04 gibbs Exp $
* $Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $
*/
#include "apm.h"
@ -47,6 +47,7 @@
#include "opt_perfmon.h"
#include "opt_smp.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -31,9 +31,11 @@
* mpboot.s: FreeBSD machine support for the Intel MP Spec
* multiprocessor systems.
*
* $Id: mpboot.s,v 1.4 1997/08/26 18:10:32 peter Exp $
* $Id: mpboot.s,v 1.5 1997/09/22 05:03:03 peter Exp $
*/
#include "opt_vm86.h"
#include <machine/asmacros.h> /* miscellaneous asm macros */
#include <machine/apic.h>
#include <machine/specialreg.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -33,11 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: swtch.s,v 1.62 1997/09/07 22:04:09 fsmp Exp $
* $Id: swtch.s,v 1.63 1997/09/21 15:03:58 peter Exp $
*/
#include "npx.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
#include <sys/rtprio.h>

View File

@ -31,11 +31,13 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
* $Id: sys_machdep.c,v 1.24 1997/08/28 14:36:54 jlemon Exp $
* $Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $
*
*/
#include "opt_user_ldt.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.110 1997/09/05 08:54:54 peter Exp $
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
*/
/*
@ -44,6 +44,7 @@
#include "opt_ktrace.h"
#include "opt_ddb.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -38,11 +38,12 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
* $Id: vm_machdep.c,v 1.88 1997/09/10 12:31:28 joerg Exp $
* $Id: vm_machdep.c,v 1.89 1997/09/13 16:12:04 joerg Exp $
*/
#include "npx.h"
#include "opt_bounce.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -22,10 +22,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $
* $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $
*/
#include "opt_smp.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.110 1997/09/05 08:54:54 peter Exp $
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
*/
/*
@ -44,6 +44,7 @@
#include "opt_ktrace.h"
#include "opt_ddb.h"
#include "opt_vm86.h"
#include <sys/param.h>
#include <sys/systm.h>