[src/trunk]: src/sys/arch/sparc64 Remove frame32 hack with using the same tri...

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dcefae181554
branches:  trunk
changeset: 766296:dcefae181554
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Mon Jun 20 09:25:48 2011 +0000

description:
Remove frame32 hack with using the same trick in netbsd32_machdep.c.

diffstat:

 sys/arch/sparc64/include/db_machdep.h |  5 ++++-
 sys/arch/sparc64/sparc64/db_trace.c   |  9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r 6e2b7634bc2b -r dcefae181554 sys/arch/sparc64/include/db_machdep.h
--- a/sys/arch/sparc64/include/db_machdep.h     Mon Jun 20 09:11:16 2011 +0000
+++ b/sys/arch/sparc64/include/db_machdep.h     Mon Jun 20 09:25:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.h,v 1.31 2011/05/27 12:41:18 nakayama Exp $ */
+/*     $NetBSD: db_machdep.h,v 1.32 2011/06/20 09:25:48 nakayama Exp $ */
 
 /*
  * Mach Operating System
@@ -37,6 +37,9 @@
 
 #include <uvm/uvm_extern.h>
 
+#ifndef SUN4U
+#define SUN4U  /* see .../sparc/include/frame.h for the reason */
+#endif
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
diff -r 6e2b7634bc2b -r dcefae181554 sys/arch/sparc64/sparc64/db_trace.c
--- a/sys/arch/sparc64/sparc64/db_trace.c       Mon Jun 20 09:11:16 2011 +0000
+++ b/sys/arch/sparc64/sparc64/db_trace.c       Mon Jun 20 09:25:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_trace.c,v 1.47 2011/04/15 08:43:12 mrg Exp $ */
+/*     $NetBSD: db_trace.c,v 1.48 2011/06/20 09:25:48 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.47 2011/04/15 08:43:12 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.48 2011/06/20 09:25:48 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -67,7 +67,6 @@
        return val;
 }
 #define        KLOAD(x)        kload((db_addr_t)(u_long)&(x))
-#define frame32 frame  /* XXX */
 #endif
 
 void
@@ -278,7 +277,7 @@
                                  f->fr_local[4], f->fr_local[5], f->fr_local[6], f->fr_local[7]);
                        db_printf("%8x %8x %8x %8x %8x %8x %8x=sp %8x=pc:",
                                  f->fr_arg[0], f->fr_arg[1], f->fr_arg[2], f->fr_arg[3],
-                                 f->fr_arg[4], f->fr_arg[5], (unsigned)(uintptr_t)f->fr_fp, f->fr_pc);
+                                 f->fr_arg[4], f->fr_arg[5], f->fr_fp, f->fr_pc);
                        db_printsym(f->fr_pc, DB_STGY_PROC, db_printf);
                        db_printf("\n");
                } else {
@@ -295,7 +294,7 @@
                                  f->fr_arg[0], f->fr_arg[1], 
                                  f->fr_arg[2], f->fr_arg[3],
                                  f->fr_arg[4], f->fr_arg[5], 
-                                 (unsigned)(uintptr_t)f->fr_fp, f->fr_pc);
+                                 f->fr_fp, f->fr_pc);
                }
        }
 }