 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_command.c,v 1.167 2020/01/01 22:57:17 thorpej Exp $	*/
+/*	$NetBSD: db_command.c,v 1.168 2020/03/09 01:46:24 christos Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik, and by Andrew Doran.
+ *
  * 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
 @@ -51,27 +51,27 @@
  *  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.
  */
 /*
  * Command dispatcher.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.167 2020/01/01 22:57:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.168 2020/03/09 01:46:24 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_mqueue.h"
 #include "opt_inet.h"
 #include "opt_kernhist.h"
 #include "opt_ddbparam.h"
 #include "opt_multiprocessor.h"
 #endif
 #include <sys/param.h>
 @@ -111,26 +111,31 @@ __KERNEL_RCSID(0, "$NetBSD: db_command.c
 #define	CMD_AMBIGUOUS	3
 /*
  * Exported global variables
  */
 bool		db_cmd_loop_done;
 label_t		*db_recover;
 db_addr_t	db_dot;
 db_addr_t	db_last_addr;
 db_addr_t	db_prev;
 db_addr_t	db_next;
 #ifndef _KERNEL
 #define db_kernelonly() \
     db_printf("%s: can only be used in-kernel.\n", __func__)
 #endif
 /*
  * New DDB api for adding and removing commands uses three lists, because
  * we use two types of commands
  * a) standard commands without subcommands -> reboot
  * b) show commands which are subcommands of show command -> show aio_jobs
  * c) if defined machine specific commands
+ *
  * ddb_add_cmd, ddb_rem_cmd use type (DDB_SHOW_CMD||DDB_BASE_CMD)argument to
  * add them to representativ lists.
  */
 static const struct db_command db_command_table[];
 static const struct db_command db_show_cmds[];
 @@ -1002,83 +1007,93 @@ static void
 db_map_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
+{
 #ifdef _KERNEL
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	if (have_addr == false)
 		addr = (db_expr_t)(uintptr_t)db_read_ptr("kernel_map");
 	uvm_map_printit((struct vm_map *)(uintptr_t) addr, full, db_printf);
 #else
 	db_kernelonly();
 #endif	/* XXX CRASH(8) */
+}
 /*ARGSUSED*/
 static void
 db_object_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	uvm_object_printit((struct uvm_object *)(uintptr_t) addr, full,
 	    db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_page_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	uvm_page_printit((struct vm_page *)(uintptr_t) addr, full, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_show_all_pages(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	uvm_page_printall(db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_buf_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	vfs_buf_print((struct buf *)(uintptr_t) addr, full, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_event_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool showzero = false;
 	bool showall = true;
 	bool showintr = false;
 	bool showtrap = false;
 	bool showmisc = false;
 @@ -1132,52 +1147,58 @@ db_event_print_cmd(db_expr_t addr, bool
 /*ARGSUSED*/
 static void
 db_vnode_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	vfs_vnode_print((struct vnode *)(uintptr_t) addr, full, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_vnode_lock_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	vfs_vnode_lock_print((struct vnode *)(uintptr_t) addr, full, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_vmem_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	vmem_print((uintptr_t) addr, modif, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 static void
 db_mount_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 @@ -1185,136 +1206,152 @@ db_mount_print_cmd(db_expr_t addr, bool
 #endif
+}
 static void
 db_show_all_mount(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	vfs_mount_print_all(full, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_mbuf_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	m_print((const struct mbuf *)(uintptr_t) addr, modif, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_pool_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	pool_printit((struct pool *)(uintptr_t) addr, modif, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_namecache_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL /* XXX CRASH(8) */
 	namecache_print((struct vnode *)(uintptr_t) addr, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED*/
 static void
 db_uvmexp_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	uvmexp_print(db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*ARGSUSED */
 static void
 db_socket_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	socket_print(modif, db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 #ifdef KERNHIST
 /*ARGSUSED*/
 static void
 db_kernhist_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	if (!have_addr)
 		addr = 0;
 	kernhist_print((void *)(uintptr_t)addr, count, modif, db_printf);
+}
 #endif
 /*ARGSUSED*/
 static void
 db_lock_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	lockdebug_lock_print(have_addr ? (void *)(uintptr_t)addr : NULL,
 	    db_printf);
 #endif
+}
 static void
 db_show_all_locks(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	lockdebug_show_all_locks(db_printf, modif);
 #else
 	db_kernelonly();
 #endif
+}
 static void
 db_show_all_freelists(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	uvm_page_print_freelists(db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 static void
 db_show_lockstats(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	lockdebug_show_lockstats(db_printf);
 #else
 	db_kernelonly();
 #endif
+}
 /*
  * Call random function:
  * !expr(arg,arg,arg)
  */
 /*ARGSUSED*/
 static void
 db_fncall(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL
 @@ -1358,27 +1395,27 @@ db_fncall(db_expr_t addr, bool have_addr
 			return;
+		}
+	}
 	db_skip_to_eol();
 	while (nargs < MAXARGS) {
 		args[nargs++] = 0;
+	}
 	retval = (*func)(args[0], args[1], args[2], args[3], args[4],
 			 args[5], args[6], args[7], args[8], args[9]);
 	db_printf("%s\n", db_num_to_str(retval));
 #else	/* _KERNEL */
-	db_printf("This command can only be used in-kernel.\n");
+	db_kernelonly();
 #endif	/* _KERNEL */
+}
 static void
 db_reboot_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL
 	db_expr_t bootflags;
 	/* Flags, default to RB_AUTOBOOT */
 	if (!db_expression(&bootflags))
 		bootflags = (db_expr_t)RB_AUTOBOOT;
 @@ -1389,27 +1426,27 @@ db_reboot_cmd(db_expr_t addr, bool have_
 	/*
 	 * We are leaving DDB, never to return upward.
 	 * Clear db_recover so that we can debug faults in functions
 	 * called from cpu_reboot.
 	 */
 	db_recover = 0;
 	/* Avoid all mutex errors */
 	lockdebug_dismiss();
 	panicstr = "reboot forced via kernel debugger";
 	/* Make it possible to break into the debugger again */
 	spl0();
 	kern_reboot((int)bootflags, NULL);
 #else	/* _KERNEL */
-	db_printf("This command can only be used in-kernel.\n");
+	db_kernelonly();
 #endif	/* _KERNEL */
+}
 static void
 db_sifting_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	int	mode, t;
 	t = db_read_token();
 	if (t == tSLASH) {
 		t = db_read_token();
 		if (t != tIDENT) {
 @@ -1456,34 +1493,36 @@ static void
 db_sync_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef _KERNEL
 	/*
 	 * We are leaving DDB, never to return upward.
 	 * Clear db_recover so that we can debug faults in functions
 	 * called from cpu_reboot.
 	 */
 	db_recover = 0;
 	panicstr = "dump forced via kernel debugger";
 	kern_reboot(RB_DUMP, NULL);
 #else	/* _KERNEL */
-	db_printf("This command can only be used in-kernel.\n");
+	db_kernelonly();
 #endif	/* _KERNEL */
+}
 /*
  * Describe what an address is
  */
 void
 db_whatis_cmd(db_expr_t address, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	const uintptr_t addr = (uintptr_t)address;
 	db_lwp_whatis(addr, db_printf);
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	pool_whatis(addr, db_printf);
 	vmem_whatis(addr, db_printf);
 	uvm_whatis(addr, db_printf);
 	module_whatis(addr, db_printf);
 #else
 	db_kernelonly();
 #endif
+}