summaryrefslogtreecommitdiffstats
path: root/sys/i386/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/include')
-rw-r--r--sys/i386/include/globaldata.h4
-rw-r--r--sys/i386/include/globals.h6
-rw-r--r--sys/i386/include/mptable.h5
-rw-r--r--sys/i386/include/pcb.h6
-rw-r--r--sys/i386/include/pcpu.h4
-rw-r--r--sys/i386/include/vm86.h5
6 files changed, 8 insertions, 22 deletions
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index 456c502..c02009b 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: globaldata.h,v 1.8 1999/04/28 01:04:00 luoqi Exp $
+ * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
*/
/*
@@ -46,10 +46,8 @@ struct globaldata {
struct timeval gd_switchtime;
struct i386tss gd_common_tss;
int gd_switchticks;
-#ifdef VM86
struct segment_descriptor gd_common_tssd;
struct segment_descriptor *gd_tss_gdt;
-#endif
#ifdef USER_LDT
int gd_currentldt;
#endif
diff --git a/sys/i386/include/globals.h b/sys/i386/include/globals.h
index f502dfd..6305f86 100644
--- a/sys/i386/include/globals.h
+++ b/sys/i386/include/globals.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: globals.h,v 1.1 1999/04/28 01:04:01 luoqi Exp $
+ * $Id: globals.h,v 1.2 1999/05/12 21:39:01 luoqi Exp $
*/
#ifndef _MACHINE_GLOBALS_H_
@@ -88,10 +88,8 @@
#define switchtime GLOBAL_LVALUE(switchtime, struct timeval)
#define switchticks GLOBAL_LVALUE(switchticks, int)
-#ifdef VM86
#define common_tssd GLOBAL_LVALUE(common_tssd, struct segment_descriptor)
#define tss_gdt GLOBAL_LVALUE(tss_gdt, struct segment_descriptor *)
-#endif
#ifdef USER_LDT
#define currentldt GLOBAL_LVALUE(currentldt, int)
@@ -119,10 +117,8 @@ GLOBAL_FUNC(common_tss)
GLOBAL_FUNC(switchtime)
GLOBAL_FUNC(switchticks)
-#ifdef VM86
GLOBAL_FUNC(common_tssd)
GLOBAL_FUNC(tss_gdt)
-#endif
#ifdef USER_LDT
GLOBAL_FUNC(currentldt)
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index ad9e6c6..3365d30 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,11 +22,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.100 1999/05/08 17:48:22 peter Exp $
+ * $Id: mp_machdep.c,v 1.101 1999/05/12 21:38:43 luoqi Exp $
*/
#include "opt_smp.h"
-#include "opt_vm86.h"
#include "opt_cpu.h"
#include "opt_user_ldt.h"
@@ -482,10 +481,8 @@ init_secondary(void)
common_tss.tss_esp0 = 0; /* not used until after switch */
common_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL);
common_tss.tss_ioopt = (sizeof common_tss) << 16;
-#ifdef VM86
tss_gdt = &gdt[myid * NGDT + GPROC0_SEL].sd;
common_tssd = *tss_gdt;
-#endif
ltr(gsel_tss);
load_cr0(0x8005003b); /* XXX! */
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 9ab0856..2dbc707 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)pcb.h 5.10 (Berkeley) 5/12/91
- * $Id: pcb.h,v 1.26 1998/02/03 21:27:50 bde Exp $
+ * $Id: pcb.h,v 1.27 1999/04/28 01:04:05 luoqi Exp $
*/
#ifndef _I386_PCB_H_
@@ -66,11 +66,7 @@ struct pcb {
u_long pcb_mpnest_dontuse;
#endif
int pcb_gs;
-#ifdef VM86
struct pcb_ext *pcb_ext; /* optional pcb extension */
-#else
- struct pcb_ext *pcb_ext_dontuse;
-#endif
u_long __pcb_spare[2]; /* adjust to avoid core dump size changes */
};
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 456c502..c02009b 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: globaldata.h,v 1.8 1999/04/28 01:04:00 luoqi Exp $
+ * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
*/
/*
@@ -46,10 +46,8 @@ struct globaldata {
struct timeval gd_switchtime;
struct i386tss gd_common_tss;
int gd_switchticks;
-#ifdef VM86
struct segment_descriptor gd_common_tssd;
struct segment_descriptor *gd_tss_gdt;
-#endif
#ifdef USER_LDT
int gd_currentldt;
#endif
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index a7d565c..602ef07 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vm86.h,v 1.9 1999/03/18 04:37:35 jlemon Exp $
+ * $Id: vm86.h,v 1.10 1999/04/28 01:04:09 luoqi Exp $
*/
#ifndef _MACHINE_VM86_H_
@@ -150,6 +150,7 @@ struct vm86_intcall_args {
};
extern int in_vm86call;
+extern int vm86paddr;
struct proc;
extern int vm86_emulate __P((struct vm86frame *));
@@ -157,7 +158,7 @@ extern int vm86_sysarch __P((struct proc *, char *));
extern void vm86_trap __P((struct vm86frame *));
extern int vm86_intcall __P((int, struct vm86frame *));
extern int vm86_datacall __P((int, struct vm86frame *, struct vm86context *));
-extern void initial_bioscalls __P((u_int *, u_int *));
+extern void vm86_initialize __P((void));
extern vm_offset_t vm86_getpage __P((struct vm86context *, int));
extern vm_offset_t vm86_addpage __P((struct vm86context *, int, vm_offset_t));
extern int vm86_getptr __P((struct vm86context *, vm_offset_t,
OpenPOWER on IntegriCloud