Module Name: src
Committed By: christos
Date: Thu Jul 16 14:18:09 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64: trap.c
Log Message:
handle protection fault properly.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amd64/amd64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.55 src/sys/arch/amd64/amd64/trap.c:1.56
--- src/sys/arch/amd64/amd64/trap.c:1.55 Sat Mar 28 18:56:19 2009
+++ src/sys/arch/amd64/amd64/trap.c Thu Jul 16 10:18:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.55 2009/03/28 22:56:19 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.56 2009/07/16 14:18:09 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.55 2009/03/28 22:56:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.56 2009/07/16 14:18:09 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -338,26 +338,35 @@
case T_STKFLT|T_USER:
case T_ALIGNFLT|T_USER:
#ifdef TRAP_SIGDEBUG
- printf("pid %d (%s): BUS (%x) at rip %lx addr %lx\n",
+ printf("pid %d (%s): BUS/SEGV (%x) at rip %lx addr %lx\n",
p->p_pid, p->p_comm, type, frame->tf_rip, rcr2());
frame_dump(frame);
#endif
KSI_INIT_TRAP(&ksi);
- ksi.ksi_signo = SIGBUS;
ksi.ksi_trap = type & ~T_USER;
ksi.ksi_addr = (void *)rcr2();
switch (type) {
case T_SEGNPFLT|T_USER:
case T_STKFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRERR;
break;
case T_TSSFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
break;
case T_ALIGNFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRALN;
break;
+ case T_PROTFLT|T_USER:
+ ksi.ksi_signo = SIGSEGV;
+ ksi.ksi_code = SEGV_ACCERR;
+ break;
default:
+#ifdef DIAGNOSTIC
+ panic("unhandled type %x\n", type);
+#endif
break;
}
goto trapsignal;
