 @@ -1,14 +1,14 @@
-/* $NetBSD: db_machdep.h,v 1.36 2021/03/29 03:07:33 simonb Exp $ */
+/* $NetBSD: db_machdep.h,v 1.37 2021/03/29 03:09:41 simonb Exp $ */
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -89,26 +89,32 @@ db_addr_t	db_disasm_insn(int insn, db_ad
 /*
  * Entrypoints to DDB for kernel, keyboard drivers, init hook
  */
 void 	kdb_kbd_trap(db_regs_t *);
 int 	kdb_trap(int type, struct reg *);
 static inline void
 db_set_ddb_regs(int type, struct reg *regs)
+{
 	ddb_regs = *regs;
+}
 /*
  * Helper functions for fetching 32-bit and 64-bit kernel memory.
  */
 bool		kdbpeek(vaddr_t, unsigned *);
 mips_reg_t	kdbrpeek(vaddr_t addr, size_t n);
 /*
  * Constants for KGDB.
  */
 typedef	mips_reg_t	kgdb_reg_t;
 #define	KGDB_NUMREGS	90
 #define	KGDB_BUFLEN	1024
 /*
  * MIPS cpus have no hardware single-step.
  */
 #define	SOFTWARE_SSTEP

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mips_stacktrace.c,v 1.7 2020/09/24 03:17:18 mrg Exp $	*/
+/*	$NetBSD: mips_stacktrace.c,v 1.8 2021/03/29 03:09:42 simonb Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -30,27 +30,27 @@
  * 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.
+ *
  * from: NetBSD: trap.c,v 1.255 2020/07/13 09:00:40 simonb Exp
  * from: Utah Hdr: trap.c 1.32 91/04/06
+ *
  *	@(#)trap.c	8.5 (Berkeley) 1/11/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.7 2020/09/24 03:17:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.8 2021/03/29 03:09:42 simonb Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <mips/locore.h>
 #include <mips/mips_opcode.h>
 #include <mips/regnum.h>
 @@ -181,47 +181,47 @@ static const struct { void *addr; const
 	Name(mips64r2_user_gen_exception),
 	Name(mips64r2_systemcall),
 	Name(mips64r2_kern_intr),
 	Name(mips64r2_user_intr),
 #endif	/* MIPS64R2 */
 	Name(cpu_idle),
 	Name(cpu_switchto),
 #endif /* _KERNEL */
 	{0, 0}
 };
-static bool
+bool
 kdbpeek(vaddr_t addr, unsigned *valp)
+{
 	if (addr & 3) {
 		printf("kdbpeek: unaligned address %#"PRIxVADDR"\n", addr);
 		/* We might have been called from DDB, so do not go there. */
 		return false;
 	} else if (addr == 0) {
 		printf("kdbpeek: NULL\n");
 		return false;
 	} else {
 #if _KERNEL
 		*valp = *(unsigned *)addr;
 #else
 		db_read_bytes((db_addr_t)addr, sizeof(unsigned), (char *)valp);
 #endif
 		return true;
+	}
+}
-static mips_reg_t
+mips_reg_t
 kdbrpeek(vaddr_t addr, size_t n)
+{
 	mips_reg_t rc = 0;
 	if (addr & (n - 1)) {
 		printf("kdbrpeek: unaligned address %#"PRIxVADDR"\n", addr);
 #if _KERNEL
 		/* We might have been called from DDB, so do not go there. */
 		stacktrace();
 #endif
 		rc = -1;
 	} else if (addr == 0) {
 		printf("kdbrpeek: NULL\n");