 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_command.c,v 1.119 2008/09/29 10:27:53 rmind Exp $	*/
+/*	$NetBSD: db_command.c,v 1.120 2008/10/03 14:52:11 rmind Exp $	*/
 /*
  * 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.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -48,27 +48,27 @@
  * 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.
  */
 /*
  * Command dispatcher.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.119 2008/09/29 10:27:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.120 2008/10/03 14:52:11 rmind Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_inet.h"
 #include "opt_uvmhist.h"
 #include "opt_ddbparam.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/malloc.h>
 @@ -1064,29 +1064,29 @@ db_help_print_cmd(db_expr_t addr, bool h
+}
 /*ARGSUSED*/
 static void
 db_map_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	if (have_addr == false)
-		addr = (db_expr_t)(intptr_t) kernel_map;
+		addr = (db_expr_t)(uintptr_t) kernel_map;
-	uvm_map_printit((struct vm_map *)(intptr_t) addr, full, db_printf);
+	uvm_map_printit((struct vm_map *)(uintptr_t) addr, full, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_malloc_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 #ifdef MALLOC_DEBUG
 	if (!have_addr)
 		addr = 0;
 	debug_malloc_printit(db_printf, (vaddr_t) addr);
 @@ -1095,128 +1095,128 @@ db_malloc_print_cmd(db_expr_t addr, bool
 #endif /* MALLOC_DEBUG */
+}
 /*ARGSUSED*/
 static void
 db_object_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	uvm_object_printit((struct uvm_object *)(intptr_t) addr, full,
+	uvm_object_printit((struct uvm_object *)(uintptr_t) addr, full,
 	    db_printf);
+}
 /*ARGSUSED*/
 static void
 db_page_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	uvm_page_printit((struct vm_page *)(intptr_t) addr, full, db_printf);
+	uvm_page_printit((struct vm_page *)(uintptr_t) addr, full, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_show_all_pages(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	uvm_page_printall(db_printf);
+}
 /*ARGSUSED*/
 static void
 db_buf_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	vfs_buf_print((struct buf *)(intptr_t) addr, full, db_printf);
+	vfs_buf_print((struct buf *)(uintptr_t) addr, full, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_event_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
 	event_print(full, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_vnode_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	vfs_vnode_print((struct vnode *)(intptr_t) addr, full, db_printf);
+	vfs_vnode_print((struct vnode *)(uintptr_t) addr, full, db_printf);
+}
 static void
 db_mount_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	vfs_mount_print((struct mount *)(intptr_t) addr, full, db_printf);
+	vfs_mount_print((struct mount *)(uintptr_t) addr, full, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_mbuf_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
-	m_print((const struct mbuf *)(intptr_t) addr, modif, db_printf);
+	m_print((const struct mbuf *)(uintptr_t) addr, modif, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_pool_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
-	pool_printit((struct pool *)(intptr_t) addr, modif, db_printf);
+	pool_printit((struct pool *)(uintptr_t) addr, modif, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_namecache_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
-	namecache_print((struct vnode *)(intptr_t) addr, db_printf);
+	namecache_print((struct vnode *)(uintptr_t) addr, db_printf);
+}
 /*ARGSUSED*/
 static void
 db_uvmexp_print_cmd(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
+{
 	uvmexp_print(db_printf);
+}
 #ifdef UVMHIST
 /*ARGSUSED*/
 @@ -1250,27 +1250,27 @@ db_fncall(db_expr_t addr, bool have_addr
 	db_expr_t	fn_addr;
 #define	MAXARGS		11
 	db_expr_t	args[MAXARGS];
 	int		nargs = 0;
 	db_expr_t	retval;
 	db_expr_t	(*func)(db_expr_t, ...);
 	int		t;
 	if (!db_expression(&fn_addr)) {
 		db_printf("Bad function\n");
 		db_flush_lex();
 		return;
+	}
-	func = (db_expr_t (*)(db_expr_t, ...))(intptr_t) fn_addr;
+	func = (db_expr_t (*)(db_expr_t, ...))(uintptr_t) fn_addr;
 	t = db_read_token();
 	if (t == tLPAREN) {
 		if (db_expression(&args[0])) {
 			nargs++;
 			while ((t = db_read_token()) == tCOMMA) {
 				if (nargs == MAXARGS) {
 					db_printf("Too many arguments\n");
 					db_flush_lex();
 					return;
+				}
 				if (!db_expression(&args[nargs])) {
 					db_printf("Argument missing\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_xxx.c,v 1.51 2008/07/14 10:15:11 blymn Exp $	*/
+/*	$NetBSD: db_xxx.c,v 1.52 2008/10/03 14:52:11 rmind Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -27,27 +27,27 @@
  * 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: kern_proc.c	8.4 (Berkeley) 1/4/94
  */
 /*
  * Miscellaneous DDB functions that are intimate (xxx) with various
  * data structures and functions used by the kernel (proc, callout).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.51 2008/07/14 10:15:11 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.52 2008/10/03 14:52:11 rmind Exp $");
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/callout.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/lockdebug.h>
 @@ -124,27 +124,27 @@ db_show_files_cmd(db_expr_t addr, bool h
 	      db_expr_t count, const char *modif)
+{
 	struct proc *p;
 	int i;
 	filedesc_t *fdp;
 	fdfile_t *ff;
 	file_t *fp;
 	struct vnode *vn;
 	bool full = false;
 	if (modif[0] == 'f')
 		full = true;
-	p = (struct proc *) (intptr_t) addr;
+	p = (struct proc *) (uintptr_t) addr;
 	fdp = p->p_fd;
 	for (i = 0; i < fdp->fd_nfiles; i++) {
 		if ((ff = fdp->fd_ofiles[i]) == NULL)
 			continue;
 		fp = ff->ff_file;
 		/* Only look at vnodes... */
 		if ((fp != NULL) && (fp->f_type == DTYPE_VNODE)) {
 			if (fp->f_data != NULL) {
 				vn = (struct vnode *) fp->f_data;
 				vfs_vnode_print(vn, full, db_printf);