Module Name: src
Committed By: maxv
Date: Sat Aug 12 07:35:08 UTC 2017
Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/sys/arch/i386/include: Makefile mcontext.h segments.h
Removed Files:
src/sys/arch/i386/include: vm86.h
Log Message:
Remove vm86.
Pass 4.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/include/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/include/mcontext.h
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.19 -r0 src/sys/arch/i386/include/vm86.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.250 src/distrib/sets/lists/comp/md.amd64:1.251
--- src/distrib/sets/lists/comp/md.amd64:1.250 Thu Aug 10 13:39:08 2017
+++ src/distrib/sets/lists/comp/md.amd64 Sat Aug 12 07:35:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.250 2017/08/10 13:39:08 maxv Exp $
+# $NetBSD: md.amd64,v 1.251 2017/08/12 07:35:08 maxv Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
@@ -533,7 +533,7 @@
./usr/include/i386/tss.h comp-c-include
./usr/include/i386/types.h comp-c-include
./usr/include/i386/varargs.h comp-obsolete obsolete
-./usr/include/i386/vm86.h comp-c-include
+./usr/include/i386/vm86.h comp-obsolete obsolete
./usr/include/i386/vmparam.h comp-c-include
./usr/include/i386/wchar_limits.h comp-c-include
./usr/include/ieeefp.h comp-c-include
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.173 src/distrib/sets/lists/comp/md.i386:1.174
--- src/distrib/sets/lists/comp/md.i386:1.173 Wed Aug 9 18:58:51 2017
+++ src/distrib/sets/lists/comp/md.i386 Sat Aug 12 07:35:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.173 2017/08/09 18:58:51 maxv Exp $
+# $NetBSD: md.i386,v 1.174 2017/08/12 07:35:08 maxv Exp $
./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete
./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete
./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete
@@ -465,7 +465,7 @@
./usr/include/i386/tss.h comp-c-include
./usr/include/i386/types.h comp-c-include
./usr/include/i386/varargs.h comp-obsolete obsolete
-./usr/include/i386/vm86.h comp-c-include
+./usr/include/i386/vm86.h comp-obsolete obsolete
./usr/include/i386/vmparam.h comp-c-include
./usr/include/i386/wchar_limits.h comp-c-include
./usr/include/ieeefp.h comp-c-include
Index: src/sys/arch/i386/include/Makefile
diff -u src/sys/arch/i386/include/Makefile:1.47 src/sys/arch/i386/include/Makefile:1.48
--- src/sys/arch/i386/include/Makefile:1.47 Wed Aug 9 18:58:51 2017
+++ src/sys/arch/i386/include/Makefile Sat Aug 12 07:35:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2017/08/09 18:58:51 maxv Exp $
+# $NetBSD: Makefile,v 1.48 2017/08/12 07:35:08 maxv Exp $
INCSDIR= /usr/include/i386
@@ -22,7 +22,7 @@ INCS= ansi.h aout_machdep.h apmvar.h asm
segments.h setjmp.h signal.h sljit_machdep.h specialreg.h spkr.h \
sysarch.h \
trap.h tss.h types.h \
- vm86.h vmparam.h \
+ vmparam.h \
wchar_limits.h
.include <bsd.kinc.mk>
Index: src/sys/arch/i386/include/mcontext.h
diff -u src/sys/arch/i386/include/mcontext.h:1.12 src/sys/arch/i386/include/mcontext.h:1.13
--- src/sys/arch/i386/include/mcontext.h:1.12 Sat Feb 15 22:20:42 2014
+++ src/sys/arch/i386/include/mcontext.h Sat Aug 12 07:35:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.12 2014/02/15 22:20:42 dsl Exp $ */
+/* $NetBSD: mcontext.h,v 1.13 2017/08/12 07:35:08 maxv Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,17 +102,6 @@ typedef struct {
#define _UC_UCONTEXT_ALIGN (~0xf)
-#ifdef _KERNEL_OPT
-#include "opt_vm86.h"
-#ifdef VM86
-/*#include <machine/psl.h>*/
-#define PSL_VM 0x00020000
-#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_UESP] + \
- ((uc)->uc_mcontext.__gregs[_REG_EFL] & PSL_VM ? \
- ((uc)->uc_mcontext.__gregs[_REG_SS] << 4) : 0))
-#endif /* VM86 */
-#endif /* _KERNEL_OPT */
-
#ifndef _UC_MACHINE_SP
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_UESP])
#endif
Index: src/sys/arch/i386/include/segments.h
diff -u src/sys/arch/i386/include/segments.h:1.60 src/sys/arch/i386/include/segments.h:1.61
--- src/sys/arch/i386/include/segments.h:1.60 Sun Jul 2 11:16:50 2017
+++ src/sys/arch/i386/include/segments.h Sat Aug 12 07:35:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: segments.h,v 1.60 2017/07/02 11:16:50 maxv Exp $ */
+/* $NetBSD: segments.h,v 1.61 2017/08/12 07:35:08 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -118,17 +118,8 @@
#define LSEL(s,r) (((s) << 3) | r | SEL_LDT) /* a local selector */
-#if defined(_KERNEL_OPT)
-#include "opt_vm86.h"
-#endif
-
-#ifdef VM86
-#define USERMODE(c, f) (ISPL(c) == SEL_UPL || ((f) & PSL_VM) != 0)
-#define KERNELMODE(c, f) (ISPL(c) == SEL_KPL && ((f) & PSL_VM) == 0)
-#else
#define USERMODE(c, f) (ISPL(c) == SEL_UPL)
#define KERNELMODE(c, f) (ISPL(c) == SEL_KPL)
-#endif
#ifndef _LOCORE
