- In GCC 4.2 __builtin_frame_address() was fixed to include the

  V9 stack bias so we no longer need to add it in db_backtrace()
  and stack_capture() respectively. This also reverts r182018,
  which kludged around the resulting unaligned access.
- Sync the sun4v versions of db_trace.c and stack_machdep.c with
  the sparc64 ones and fix some style bugs.

MFC after:	3 days

2 files changed, 11 insertions, 23 deletions

diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c
index 7a30664..fb783a6 100644
--- a/sys/sparc64/sparc64/db_trace.c
+++ b/sys/sparc64/sparc64/db_trace.c
@@ -276,10 +276,9 @@ db_backtrace(struct thread *td, struct frame *fp, int count)
 void
 db_trace_self(void)
 {
-	db_expr_t addr;
 
-	addr = (db_expr_t)__builtin_frame_address(1);
-	db_backtrace(curthread, (struct frame *)(addr + SPOFF), -1);
+	db_backtrace(curthread,
+	    (struct frame *)__builtin_frame_address(1), -1);
 }
 
 int
@@ -288,5 +287,6 @@ db_trace_thread(struct thread *td, int count)
 	struct pcb *ctx;
 
 	ctx = kdb_thr_ctx(td);
-	return (db_backtrace(td, (struct frame*)(ctx->pcb_sp + SPOFF), count));
+	return (db_backtrace(td,
+	    (struct frame *)(ctx->pcb_sp + SPOFF), count));
 }
diff --git a/sys/sparc64/sparc64/stack_machdep.c b/sys/sparc64/sparc64/stack_machdep.c
index 68c2a51..f05ad6b 100644
--- a/sys/sparc64/sparc64/stack_machdep.c
+++ b/sys/sparc64/sparc64/stack_machdep.c
@@ -28,31 +28,24 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/endian.h>
 #include <sys/proc.h>
 #include <sys/stack.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-
-#include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <machine/stack.h>
-#include <machine/trap.h>
 #include <machine/vmparam.h>
 
+static void stack_capture(struct stack *st, struct frame *fp);
+
 static void
-stack_capture(struct stack *st, uint64_t addr)
+stack_capture(struct stack *st, struct frame *fp)
 {
 	vm_offset_t callpc;
 
 	stack_zero(st);
 	while (1) {
-		addr += SPOFF;
-		callpc =
-		    be64dec((void *)(addr + offsetof(struct frame, fr_pc)));
+		callpc = fp->fr_pc;
 		if (!INKERNEL(callpc))
 			break;
 		/* Don't bother traversing trap frames. */
@@ -63,30 +56,25 @@ stack_capture(struct stack *st, uint64_t addr)
 			break;
 		if (stack_put(st, callpc) == -1)
 			break;
-		addr =
-		    be64dec((void *)(addr + offsetof(struct frame, fr_fp)));
+		fp = v9next_frame(fp);
 	}
 }
 
 void
 stack_save_td(struct stack *st, struct thread *td)
 {
-	uint64_t addr;
 
 	if (TD_IS_SWAPPED(td))
 		panic("stack_save_td: swapped");
 	if (TD_IS_RUNNING(td))
 		panic("stack_save_td: running");
 
-	addr = td->td_pcb->pcb_sp;
-	stack_capture(st, addr);
+	stack_capture(st, (struct frame *)(td->td_pcb->pcb_sp + SPOFF));
 }
 
 void
 stack_save(struct stack *st)
 {
-	uint64_t addr;
 
-	addr = (uint64_t)__builtin_frame_address(1);
-	stack_capture(st, addr);
+	stack_capture(st, (struct frame *)__builtin_frame_address(1));
 }