[src/trunk]: src/sys/arch/i386/include make vm86 use __gregset_t

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a444650476fc
branches:  trunk
changeset: 551756:a444650476fc
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 11 19:17:07 2003 +0000

description:
make vm86 use __gregset_t

diffstat:

 sys/arch/i386/include/sysarch.h |   5 +++--
 sys/arch/i386/include/vm86.h    |  11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 2ce95da7fcfd -r a444650476fc sys/arch/i386/include/sysarch.h
--- a/sys/arch/i386/include/sysarch.h   Thu Sep 11 19:16:05 2003 +0000
+++ b/sys/arch/i386/include/sysarch.h   Thu Sep 11 19:17:07 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysarch.h,v 1.13 2003/09/11 09:40:12 kleink Exp $      */
+/*     $NetBSD: sysarch.h,v 1.14 2003/09/11 19:17:07 christos Exp $    */
 
 #ifndef _I386_SYSARCH_H_
 #define _I386_SYSARCH_H_
@@ -11,12 +11,13 @@
 #define        I386_IOPL       2
 #define        I386_GET_IOPERM 3
 #define        I386_SET_IOPERM 4
-#define        I386_VM86       5
+#define        I386_OLD_VM86   5
 #define        I386_PMC_INFO   8
 #define        I386_PMC_STARTSTOP 9
 #define        I386_PMC_READ   10
 #define I386_GET_MTRR  11
 #define I386_SET_MTRR  12
+#define        I386_VM86       13
 
 struct i386_get_ldt_args {
        int start;
diff -r 2ce95da7fcfd -r a444650476fc sys/arch/i386/include/vm86.h
--- a/sys/arch/i386/include/vm86.h      Thu Sep 11 19:16:05 2003 +0000
+++ b/sys/arch/i386/include/vm86.h      Thu Sep 11 19:17:07 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm86.h,v 1.10 2003/01/17 23:10:29 thorpej Exp $        */
+/*     $NetBSD: vm86.h,v 1.11 2003/09/11 19:17:07 christos Exp $       */
 
 #undef VM86_USE_VIF
 
@@ -51,12 +51,8 @@
 #define        VM86_REALFLAGS  (~PSL_USERSTATIC)
 #define        VM86_VIRTFLAGS  (PSL_USERSTATIC & ~(PSL_MBO | PSL_MBZ))
 
-struct vm86_regs {
-       struct sigcontext vmsc;
-};
-
 struct vm86_kern {                     /* kernel uses this stuff */
-       struct vm86_regs regs;
+       __gregset_t regs;
        unsigned long ss_cpu_type;
 };
 #define cpu_type substr.ss_cpu_type
@@ -81,6 +77,9 @@
 
 #ifdef _KERNEL
 int i386_vm86 __P((struct lwp *, char *, register_t *));
+#ifdef COMPAT_16
+int compat_16_i386_vm86 __P((struct lwp *, char *, register_t *));
+#endif
 void vm86_gpfault __P((struct lwp *, int));
 void vm86_return __P((struct lwp *, int));
 static __inline void clr_vif __P((struct lwp *));