diff options
| author | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
| commit | b5d4171ff60677d883a8f4fdf912b23d5de9a433 (patch) | |
| tree | 37d000a80ae9f6ab9ca36152f3fd48600aa82ae6 /sys/i386/svr4 | |
| parent | d4d2c873635d9e513e6e5720150fd4e44067d68f (diff) | |
| download | FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.zip FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.tar.gz | |
Unifdef VM86.
Reviewed by: silence on on -current
Diffstat (limited to 'sys/i386/svr4')
| -rw-r--r-- | sys/i386/svr4/svr4_locore.s | 2 | ||||
| -rw-r--r-- | sys/i386/svr4/svr4_machdep.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s index 2f9c683..a8f3ed1 100644 --- a/sys/i386/svr4/svr4_locore.s +++ b/sys/i386/svr4/svr4_locore.s @@ -8,11 +8,9 @@ NON_GPROF_ENTRY(svr4_sigcode) leal SVR4_SIGF_UC(%esp),%eax # ucp (the call may have clobbered the # copy at SIGF_UCP(%esp)) #if defined(NOTYET) -#ifdef VM86 testl $PSL_VM,SVR4_UC_EFLAGS(%eax) jnz 1f #endif -#endif movl SVR4_UC_GS(%eax),%edx movl %dx,%gs #if defined(__NetBSD__) diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c index 5e77fd1..947d728 100644 --- a/sys/i386/svr4/svr4_machdep.c +++ b/sys/i386/svr4/svr4_machdep.c @@ -117,7 +117,6 @@ svr4_getcontext(p, uc, mask, oonstack) /* * Set the general purpose registers */ -#ifdef VM86 if (tf->tf_eflags & PSL_VM) { r[SVR4_X86_GS] = tf->tf_vm86_gs; r[SVR4_X86_FS] = tf->tf_vm86_fs; @@ -125,7 +124,6 @@ svr4_getcontext(p, uc, mask, oonstack) r[SVR4_X86_DS] = tf->tf_vm86_ds; r[SVR4_X86_EFL] = get_vflags(p); } else -#endif { #if defined(__NetBSD__) __asm("movl %%gs,%w0" : "=r" (r[SVR4_X86_GS])); @@ -215,7 +213,6 @@ svr4_setcontext(p, uc) /* * Restore register context. */ -#ifdef VM86 if (r[SVR4_X86_EFL] & PSL_VM) { tf->tf_vm86_gs = r[SVR4_X86_GS]; tf->tf_vm86_fs = r[SVR4_X86_FS]; @@ -223,7 +220,6 @@ svr4_setcontext(p, uc) tf->tf_vm86_ds = r[SVR4_X86_DS]; set_vflags(p, r[SVR4_X86_EFL]); } else -#endif { /* * Check for security violations. If we're returning to |
