 @@ -1,14 +1,14 @@
-/* $NetBSD: db_trace.c,v 1.36 2023/11/21 20:29:47 thorpej Exp $ */
+/* $NetBSD: db_trace.c,v 1.37 2023/11/21 20:40:24 thorpej Exp $ */
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ross Harvey.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -25,27 +25,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.36 2023/11/21 20:29:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.37 2023/11/21 20:40:24 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <machine/alpha.h>
 #include <machine/db_machdep.h>
 #include <alpha/alpha/db_instruction.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_access.h>
 #include <ddb/db_variables.h>
 @@ -123,29 +123,28 @@ do {									\
 			pi->pi_frame_size += ins.operate_lit_format.literal;
 		} else if (ins.mem_format.opcode == op_stq &&
 			   ins.mem_format.rb == 30 &&
 			   ins.mem_format.ra != 31) {
 			/* Store of (non-zero) register onto the stack. */
 			signed_immediate = (long)ins.mem_format.displacement;
 			pi->pi_regmask |= 1 << ins.mem_format.ra;
 			pi->pi_reg_offset[ins.mem_format.ra] = signed_immediate;
+		}
+	}
+}
 static void
-decode_syscall(int number, struct proc *p, void (*pr)(const char *, ...))
+decode_syscall(int number, void (*pr)(const char *, ...))
+{
 	(*pr)(" (%d)", number);
+}
 static unsigned long
 db_alpha_tf_reg(struct trapframe *tf, unsigned int regno)
+{
 	unsigned long reg;
 	db_read_bytes((db_addr_t)&tf->tf_regs[regno], sizeof(reg),
 	    (char *)&reg);
 	return reg;
+}
 @@ -165,46 +164,46 @@ db_stack_trace_print_ra(db_expr_t ra, bo
     const char *modif, void (*pr)(const char *, ...))
+{
 	db_addr_t callpc, frame, symval;
 	struct prologue_info pi;
 	db_expr_t diff;
 	db_sym_t sym;
 	u_long tfps;
 	const char *symname;
 	struct pcb *pcbp;
 	const char *cp = modif;
 	struct trapframe *tf;
 	bool ra_from_tf;
 	u_long last_ipl = ~0L;
 	struct proc *p = NULL;
 	struct lwp *l = NULL;
 	char c;
 	bool trace_thread = false;
 	bool lwpaddr = false;
 	while ((c = *cp++) != 0) {
 		trace_thread |= c == 't';
 		trace_thread |= c == 'a';
 		lwpaddr |= c == 'a';
+	}
 	if (!have_addr) {
 		p = curproc;
 		addr = DDB_REGS->tf_regs[FRAME_SP] - FRAME_SIZE * 8;
 		tf = (struct trapframe *)addr;
 		callpc = db_alpha_tf_reg(tf, FRAME_PC);
 		frame = (db_addr_t)tf + FRAME_SIZE * 8;
 		ra_from_tf = true;
 	} else {
 		struct proc *p = NULL;
 		struct lwp *l = NULL;
 		if (trace_thread) {
 			if (lwpaddr) {
 				l = (struct lwp *)addr;
 				p = l->l_proc;
 				(*pr)("trace: pid %d ", p->p_pid);
 			} else {
 				(*pr)("trace: pid %d ", (int)addr);
 				p = proc_find_raw(addr);
 				if (p == NULL) {
 					(*pr)("not found\n");
 					return;
+				}
 				l = LIST_FIRST(&p->p_lwps);
 @@ -283,27 +282,27 @@ db_stack_trace_print_ra(db_expr_t ra, bo
 		/*
 		 * If we are in a trap vector, frame points to a
 		 * trapframe.
 		 */
 		if (db_alpha_sym_is_trap(symval)) {
 			tf = (struct trapframe *)frame;
 			(*pr)("--- %s", db_alpha_trapsym_description(symval));
 			tfps = db_alpha_tf_reg(tf, FRAME_PS);
 			if (db_alpha_sym_is_syscall(symval)) {
 				decode_syscall(db_alpha_tf_reg(tf, FRAME_V0),
-				    p, pr);
+				    pr);
+			}
 			if ((tfps & ALPHA_PSL_IPL_MASK) != last_ipl) {
 				last_ipl = tfps & ALPHA_PSL_IPL_MASK;
 				if (! db_alpha_sym_is_syscall(symval)) {
 					(*pr)(" (from ipl %ld)", last_ipl);
+				}
+			}
 			(*pr)(" ---\n");
 			if (tfps & ALPHA_PSL_USERMODE) {
 				(*pr)("--- user mode ---\n");
 				break;	/* Terminate search.  */
+			}
 			callpc = db_alpha_tf_reg(tf, FRAME_PC);