Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-don't refer to oosyscall() unless COMPAT_10 or COMPAT_IBCS2 is defined 

-improve diagnostic message on bus errors in the TRAP_SIGDEBUG case
This commit is contained in:
drochner 2004-03-23 19:09:01 +00:00
parent 8a0244288a
commit be0359e629
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/amd64/amd64/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.17 2004/03/14 01:08:47 cl Exp $ */ /* $NetBSD: trap.c,v 1.18 2004/03/23 19:09:01 drochner Exp $ */
/*- /*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -75,12 +75,14 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.17 2004/03/14 01:08:47 cl Exp $"); __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.18 2004/03/23 19:09:01 drochner Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_kgdb.h" #include "opt_kgdb.h"
#include "opt_lockdebug.h" #include "opt_lockdebug.h"
#include "opt_multiprocessor.h" #include "opt_multiprocessor.h"
#include "opt_compat_netbsd.h"
#include "opt_compat_ibcs2.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -174,7 +176,10 @@ trap(frame)
int type = (int)frame->tf_trapno; int type = (int)frame->tf_trapno;
struct pcb *pcb; struct pcb *pcb;
extern char fusuintrfailure[], extern char fusuintrfailure[],
resume_iret[], IDTVEC(oosyscall)[]; resume_iret[];
#if defined(COMPAT_10) || defined(COMPAT_IBCS2)
extern char IDTVEC(oosyscall)[];
#endif
#if 0 #if 0
extern char resume_pop_ds[], resume_pop_es[]; extern char resume_pop_ds[], resume_pop_es[];
#endif #endif
@ -312,8 +317,8 @@ copyfault:
case T_ALIGNFLT|T_USER: case T_ALIGNFLT|T_USER:
case T_NMI|T_USER: case T_NMI|T_USER:
#ifdef TRAP_SIGDEBUG #ifdef TRAP_SIGDEBUG
printf("pid %d (%s): BUS at rip %lx addr %lx\n", printf("pid %d (%s): BUS (%x) at rip %lx addr %lx\n",
p->p_pid, p->p_comm, frame->tf_rip, rcr2()); p->p_pid, p->p_comm, type, frame->tf_rip, rcr2());
frame_dump(frame); frame_dump(frame);
#endif #endif
KSI_INIT_TRAP(&ksi); KSI_INIT_TRAP(&ksi);
@ -550,6 +555,7 @@ faultcommon:
} }
case T_TRCTRAP: case T_TRCTRAP:
#if defined(COMPAT_10) || defined(COMPAT_IBCS2)
/* Check whether they single-stepped into a lcall. */ /* Check whether they single-stepped into a lcall. */
if (frame->tf_rip == (int)IDTVEC(oosyscall)) if (frame->tf_rip == (int)IDTVEC(oosyscall))
return; return;
@ -557,6 +563,7 @@ faultcommon:
frame->tf_rflags &= ~PSL_T; frame->tf_rflags &= ~PSL_T;
return; return;
} }
#endif
goto we_re_toast; goto we_re_toast;
case T_BPTFLT|T_USER: /* bpt instruction fault */ case T_BPTFLT|T_USER: /* bpt instruction fault */