d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize with sys/i386/conf/files.i386 and sys/i386/i386/trap.c

Browse Source 
revisions 1.173 and 1.109, respectively.
This commit is contained in:
kato 1997-08-29 08:15:57 +00:00
parent 5b5d694bfb
commit 4593c74e11
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/files.pc98
View File

@ -3,7 +3,7 @@
#
# modified for PC-9801
#
# $Id: files.pc98,v 1.33 1997/08/27 08:47:03 kato Exp $
# $Id: files.pc98,v 1.34 1997/08/28 14:21:11 kato Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/*.[chyl]" \
@ -83,6 +83,7 @@ i386/i386/sys_machdep.c standard
pc98/i386/trap.c standard
pc98/i386/userconfig.c optional userconfig
i386/i386/vm_machdep.c standard
i386/i386/vm86.c optional vm86
i386/ibcs2/ibcs2_fcntl.c optional ibcs2
i386/ibcs2/ibcs2_stat.c optional ibcs2
i386/ibcs2/ibcs2_ipc.c optional ibcs2

3
sys/pc98/conf/files.pc98
View File

@ -3,7 +3,7 @@
#
# modified for PC-9801
#
# $Id: files.pc98,v 1.33 1997/08/27 08:47:03 kato Exp $
# $Id: files.pc98,v 1.34 1997/08/28 14:21:11 kato Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/*.[chyl]" \
@ -83,6 +83,7 @@ i386/i386/sys_machdep.c standard
pc98/i386/trap.c standard
pc98/i386/userconfig.c optional userconfig
i386/i386/vm_machdep.c standard
i386/i386/vm86.c optional vm86
i386/ibcs2/ibcs2_fcntl.c optional ibcs2
i386/ibcs2/ibcs2_stat.c optional ibcs2
i386/ibcs2/ibcs2_ipc.c optional ibcs2

9
sys/pc98/i386/trap.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.32 1997/08/21 10:12:48 kato Exp $
* $Id: trap.c,v 1.33 1997/08/27 08:43:21 kato Exp $
*/
/*
@ -85,7 +85,6 @@
extern struct i386tss common_tss;
int (*vm86_emulate) __P((struct vm86frame *));
int (*pmath_emulate) __P((struct trapframe *));
extern void trap __P((struct trapframe frame));
@ -266,12 +265,14 @@ trap(frame)
*/
case T_PROTFLT: /* general protection fault */
case T_STKFLT: /* stack fault */
if (vm86_emulate && (frame.tf_eflags & PSL_VM)) {
i = (*vm86_emulate)((struct vm86frame *)&frame);
#ifdef VM86
if (frame.tf_eflags & PSL_VM) {
i = vm86_emulate((struct vm86frame *)&frame);
if (i == 0)
goto out;
break;
}
#endif /* VM86 */
/* FALL THROUGH */
case T_SEGNPFLT: /* segment not present fault */