Module Name: src
Committed By: mrg
Date: Fri Jul 1 08:37:29 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
use the right variables for the fp and pc, and avoid array bounds
violations.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 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.258 src/sys/arch/sparc64/sparc64/machdep.c:1.259
--- src/sys/arch/sparc64/sparc64/machdep.c:1.258 Sun Jun 12 03:35:47 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Fri Jul 1 08:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.258 2011/06/12 03:35:47 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 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.258 2011/06/12 03:35:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -937,8 +937,8 @@
(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_arg[6],
- (unsigned long long)fp64->fr_fp);
+ (unsigned long long)fp64->fr_fp,
+ (unsigned long long)fp64->fr_pc);
fp = (struct frame32 *)(u_long)fp64->fr_fp;
} else {
/* 32-bit frame */
@@ -952,8 +952,8 @@
fp->fr_arg[3],
fp->fr_arg[4],
fp->fr_arg[5],
- fp->fr_arg[6],
- fp->fr_fp);
+ fp->fr_fp,
+ fp->fr_pc);
fp = (struct frame32*)(u_long)fp->fr_fp;
}
}
