 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_trace.c,v 1.62 2023/04/12 19:47:41 riastradh Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.63 2023/04/13 06:39:23 riastradh 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.62 2023/04/12 19:47:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.63 2023/04/13 06:39:23 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
 #endif
 #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>
 @@ -178,76 +178,76 @@ db_stack_trace_print(db_expr_t addr, boo
 				(*pr)("trace: pid %d ", (int)addr);
 				p = db_proc_find((pid_t)addr);
 				if (p == NULL) {
 					(*pr)("not found\n");
 					return;
+				}
 				l = R(&LIST_FIRST(&p->p_lwps));
 				if (l == NULL) {
 					(*pr)("trace: no LWP?\n");
 					return;
+				}
+			}
 			(*pr)("lid %d ", R(&l->l_lid));
-			pcb = lwp_getpcb(l);
+			pcb = R(&l->l_addr); /* lwp_getpcb */
 			frame = (db_addr_t)R(&pcb->pcb_sp);
 			(*pr)("at %p\n", frame);
 		} else
 			frame = (db_addr_t)addr;
 	} else {
 		frame = (db_addr_t)ddb_regs.r[1];
+	}
 	for (;;) {
 		if (frame < PAGE_SIZE)
 			break;
 		frame = R((db_addr_t *)frame);
 	    next_frame:
 		args = (db_addr_t *)(frame + 8);
 		if (frame < PAGE_SIZE)
 			break;
 	        if (count-- == 0)
 			break;
 		lr = R((db_addr_t *)(frame + 4)) - 4;
 		if ((lr & 3) || (lr < 0x100)) {
 			(*pr)("saved LR(0x%x) is invalid.", lr);
 			break;
+		}
 		(*pr)("0x%08lx: ", frame);
 		if (lr + 4 == (db_addr_t) trapexit ||
-#if !defined(_KERNEL) || defined(PPC_BOOKE) /* XXX crash(*) */
+#if !defined(_KERNEL) || defined(PPC_BOOKE) /* XXX crash(8) */
 		    lr + 4 == (db_addr_t) intrcall ||
 #endif
 		    lr + 4 == (db_addr_t) sctrapexit) {
 			const char *trapstr;
 			struct trapframe *tf =
 			    &((struct ktrapframe *)frame)->ktf_tf;
 			(*pr)("%s ",
 			    R(&tf->tf_srr1) & PSL_PR ? "user" : "kernel");
 			if (lr + 4 == (db_addr_t) sctrapexit) {
 				(*pr)("SC trap #%d by ", R(&tf->tf_fixreg[0]));
 				goto print_trap;
+			}
 			switch (R(&tf->tf_exc)) {
 			case EXC_DSI:
-#ifdef PPC_OEA			/* XXX crash(*) */
+#ifdef PPC_OEA			/* XXX crash(8) */
 				(*pr)("DSI %s trap @ %#x by ",
 				    (R(&tf->tf_dsisr) & DSISR_STORE
 					? "write"
 					: "read"),
 				    R(&tf->tf_dar));
 #endif
-#ifdef PPC_IBM4XX		/* XXX crash(*) */
+#ifdef PPC_IBM4XX		/* XXX crash(8) */
 				trapstr = "DSI";
 dsi:
 				(*pr)("%s %s trap @ %#x by ", trapstr,
 				    (R(&tf->tf_esr) & ESR_DST
 					? "write"
 					: "read"),
 				    R(&tf->tf_dear));
 #endif
 				goto print_trap;
 			case EXC_ALI:
 #ifdef PPC_OEA			/* XXX crash(8) */
 				(*pr)("ALI trap @ %#x (DSISR %#x) ",
 				    R(&tf->tf_dar), R(&tf->tf_dsisr));