Module Name: src
Committed By: mrg
Date: Sat Jul 2 13:11:49 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
redo previous correctly:
don't try to print fr_arg[6] since it doesn't exist.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.259 src/sys/arch/sparc64/sparc64/machdep.c:1.260
--- src/sys/arch/sparc64/sparc64/machdep.c:1.259 Fri Jul 1 08:37:28 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat Jul 2 13:11:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.260 2011/07/02 13:11:48 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.260 2011/07/02 13:11:48 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -928,7 +928,7 @@
fp64 = (struct frame64*)(((char*)fp)+BIAS);
/* 64-bit frame */
get_symbol_and_offset(&mod, &sym, &offset, fp64->fr_pc);
- printf(" %s:%s+%#llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
+ printf(" %s:%s+%#llx(%llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
mod, sym,
(unsigned long long)offset,
(unsigned long long)fp64->fr_arg[0],
@@ -937,13 +937,12 @@
(unsigned long long)fp64->fr_arg[3],
(unsigned long long)fp64->fr_arg[4],
(unsigned long long)fp64->fr_arg[5],
- (unsigned long long)fp64->fr_fp,
- (unsigned long long)fp64->fr_pc);
+ (unsigned long long)fp64->fr_fp);
fp = (struct frame32 *)(u_long)fp64->fr_fp;
} else {
/* 32-bit frame */
get_symbol_and_offset(&mod, &sym, &offset, fp->fr_pc);
- printf(" %s:%s+%#lx(%x, %x, %x, %x, %x, %x, %x) fp = %x\n",
+ printf(" %s:%s+%#lx(%x, %x, %x, %x, %x, %x) fp = %x\n",
mod, sym,
(unsigned long)offset,
fp->fr_arg[0],
@@ -952,8 +951,7 @@
fp->fr_arg[3],
fp->fr_arg[4],
fp->fr_arg[5],
- fp->fr_fp,
- fp->fr_pc);
+ fp->fr_fp);
fp = (struct frame32*)(u_long)fp->fr_fp;
}
}
