 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_trace.c,v 1.58 2018/02/28 20:11:09 mrg Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $	*/
 /*	$OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1992 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
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,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 Mellon
  * the rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.58 2018/02/28 20:11:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $");
 #include "opt_ppcarch.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <uvm/uvm_extern.h>
 #include <machine/db_machdep.h>
 #include <machine/pmap.h>
 #include <powerpc/pcb.h>
 @@ -203,27 +203,29 @@ db_stack_trace_print(db_expr_t addr, boo
 			(*pr)("%s ", tf->tf_srr1 & PSL_PR ? "user" : "kernel");
 			if (lr + 4 == (db_addr_t) sctrapexit) {
 				(*pr)("SC trap #%d by ", tf->tf_fixreg[0]);
 				goto print_trap;
+			}
 			switch (tf->tf_exc) {
 			case EXC_DSI:
 #ifdef PPC_OEA
 				(*pr)("DSI %s trap @ %#x by ",
 				    tf->tf_dsisr & DSISR_STORE ? "write" : "read",
 				    tf->tf_dar);
 #endif
 #ifdef PPC_IBM4XX
-				(*pr)("DSI %s trap @ %#x by ",
+				trapstr = "DSI";
 dsi:
 				(*pr)("%s %s trap @ %#x by ", trapstr,
 				    tf->tf_esr & ESR_DST ? "write" : "read",
 				    tf->tf_dear);
 #endif
 				goto print_trap;
 			case EXC_ALI:
 #ifdef PPC_OEA
 				(*pr)("ALI trap @ %#x (DSISR %#x) ",
 				    tf->tf_dar, tf->tf_dsisr);
 				goto print_trap;
 #else
 				trapstr = "ALI"; break;
 #endif
 			case EXC_ISI: trapstr = "ISI"; break;
 @@ -231,27 +233,31 @@ db_stack_trace_print(db_expr_t addr, boo
 			case EXC_SC: trapstr = "SC"; break;
 			case EXC_EXI: trapstr = "EXI"; break;
 			case EXC_MCHK: trapstr = "MCHK"; break;
 			case EXC_VEC: trapstr = "VEC"; break;
 			case EXC_FPU: trapstr = "FPU"; break;
 			case EXC_FPA: trapstr = "FPA"; break;
 			case EXC_DECR: trapstr = "DECR"; break;
 			case EXC_BPT: trapstr = "BPT"; break;
 			case EXC_TRC: trapstr = "TRC"; break;
 			case EXC_RUNMODETRC: trapstr = "RUNMODETRC"; break;
 			case EXC_PERF: trapstr = "PERF"; break;
 			case EXC_SMI: trapstr = "SMI"; break;
 			case EXC_RST: trapstr = "RST"; break;
-			case EXC_DTMISS: trapstr = "DTMISS"; break;
+			case EXC_DTMISS: trapstr = "DTMISS";
 #ifdef PPC_IBM4XX
 				goto dsi;
 #endif
 				break;
 			case EXC_ITMISS: trapstr = "ITMISS"; break;
 			case EXC_FIT: trapstr = "FIT"; break;
 			case EXC_PIT: trapstr = "PIT"; break;
 			case EXC_WDOG: trapstr = "WDOG"; break;
 			default: trapstr = NULL; break;
+			}
 			if (trapstr != NULL) {
 				(*pr)("%s trap by ", trapstr);
 			} else {
 				(*pr)("trap %#x by ", tf->tf_exc);
+			}
 		   print_trap:
 			lr = (db_addr_t) tf->tf_srr0;
 @@ -268,27 +274,28 @@ db_stack_trace_print(db_expr_t addr, boo
 				    diff, tf->tf_srr1);
+			}
 			(*pr)("%-10s  r1=%#x cr=%#x xer=%#x ctr=%#x",
 			    "", tf->tf_fixreg[1], tf->tf_cr, tf->tf_xer, tf->tf_ctr);
 #ifdef PPC_OEA
 			if (tf->tf_exc == EXC_DSI)
 				(*pr)(" dsisr=%#x", tf->tf_dsisr);
 #ifdef PPC_OEA601
 			if ((mfpvr() >> 16) == MPC601)
 				(*pr)(" mq=%#x", tf->tf_mq);
 #endif /* PPC_OEA601 */
 #endif /* PPC_OEA */
 #ifdef PPC_IBM4XX
-			if (tf->tf_exc == EXC_DSI)
+			if (tf->tf_exc == EXC_DSI ||
 			    tf->tf_exc == EXC_DTMISS)
 				(*pr)(" dear=%#x", tf->tf_dear);
 			(*pr)(" esr=%#x pid=%#x", tf->tf_esr, tf->tf_pid);
 #endif
 			(*pr)("\n");
 			frame = (db_addr_t) tf->tf_fixreg[1];
 			in_kernel = !(tf->tf_srr1 & PSL_PR);
 			if (kernel_only && !in_kernel)
 				break;
 			goto next_frame;
+		}
 		diff = 0;
 		symname = NULL;