Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/sparc64 redo previous correctly:



details:   https://anonhg.NetBSD.org/src/rev/6e2fbbe5d714
branches:  trunk
changeset: 766798:6e2fbbe5d714
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 02 13:11:48 2011 +0000

description:
redo previous correctly:
don't try to print fr_arg[6] since it doesn't exist.

diffstat:

 sys/arch/sparc64/sparc64/machdep.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r 6a348092f56c -r 6e2fbbe5d714 sys/arch/sparc64/sparc64/machdep.c
--- a/sys/arch/sparc64/sparc64/machdep.c        Sat Jul 02 13:10:53 2011 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c        Sat Jul 02 13:11:48 2011 +0000
@@ -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;
                }
        }



Home | Main Index | Thread Index | Old Index