 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_trace.c,v 1.27 2012/12/31 08:57:27 skrll Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.28 2013/01/18 07:34:39 skrll Exp $	*/
 /*
  * Copyright (c) 2000, 2001 Ben Harris
  * Copyright (c) 1996 Scott K. Stevens
+ *
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
 @@ -21,27 +21,27 @@
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.27 2012/12/31 08:57:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.28 2013/01/18 07:34:39 skrll Exp $");
 #include <sys/proc.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 #include <arm/pcb.h>
 #include <machine/db_machdep.h>
 #include <machine/vmparam.h>
 #include <ddb/db_access.h>
 #include <ddb/db_interface.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_proc.h>
 #include <ddb/db_output.h>
 @@ -81,39 +81,42 @@ __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v
 #define FR_RSP	(-2)
 #define FR_RFP	(-3)
 void
 db_stack_trace_print(db_expr_t addr, bool have_addr,
 		db_expr_t count, const char *modif,
 		void (*pr)(const char *, ...))
+{
 	uint32_t	*frame, *lastframe;
 	const char	*cp = modif;
 	char c;
 	bool		kernel_only = true;
 	bool		trace_thread = false;
 	bool		trace_full = false;
 	bool		lwpaddr = false;
 	db_addr_t	scp, pc;
 	int		scp_offset;
 	while ((c = *cp++) != 0) {
 		if (c == 'a') {
 			lwpaddr = true;
 			trace_thread = true;
+		}
 		if (c == 'u')
 			kernel_only = false;
 		if (c == 't')
 			trace_thread = true;
 		if (c == 'f')
 			trace_full = true;
+	}
 	if (!have_addr)
 		frame = (uint32_t *)(DDB_REGS->tf_r11);
 	else {
 		if (trace_thread) {
 			struct pcb *pcb;
 			proc_t p;
 			lwp_t l;
 			if (lwpaddr) {
 				db_read_bytes(addr, sizeof(l),
 				    (char *)&l);
 @@ -165,72 +168,76 @@ db_stack_trace_print(db_expr_t addr, boo
 	while (count-- && frame != NULL) {
 		uint32_t	savecode;
 		int		r;
 		uint32_t	*rp;
 		const char	*sep;
 #ifdef __PROG26
 		scp = frame[FR_SCP] & R15_PC;
 #else
 		scp = frame[FR_SCP];
 #endif
 		lastframe = frame;
 		(*pr)("%p: ", frame);
 #ifndef _KERNEL
 		uint32_t frameb[4];
 		db_read_bytes((db_addr_t)(frame - 3), sizeof(frameb),
 		    (char *)frameb);
 		frame = frameb + 3;
 #endif
 		db_printsym(pc, DB_STGY_PROC, pr);
-		(*pr)("\n\t");
+		if (trace_full) {
 			(*pr)("\n\t");
 #ifdef __PROG26
-		(*pr)("pc =0x%08x rlv=0x%08x (", pc, frame[FR_RLV] & R15_PC);
+			(*pr)("pc =0x%08x rlv=0x%08x (", pc,
-		db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC, pr);
+			     frame[FR_RLV] & R15_PC);
-		(*pr)(")\n");
+			db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC, pr);
 			(*pr)(")\n");
 #else
-		(*pr)("pc =0x%08x rlv=0x%08x (", pc, frame[FR_RLV]);
+			(*pr)("pc =0x%08x rlv=0x%08x (", pc, frame[FR_RLV]);
-		db_printsym(frame[FR_RLV], DB_STGY_PROC, pr);
+			db_printsym(frame[FR_RLV], DB_STGY_PROC, pr);
-		(*pr)(")\n");
+			(*pr)(")\n");
 #endif
-		(*pr)("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP], frame[FR_RFP]);
+			(*pr)("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP],
 			     frame[FR_RFP]);
+		}
 #ifndef _KERNEL
 		db_read_bytes((db_addr_t)((uint32_t *)scp + scp_offset),
 		    sizeof(savecode), (void *)&savecode);
 #else
 		if ((scp & 3) == 0) {
 			savecode = ((uint32_t *)scp)[scp_offset];
 		} else {
 			savecode = 0;
+		}
 #endif
-		if ((savecode & 0x0e100000) == 0x08000000) {
+		if (trace_full &&
 		    (savecode & 0x0e100000) == 0x08000000) {
 			/* Looks like an STM */
 			rp = frame - 4;
 			sep = "\n\t";
 			for (r = 10; r >= 0; r--) {
 				if (savecode & (1 << r)) {
 					(*pr)("%sr%d=0x%08x",
 					    sep, r, *rp--);
 					sep = (frame - rp) % 4 == 2 ?
 					    "\n\t" : " ";
+				}
+			}
+		}
 		(*pr)("\n");
 		/*
 		 * Switch to next frame up
 		 */
 		if (frame[FR_RFP] == 0)
 			break; /* Top of stack */
 #ifdef __PROG26
 		pc = frame[FR_RLV] & R15_PC;
 #else
 		pc = frame[FR_RLV];
 #endif
 		frame = (uint32_t *)(frame[FR_RFP]);