s/vm_offset_t/vaddr_t/ s/vm_size_t/vsize_t/

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 6fdcb2cb52c..7ac0b3ba7c3 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_aout.c,v 1.23 1998/12/20 23:49:56 millert Exp $	*/
+/*	$OpenBSD: db_aout.c,v 1.24 1999/09/11 00:44:59 mickey Exp $	*/
 /*	$NetBSD: db_aout.c,v 1.14 1996/02/27 20:54:43 gwr Exp $	*/
 
 /* 
@@ -115,7 +115,7 @@ X_db_sym_init(symtab, esymtab, name)
 	estrtab = strtab + slen;
 
 #define	round_to_size(x) \
-	(((vm_offset_t)(x) + sizeof(vm_size_t) - 1) & ~(sizeof(vm_size_t) - 1))
+	(((vaddr_t)(x) + sizeof(vsize_t) - 1) & ~(sizeof(vsize_t) - 1))
 
 	if (round_to_size(estrtab) != round_to_size(esymtab)) {
 	    db_printf("[ %s symbol table not valid ]\n", name);
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 3e72551bd7d..7e84a4025e8 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.c,v 1.7 1997/08/07 09:18:40 niklas Exp $	*/
+/*	$OpenBSD: db_break.c,v 1.8 1999/09/11 00:44:59 mickey Exp $	*/
 /*	$NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $	*/
 
 /* 
@@ -347,7 +347,7 @@ db_map_current(map)
 
 vm_map_t
 db_map_addr(addr)
-	vm_offset_t addr;
+	vaddr_t addr;
 {
 #if 0
 	thread_t	thread;
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 1292e69e300..add79e0acb7 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.h,v 1.4 1996/04/21 22:18:56 deraadt Exp $	*/
+/*	$OpenBSD: db_break.h,v 1.5 1999/09/11 00:44:59 mickey Exp $	*/
 /*	$NetBSD: db_break.h,v 1.8 1996/02/05 01:56:52 christos Exp $	*/
 
 /* 
@@ -66,6 +66,6 @@ void db_breakpoint_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_listbreak_cmd __P((db_expr_t, int, db_expr_t, char *));
 boolean_t db_map_equal __P((vm_map_t, vm_map_t));
 boolean_t db_map_current __P((vm_map_t));
-vm_map_t db_map_addr __P((vm_offset_t));
+vm_map_t db_map_addr __P((vaddr_t));
 
 #endif	/* _DDB_DB_BREAK_H_ */
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index d0726b3bd90..8ab65d803ff 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.c,v 1.4 1996/04/21 22:19:21 deraadt Exp $ */
+/*	$OpenBSD: db_watch.c,v 1.5 1999/09/11 00:44:59 mickey Exp $ */
 /*	$NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $	*/
 
 /* 
@@ -88,7 +88,7 @@ void
 db_set_watchpoint(map, addr, size)
 	vm_map_t	map;
 	db_addr_t	addr;
-	vm_size_t	size;
+	vsize_t 	size;
 {
 	register db_watchpoint_t	watch;
 
@@ -190,11 +190,11 @@ db_watchpoint_cmd(addr, have_addr, count, modif)
 	db_expr_t	count;
 	char *		modif;
 {
-	vm_size_t	size;
+	vsize_t 	size;
 	db_expr_t	value;
 
 	if (db_expression(&value))
-	    size = (vm_size_t) value;
+	    size = (vsize_t) value;
 	else
 	    size = 4;
 	db_skip_to_eol();
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 2e830d859fe..132d9c74a00 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.h,v 1.5 1997/09/06 14:49:01 deraadt Exp $	*/
+/*	$OpenBSD: db_watch.h,v 1.6 1999/09/11 00:44:59 mickey Exp $	*/
 /*	$NetBSD: db_watch.h,v 1.9 1996/02/05 01:57:24 christos Exp $	*/
 
 /* 
@@ -45,7 +45,7 @@ typedef struct db_watchpoint {
 
 db_watchpoint_t db_watchpoint_alloc __P((void));
 void db_watchpoint_free __P((db_watchpoint_t));
-void db_set_watchpoint __P((vm_map_t, db_addr_t, vm_size_t));
+void db_set_watchpoint __P((vm_map_t, db_addr_t, vsize_t));
 void db_delete_watchpoint __P((vm_map_t, db_addr_t));
 void db_list_watchpoints __P((void));
 void db_deletewatch_cmd __P((db_expr_t, int, db_expr_t, char *));