 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_machdep.c,v 1.14 2012/08/31 11:52:39 skrll Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.15 2012/09/21 22:12:35 matt Exp $	*/
 /*
  * Copyright (c) 1996 Mark Brinicombe
+ *
  * 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
  * thereof, and that both notices appear in supporting documentation.
 @@ -19,27 +19,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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.14 2012/08/31 11:52:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.15 2012/09/21 22:12:35 matt Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/systm.h>
 #include <arm/arm32/db_machdep.h>
 #include <arm/cpufunc.h>
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_output.h>
 #include <ddb/db_variables.h>
 @@ -81,26 +81,29 @@ const struct db_variable db_regs[] = {
 };
 const struct db_variable * const db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
 const struct db_command db_machine_command_table[] = {
 	{ DDB_ADD_CMD("frame",	db_show_frame_cmd,	0,
 			"Displays the contents of a trapframe",
 			"[address]",
 			"   address:\taddress of trapfame to display")},
 #ifdef _KERNEL
 	{ DDB_ADD_CMD("panic",	db_show_panic_cmd,	0,
 			"Displays the last panic string",
 		     	NULL,NULL) },
 	{ DDB_ADD_CMD("fault",	db_show_fault_cmd,	0,
 			"Displays the fault registers",
 		     	NULL,NULL) },
 #endif
 #ifdef ARM32_DB_COMMANDS
 	ARM32_DB_COMMANDS,
 #endif
 	{ DDB_ADD_CMD(NULL,     NULL,           0,NULL,NULL,NULL) }
 };
 #ifdef _KERNEL
 int
 db_access_und_sp(const struct db_variable *vp, db_expr_t *valp, int rw)
+{
 	if (rw == DB_VAR_GET)
 @@ -125,26 +128,35 @@ db_access_irq_sp(const struct db_variabl
 		*valp = get_stackptr(PSR_IRQ32_MODE);
 	return(0);
+}
 void
 db_show_panic_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
 	int s;
 	s = splhigh();
 	db_printf("Panic string: %s\n", panicstr);
 	(void)splx(s);
+}
 void
 db_show_fault_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
 	db_printf("DFAR=%#x DFSR=%#x IFAR=%#x IFSR=%#x TTBR=%#x\n",
 	    armreg_dfar_read(), armreg_dfsr_read(),
 	    armreg_ifar_read(), armreg_ifsr_read(),
 	    armreg_ttbr_read());
+}
 #endif
 void
 db_show_frame_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
 	struct trapframe *frame;
 	if (!have_addr) {
 		db_printf("frame address must be specified\n");
 		return;
+	}

 @@ -1,11 +1,12 @@
-/* $NetBSD: db_machdep.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: db_machdep.h,v 1.6 2012/09/21 22:12:36 matt Exp $ */
 #ifndef _ARM32_DB_MACHDEP_H_
 #define _ARM32_DB_MACHDEP_H_
 #include <arm/db_machdep.h>
 void db_show_panic_cmd(db_expr_t, bool, db_expr_t, const char *);
 void db_show_frame_cmd(db_expr_t, bool, db_expr_t, const char *);
 void db_show_fault_cmd(db_expr_t, bool, db_expr_t, const char *);
 #endif