Module Name: src
Committed By: maxv
Date: Sat Aug 12 07:21:57 UTC 2017
Modified Files:
src/sys/arch/i386/i386: linux_sigcode.S linux_syscall.c locore.S
vector.S
src/sys/arch/x86/include: cpu.h psl.h
src/sys/arch/x86/x86: sys_machdep.c syscall.c
src/sys/arch/xen/conf: files.compat files.xen
src/sys/arch/xen/x86: xen_ipi.c
src/sys/compat/linux/arch/i386: linux_exec_machdep.c
Log Message:
Remove vm86.
Pass 3.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/linux_sigcode.S
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/i386/linux_syscall.c
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/include/psl.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/x86/sys_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/x86/syscall.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/compat/linux/arch/i386/linux_exec_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/i386/i386/linux_sigcode.S
diff -u src/sys/arch/i386/i386/linux_sigcode.S:1.8 src/sys/arch/i386/i386/linux_sigcode.S:1.9
--- src/sys/arch/i386/i386/linux_sigcode.S:1.8 Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/i386/linux_sigcode.S Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sigcode.S,v 1.8 2008/04/28 20:23:24 martin Exp $ */
+/* $NetBSD: linux_sigcode.S,v 1.9 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,11 +64,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigcode.S,v 1.8 2008/04/28 20:23:24 martin Exp $");
-
-#if defined(_KERNEL_OPT)
-#include "opt_vm86.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: linux_sigcode.S,v 1.9 2017/08/12 07:21:57 maxv Exp $");
#include "assym.h"
Index: src/sys/arch/i386/i386/linux_syscall.c
diff -u src/sys/arch/i386/i386/linux_syscall.c:1.52 src/sys/arch/i386/i386/linux_syscall.c:1.53
--- src/sys/arch/i386/i386/linux_syscall.c:1.52 Sat Mar 7 18:50:01 2015
+++ src/sys/arch/i386/i386/linux_syscall.c Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.c,v 1.52 2015/03/07 18:50:01 christos Exp $ */
+/* $NetBSD: linux_syscall.c,v 1.53 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,11 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.52 2015/03/07 18:50:01 christos Exp $");
-
-#if defined(_KERNEL_OPT)
-#include "opt_vm86.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.53 2017/08/12 07:21:57 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.150 src/sys/arch/i386/i386/locore.S:1.151
--- src/sys/arch/i386/i386/locore.S:1.150 Thu Aug 10 14:13:45 2017
+++ src/sys/arch/i386/i386/locore.S Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.150 2017/08/10 14:13:45 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.151 2017/08/12 07:21:57 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,14 +128,13 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.150 2017/08/10 14:13:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.151 2017/08/12 07:21:57 maxv Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_modular.h"
#include "opt_multiboot.h"
#include "opt_realmem.h"
-#include "opt_vm86.h"
#include "opt_xen.h"
#include "assym.h"
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.70 src/sys/arch/i386/i386/vector.S:1.71
--- src/sys/arch/i386/i386/vector.S:1.70 Sun Jul 16 14:02:48 2017
+++ src/sys/arch/i386/i386/vector.S Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.70 2017/07/16 14:02:48 cherry Exp $ */
+/* $NetBSD: vector.S,v 1.71 2017/08/12 07:21:57 maxv Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,12 +65,11 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.70 2017/07/16 14:02:48 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.71 2017/08/12 07:21:57 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include "opt_ipkdb.h"
-#include "opt_vm86.h"
#include "opt_xen.h"
#include "opt_dtrace.h"
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.75 src/sys/arch/x86/include/cpu.h:1.76
--- src/sys/arch/x86/include/cpu.h:1.75 Sat Jul 22 09:01:46 2017
+++ src/sys/arch/x86/include/cpu.h Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.75 2017/07/22 09:01:46 maxv Exp $ */
+/* $NetBSD: cpu.h,v 1.76 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -49,7 +49,6 @@
#include "opt_xen.h"
#ifdef i386
#include "opt_user_ldt.h"
-#include "opt_vm86.h"
#endif
#endif
@@ -478,11 +477,6 @@ int x86_set_ldt(struct lwp *, void *, re
void isa_defaultirq(void);
int isa_nmi(void);
-#ifdef VM86
-/* vm86.c */
-void vm86_gpfault(struct lwp *, int);
-#endif /* VM86 */
-
/* consinit.c */
void kgdb_port_init(void);
Index: src/sys/arch/x86/include/psl.h
diff -u src/sys/arch/x86/include/psl.h:1.8 src/sys/arch/x86/include/psl.h:1.9
--- src/sys/arch/x86/include/psl.h:1.8 Thu Oct 4 21:23:45 2012
+++ src/sys/arch/x86/include/psl.h Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.8 2012/10/04 21:23:45 dsl Exp $ */
+/* $NetBSD: psl.h,v 1.9 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -67,11 +67,7 @@
#include "opt_vm86.h"
#endif
#endif
-#ifdef VM86
-#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP)
-#else
#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VM | PSL_VIF | PSL_VIP)
-#endif
#define PSL_USER (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | \
PSL_T | PSL_V | PSL_D | PSL_AC)
#define PSL_CLEARSIG (PSL_T | PSL_VM | PSL_AC | PSL_D)
Index: src/sys/arch/x86/x86/sys_machdep.c
diff -u src/sys/arch/x86/x86/sys_machdep.c:1.36 src/sys/arch/x86/x86/sys_machdep.c:1.37
--- src/sys/arch/x86/x86/sys_machdep.c:1.36 Wed Jul 12 16:59:41 2017
+++ src/sys/arch/x86/x86/sys_machdep.c Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.36 2017/07/12 16:59:41 maxv Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.37 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -30,15 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.36 2017/07/12 16:59:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.37 2017/08/12 07:21:57 maxv Exp $");
#include "opt_mtrr.h"
#include "opt_pmc.h"
#include "opt_user_ldt.h"
#include "opt_compat_netbsd.h"
-#ifdef i386
-#include "opt_vm86.h"
-#endif
#include "opt_xen.h"
#include <sys/param.h>
@@ -98,10 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: sys_machdep.
#undef PMC
#endif
-#ifdef VM86
-#include <machine/vm86.h>
-#endif
-
#ifdef PMC
#include <machine/pmc.h>
#endif
@@ -841,15 +834,6 @@ sys_sysarch(struct lwp *l, const struct
error = x86_set_mtrr(l, SCARG(uap, parms), retval);
break;
-#ifdef VM86
- case X86_VM86:
- error = x86_vm86(l, SCARG(uap, parms), retval);
- break;
- case X86_OLD_VM86:
- error = compat_16_x86_vm86(l, SCARG(uap, parms), retval);
- break;
-#endif
-
#ifdef PMC
case X86_PMC_INFO:
error = sys_pmc_info(l, SCARG(uap, parms), retval);
Index: src/sys/arch/x86/x86/syscall.c
diff -u src/sys/arch/x86/x86/syscall.c:1.15 src/sys/arch/x86/x86/syscall.c:1.16
--- src/sys/arch/x86/x86/syscall.c:1.15 Fri Mar 31 08:47:04 2017
+++ src/sys/arch/x86/x86/syscall.c Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.15 2017/03/31 08:47:04 martin Exp $ */
+/* $NetBSD: syscall.c,v 1.16 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.15 2017/03/31 08:47:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.16 2017/08/12 07:21:57 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,10 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: syscall.c,v
#include "opt_dtrace.h"
#ifndef __x86_64__
-#include "opt_vm86.h"
-#ifdef VM86
-void syscall_vm86(struct trapframe *);
-#endif
int x86_copyargs(void *, void *, size_t);
#endif
@@ -179,26 +175,3 @@ syscall_intern(struct proc *p)
p->p_md.md_syscall = syscall;
}
-#ifdef VM86
-
-void
-syscall_vm86(struct trapframe *frame)
-{
- struct lwp *l;
- struct proc *p;
- ksiginfo_t ksi;
-
- KSI_INIT_TRAP(&ksi);
- ksi.ksi_signo = SIGBUS;
- ksi.ksi_code = BUS_OBJERR;
- ksi.ksi_trap = T_PROTFLT;
- ksi.ksi_addr = (void *)frame->tf_eip;
-
- l = curlwp;
- p = l->l_proc;
-
- (*p->p_emul->e_trapsignal)(l, &ksi);
- userret(l);
-}
-
-#endif
Index: src/sys/arch/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.27 src/sys/arch/xen/conf/files.compat:1.28
--- src/sys/arch/xen/conf/files.compat:1.27 Sat Jul 29 06:29:32 2017
+++ src/sys/arch/xen/conf/files.compat Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.compat,v 1.27 2017/07/29 06:29:32 maxv Exp $
+# $NetBSD: files.compat,v 1.28 2017/08/12 07:21:57 maxv Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
@@ -25,9 +25,6 @@ defflag bioscall.h XXXBIOSCALL
defflag opt_pcibios.h XXXOPT_PCIBIOS
defflag opt_pcifixup.h XXXOPT_PCIFIXUP
-# VM86 emulation
-defflag opt_vm86.h XXXVM86
-
defflag opt_pmc.h XXXPMC
# User-settable LDT (used by WINE)
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.153 src/sys/arch/xen/conf/files.xen:1.154
--- src/sys/arch/xen/conf/files.xen:1.153 Wed Aug 9 18:48:53 2017
+++ src/sys/arch/xen/conf/files.xen Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.153 2017/08/09 18:48:53 maxv Exp $
+# $NetBSD: files.xen,v 1.154 2017/08/12 07:21:57 maxv Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -312,8 +312,6 @@ file arch/x86/x86/powernow.c powernow
#
ifdef i386
-# VM86 mode
-file arch/i386/i386/vm86.c vm86
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/i386/i386/compat_13_machdep.c compat_13
Index: src/sys/arch/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.20 src/sys/arch/xen/x86/xen_ipi.c:1.21
--- src/sys/arch/xen/x86/xen_ipi.c:1.20 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/xen/x86/xen_ipi.c Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,10 @@
/*
* Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $");
#include <sys/types.h>
@@ -254,13 +254,6 @@ xen_ipi_ddb(struct cpu_info *ci, struct
tf.tf_esp = intrf->if_esp;
tf.tf_ss = intrf->if_ss;
- /* XXX: does i386/Xen have vm86 support ?
- tf.tf_vm86_es;
- tf.tf_vm86_ds;
- tf.tf_vm86_fs;
- tf.tf_vm86_gs;
- :XXX */
-
ddb_ipi(SEL_KPL, tf);
#endif
}
Index: src/sys/compat/linux/arch/i386/linux_exec_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.17 src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.18
--- src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.17 Tue Mar 29 20:10:31 2011
+++ src/sys/compat/linux/arch/i386/linux_exec_machdep.c Sat Aug 12 07:21:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_machdep.c,v 1.17 2011/03/29 20:10:31 plunky Exp $ */
+/* $NetBSD: linux_exec_machdep.c,v 1.18 2017/08/12 07:21:57 maxv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.17 2011/03/29 20:10:31 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.18 2017/08/12 07:21:57 maxv Exp $");
#if defined(_KERNEL_OPT)
-#include "opt_vm86.h"
#include "opt_user_ldt.h"
#endif
