partial sync with netbsd 960418, more to come

25 files changed, 68 insertions, 36 deletions

diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index be179cdb431..58e67cbdb8d 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_access.c,v 1.4 1996/04/17 05:29:35 mickey Exp $	*/
+/*	$OpenBSD: db_access.c,v 1.5 1996/04/21 22:18:53 deraadt Exp $	*/
+/*	$NetBSD: db_access.c,v 1.8 1994/10/09 08:37:35 mycroft Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 30384ef45b3..2b66fa7f8df 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_access.h,v 1.3 1996/03/11 11:15:55 mickey Exp $	*/
+/*	$OpenBSD: db_access.h,v 1.4 1996/04/21 22:18:54 deraadt Exp $	*/
+/*	$NetBSD: db_access.h,v 1.6 1994/10/09 08:29:57 mycroft Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 6219806c6b4..57975240403 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_break.c,v 1.3 1996/03/11 11:15:58 mickey Exp $	*/
+/*	$OpenBSD: db_break.c,v 1.4 1996/04/21 22:18:55 deraadt Exp $	*/
+/*	$NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $	*/
 
 /* 
  * Mach Operating System
@@ -250,7 +251,7 @@ db_list_breakpoints()
 	     bkpt != 0;
 	     bkpt = bkpt->link)
 	{
-	    db_printf("%s%8x %5d    ",
+	    db_printf("%s%p %5d    ",
 		      db_map_current(bkpt->map) ? "*" : " ",
 		      bkpt->map, bkpt->init_count);
 	    db_printsym(bkpt->address, DB_STGY_PROC);
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 25a4de55d1b..1292e69e300 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_break.h,v 1.3 1996/03/11 11:16:00 mickey Exp $	*/
+/*	$OpenBSD: db_break.h,v 1.4 1996/04/21 22:18:56 deraadt Exp $	*/
+/*	$NetBSD: db_break.h,v 1.8 1996/02/05 01:56:52 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 3b1899bcbea..6867ebaad87 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: db_command.c,v 1.6 1996/04/19 16:08:30 niklas Exp $	*/
-/*	$NetBSD: db_command.c,v 1.19 1996/03/13 21:06:38 christos Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.7 1996/04/21 22:18:57 deraadt Exp $	*/
+/*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /* 
  * Mach Operating System
@@ -513,7 +513,7 @@ db_fncall(addr, have_addr, count, modif)
 	}
 
 	retval = (*func)(args[0], args[1], args[2], args[3], args[4],
-			 args[5], args[6], args[7], args[8], args[9] );
+			 args[5], args[6], args[7], args[8], args[9]);
 	db_printf("%#n\n", retval);
 }
 
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index a98028acd65..96df9372b2f 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_command.h,v 1.3 1996/03/11 11:16:03 mickey Exp $	*/
+/*	$OpenBSD: db_command.h,v 1.4 1996/04/21 22:18:58 deraadt Exp $	*/
+/*	$NetBSD: db_command.h,v 1.8 1996/02/05 01:56:55 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 4f673d9141c..cca67eea3f6 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_examine.c,v 1.3 1996/03/11 11:16:05 mickey Exp $	*/
+/*	$OpenBSD: db_examine.c,v 1.4 1996/04/21 22:18:59 deraadt Exp $	*/
+/*	$NetBSD: db_examine.c,v 1.11 1996/03/30 22:30:07 christos Exp $	*/
 
 /*
  * Mach Operating System
@@ -107,7 +108,7 @@ db_examine(addr, fmt, count)
 				width = 12;
 				break;
 			case 'a':	/* address */
-				db_printf("= 0x%x\n", addr);
+				db_printf("= 0x%lx\n", addr);
 				break;
 			case 'r':	/* signed, current radix */
 				value = db_get_value(addr, size, TRUE);
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 9aead4c2b02..64d38e35997 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_expr.c,v 1.3 1996/03/11 11:16:06 mickey Exp $	*/
+/*	$OpenBSD: db_expr.c,v 1.4 1996/04/21 22:19:00 deraadt Exp $	*/
+/*	$NetBSD: db_expr.c,v 1.5 1996/02/05 01:56:58 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 55c01a0f917..c2638e40b42 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_input.c,v 1.3 1996/03/11 11:16:09 mickey Exp $	*/
+/*	$OpenBSD: db_input.c,v 1.4 1996/04/21 22:19:01 deraadt Exp $	*/
+/*	$NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_interface.h b/sys/ddb/db_interface.h
index e8026df69d4..3421ce48ad1 100644
--- a/sys/ddb/db_interface.h
+++ b/sys/ddb/db_interface.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: db_interface.h,v 1.2 1996/03/11 11:16:10 mickey Exp $	*/
-/*	$NetBSD: db_interface.h,v 1.1 1996/02/05 01:57:03 christos Exp &	*/
+/*	$OpenBSD: db_interface.h,v 1.3 1996/04/21 22:19:02 deraadt Exp $	*/
+/*	$NetBSD: db_interface.h,v 1.1 1996/02/05 01:57:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Christos Zoulas.  All rights reserved.
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 957e348d1b1..940945416d7 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_lex.c,v 1.3 1996/03/11 11:16:12 mickey Exp $	*/
+/*	$OpenBSD: db_lex.c,v 1.4 1996/04/21 22:19:03 deraadt Exp $	*/
+/*	$NetBSD: db_lex.c,v 1.8 1996/02/05 01:57:05 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 443db5ac2d8..afd6fcb2fec 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_lex.h,v 1.3 1996/03/11 11:16:13 mickey Exp $	*/
+/*	$OpenBSD: db_lex.h,v 1.4 1996/04/21 22:19:04 deraadt Exp $	*/
+/*	$NetBSD: db_lex.h,v 1.7 1996/02/05 01:57:07 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index f9d5d940c24..7a6514661b9 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_output.c,v 1.4 1996/03/11 11:16:15 mickey Exp $	*/
+/*	$OpenBSD: db_output.c,v 1.5 1996/04/21 22:19:05 deraadt Exp $	*/
+/*	$NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $	*/
 
 /* 
  * Mach Operating System
@@ -205,9 +206,7 @@ void
 db_printf(const char *fmt, ...)
 #else
 db_printf(fmt, va_alist)
-/*###207 [cc] warning: type of `va_alist' defaults to `int'%%%*/
 	const char *fmt;
-/*###208 [cc] parse error before `va_dcl'%%%*/
 	va_dcl
 #endif
 {
@@ -344,6 +343,10 @@ reswitch:	switch (ch = *(u_char *)fmt++) {
 				width = -width;
 			}
 			goto reswitch;
+		case ':':
+			p = va_arg(ap, char *);
+			db_printf_guts (p, va_arg(ap, va_list));
+			break;
 		case 'c':
 			db_putchar(va_arg(ap, int));
 			break;
@@ -387,6 +390,12 @@ reswitch:	switch (ch = *(u_char *)fmt++) {
 			ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int);
 			base = 8;
 			goto number;
+		case 'p':
+			db_putchar ('0');
+			db_putchar ('x');
+			ul = (u_long) va_arg(ap, void *);
+			base = 16;
+			goto number;
 		case 'u':
 			ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int);
 			base = 10;
@@ -442,4 +451,3 @@ number:			p = (char *)db_ksprintn(ul, base, &tmp);
 		}
 	}
 }
-
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 7385a3ce1d9..3a1f7f7ca1e 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_output.h,v 1.4 1996/03/11 11:16:17 mickey Exp $	*/
+/*	$OpenBSD: db_output.h,v 1.5 1996/04/21 22:19:07 deraadt Exp $ */
+/*	$NetBSD: db_output.h,v 1.9 1996/04/04 05:13:50 cgd Exp $	*/
 
 /* 
  * Mach Operating System
@@ -35,6 +36,8 @@
 void db_force_whitespace __P((void));
 void db_putchar __P((int));
 int db_print_position __P((void));
-void db_printf __P((const char *, ...));
-void kdbprintf __P((const char *, ...));
+void db_printf __P((const char *, ...))
+    __kprintf_attribute__((__format__(__kprintf__,1,2)));
+void kdbprintf __P((const char *, ...))
+    __kprintf_attribute__((__format__(__kprintf__,1,2)));
 void db_end_line __P((void));
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index ad89a8503b3..0e55e096f7d 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_print.c,v 1.3 1996/03/11 11:16:18 mickey Exp $	*/
+/*	$OpenBSD: db_print.c,v 1.4 1996/04/21 22:19:08 deraadt Exp $	*/
+/*	$NetBSD: db_print.c,v 1.5 1996/02/05 01:57:11 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 97954824a11..c6fc8817abf 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_run.c,v 1.3 1996/03/11 11:16:20 mickey Exp $	*/
+/*	$OpenBSD: db_run.c,v 1.4 1996/04/21 22:19:10 deraadt Exp $	*/
+/*	$NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_run.h b/sys/ddb/db_run.h
index 7cfba079923..71d2c00ba04 100644
--- a/sys/ddb/db_run.h
+++ b/sys/ddb/db_run.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_run.h,v 1.3 1996/03/11 11:16:21 mickey Exp $	*/
+/*	$OpenBSD: db_run.h,v 1.4 1996/04/21 22:19:12 deraadt Exp $	*/
+/*	$NetBSD: db_run.h,v 1.3 1996/02/05 01:57:14 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 19dd9264ef1..f0b2c7155b1 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_sym.c,v 1.6 1996/03/30 04:51:28 mickey Exp $	*/
+/*	$OpenBSD: db_sym.c,v 1.7 1996/04/21 22:19:13 deraadt Exp $	*/
+/*	$NetBSD: db_sym.c,v 1.12 1996/02/05 01:57:15 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index cd2321ffe6c..9d2fe2cf2c7 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_sym.h,v 1.3 1996/03/11 11:16:25 mickey Exp $	*/
+/*	$OpenBSD: db_sym.h,v 1.4 1996/04/21 22:19:15 deraadt Exp $	*/
+/*	$NetBSD: db_sym.h,v 1.7 1996/02/05 01:57:16 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 92a8c23e85c..787888ed65e 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_trap.c,v 1.3 1996/03/11 11:16:26 mickey Exp $	*/
+/*	$OpenBSD: db_trap.c,v 1.4 1996/04/21 22:19:16 deraadt Exp $	*/
+/*	$NetBSD: db_trap.c,v 1.9 1996/02/05 01:57:18 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index ccb5c64b4da..f7e96b2d11b 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_variables.c,v 1.4 1996/03/30 04:51:30 mickey Exp $	*/
+/*	$OpenBSD: db_variables.c,v 1.5 1996/04/21 22:19:18 deraadt Exp $	*/
+/*	$NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index c0e71eb1d26..830451c82d6 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_variables.h,v 1.3 1996/03/11 11:16:30 mickey Exp $	*/
+/*	$OpenBSD: db_variables.h,v 1.4 1996/04/21 22:19:19 deraadt Exp $	*/
+/*	$NetBSD: db_variables.h,v 1.5 1996/02/05 01:57:21 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index e6021c9f0b1..d0726b3bd90 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_watch.c,v 1.3 1996/03/11 11:16:31 mickey Exp $	*/
+/*	$OpenBSD: db_watch.c,v 1.4 1996/04/21 22:19:21 deraadt Exp $ */
+/*	$NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $	*/
 
 /* 
  * Mach Operating System
@@ -162,7 +163,7 @@ db_list_watchpoints()
 	for (watch = db_watchpoint_list;
 	     watch != 0;
 	     watch = watch->link)
-	    db_printf("%s%8x  %8x  %x\n",
+	    db_printf("%s%p  %8lx  %lx\n",
 		      db_map_current(watch->map) ? "*" : " ",
 		      watch->map, watch->loaddr,
 		      watch->hiaddr - watch->loaddr);
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index dbc407d7aa3..72f45dfe9c2 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_watch.h,v 1.3 1996/03/11 11:16:32 mickey Exp $	*/
+/*	$OpenBSD: db_watch.h,v 1.4 1996/04/21 22:19:22 deraadt Exp $	*/
+/*	$NetBSD: db_watch.h,v 1.9 1996/02/05 01:57:24 christos Exp $	*/
 
 /* 
  * Mach Operating System
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 01c00d16214..69c5df8e1dc 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: db_write_cmd.c,v 1.3 1996/03/11 11:16:33 mickey Exp $	*/
+/*	$OpenBSD: db_write_cmd.c,v 1.4 1996/04/21 22:19:27 deraadt Exp $	*/
+/*	$NetBSD: db_write_cmd.c,v 1.6 1996/02/05 01:57:25 christos Exp $	*/
 
 /* 
  * Mach Operating System