Module Name: src
Committed By: riz
Date: Thu Feb 23 18:36:06 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-6]: db_machdep.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #37):
sys/arch/amd64/amd64/db_machdep.c: revision 1.2
fix stack backtraces through traps.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.16.1 src/sys/arch/amd64/amd64/db_machdep.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/db_machdep.c
diff -u src/sys/arch/amd64/amd64/db_machdep.c:1.1 src/sys/arch/amd64/amd64/db_machdep.c:1.1.16.1
--- src/sys/arch/amd64/amd64/db_machdep.c:1.1 Sun Apr 10 20:36:49 2011
+++ src/sys/arch/amd64/amd64/db_machdep.c Thu Feb 23 18:36:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.1 2011/04/10 20:36:49 christos Exp $ */
+/* $NetBSD: db_machdep.c,v 1.1.16.1 2012/02/23 18:36:06 riz Exp $ */
/*
* Mach Operating System
@@ -26,7 +26,7 @@
* rights to redistribute these changes.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1 2011/04/10 20:36:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1.16.1 2012/02/23 18:36:06 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,7 +131,7 @@ db_nextframe(long **nextframe, long **re
default:
/* The only argument to trap() or syscall() is the trapframe. */
- tf = *(struct trapframe **)argp;
+ tf = (struct trapframe *)argp;
switch (is_trap) {
case TRAP:
(*pr)("--- trap (number %d) ---\n", tf->tf_trapno);
@@ -141,7 +141,6 @@ db_nextframe(long **nextframe, long **re
break;
case INTERRUPT:
(*pr)("--- interrupt ---\n");
- tf = (struct trapframe *)argp;
break;
}
*ip = (db_addr_t)tf->tf_rip;
