ansi/deregister. No binary change.

19 files changed, 229 insertions, 558 deletions

diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 7622b6f6271..3a7c487438a 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_access.c,v 1.8 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_access.c,v 1.9 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_access.c,v 1.8 1994/10/09 08:37:35 mycroft Exp $	*/
 
 /* 
@@ -45,10 +45,7 @@
  * boundaries.
  */
 db_expr_t
-db_get_value(addr, size, is_signed)
-	db_addr_t addr;
-	size_t size;
-	boolean_t is_signed;
+db_get_value(db_addr_t addr, size_t size, boolean_t is_signed)
 {
 	char data[sizeof(db_expr_t)];
 	db_expr_t value, extend;
@@ -71,10 +68,7 @@ db_get_value(addr, size, is_signed)
 }
 
 void
-db_put_value(addr, size, value)
-	db_addr_t addr;
-	size_t size;
-	db_expr_t value;
+db_put_value(db_addr_t addr, size_t size, db_expr_t value)
 {
 	char data[sizeof(db_expr_t)];
 	int i;
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index a7b6ccbdbf4..cc1a5e3ec75 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_aout.c,v 1.28 2002/03/14 01:26:51 millert Exp $	*/
+/*	$OpenBSD: db_aout.c,v 1.29 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_aout.c,v 1.29 2000/07/07 21:55:18 jhawk Exp $	*/
 
 /* 
@@ -90,15 +90,14 @@ static int slen;
 
 /*
  * Find the symbol table and strings; tell ddb about them.
+ *
+ * symsize:	size of symbol table
+ * vsymtab:	pointer to end of string table
+ * vesymtab:	pointer to end of string table, for checking - rounded up to
+ * 		    integer boundry
  */
 boolean_t
-db_aout_sym_init(symsize, vsymtab, vesymtab, name)
-	int symsize;		/* size of symbol table */
-	void *vsymtab;		/* pointer to start of symbol table */
-	void *vesymtab;		/* pointer to end of string table,
-				   for checking - rounded up to integer
-				   boundary */
-	const char *name;
+db_aout_sym_init(int symsize, void *vsymtab, void *vesymtab, const char *name)
 {
 	struct nlist	*sym_start, *sym_end;
 	struct nlist	*sp;
@@ -173,9 +172,7 @@ db_aout_sym_init(symsize, vsymtab, vesymtab, name)
 }
 
 db_sym_t
-db_aout_lookup(stab, symstr)
-	db_symtab_t	*stab;
-	char *		symstr;
+db_aout_lookup(db_symtab_t *stab, char *symstr)
 {
 	struct nlist *sp, *ep;
 	char *n_name;
@@ -194,11 +191,8 @@ db_aout_lookup(stab, symstr)
 }
 
 db_sym_t
-db_aout_search_symbol(symtab, off, strategy, diffp)
-	db_symtab_t *	symtab;
-	db_addr_t	off;
-	db_strategy_t	strategy;
-	db_expr_t	*diffp;		/* in/out */
+db_aout_search_symbol(db_symtab_t *symtab, db_addr_t off,
+    db_strategy_t strategy, db_expr_t *diffp)
 {
 	unsigned int	diff = *diffp;
 	struct nlist	*symp = 0;
@@ -243,11 +237,8 @@ db_aout_search_symbol(symtab, off, strategy, diffp)
  * Return the name and value for a symbol.
  */
 void
-db_aout_symbol_values(symtab, sym, namep, valuep)
-	db_symtab_t	*symtab;
-	db_sym_t	sym;
-	char		**namep;
-	db_expr_t	*valuep;
+db_aout_symbol_values(db_symtab_t *symtab, db_sym_t sym, char **namep,
+    db_expr_t *valuep)
 {
 	struct nlist *sp;
 
@@ -260,12 +251,8 @@ db_aout_symbol_values(symtab, sym, namep, valuep)
 
 
 boolean_t
-db_aout_line_at_pc(symtab, cursym, filename, linenum, off)
-	db_symtab_t *	symtab;
-	db_sym_t	cursym;
-	char 		**filename;
-	int 		*linenum;
-	db_expr_t	off;
+db_aout_line_at_pc(db_symtab_t *symtab, db_sym_t cursym, char **filename,
+    int *linenum, db_expr_t off)
 {
 	struct nlist	*sp, *ep;
 	unsigned long	sodiff = -1UL, lndiff = -1UL, ln = 0;
@@ -326,11 +313,8 @@ db_aout_line_at_pc(symtab, cursym, filename, linenum, off)
 }
 
 boolean_t
-db_aout_sym_numargs(symtab, cursym, nargp, argnamep)
-	db_symtab_t *	symtab;
-	db_sym_t	cursym;
-	int		*nargp;
-	char		**argnamep;
+db_aout_sym_numargs(db_symtab_t *symtab, db_sym_t cursym, int *nargp,
+    char **argnamep)
 {
 	struct nlist	*sp, *ep;
 	u_long		addr;
@@ -369,10 +353,7 @@ db_aout_sym_numargs(symtab, cursym, nargp, argnamep)
 }
 
 void
-db_aout_forall(stab, db_forall_func, arg)
-	db_symtab_t		*stab;
-	db_forall_func_t	db_forall_func;
-	void			*arg;
+db_aout_forall(db_symtab_t *stab, db_forall_func_t db_forall_func, void *arg)
 {
 	static char suffix[2];
 	struct nlist *sp, *ep;
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 144b3eddbaa..14f24cbfca4 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.c,v 1.12 2002/05/16 13:01:41 art Exp $	*/
+/*	$OpenBSD: db_break.c,v 1.13 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $	*/
 
 /* 
@@ -53,9 +53,9 @@ db_breakpoint_t		db_free_breakpoints = 0;
 db_breakpoint_t		db_breakpoint_list = 0;
 
 db_breakpoint_t
-db_breakpoint_alloc()
+db_breakpoint_alloc(void)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	if ((bkpt = db_free_breakpoints) != 0) {
 	    db_free_breakpoints = bkpt->link;
@@ -72,20 +72,16 @@ db_breakpoint_alloc()
 }
 
 void
-db_breakpoint_free(bkpt)
-	register db_breakpoint_t	bkpt;
+db_breakpoint_free(db_breakpoint_t bkpt)
 {
 	bkpt->link = db_free_breakpoints;
 	db_free_breakpoints = bkpt;
 }
 
 void
-db_set_breakpoint(map, addr, count)
-	struct vm_map  *map;
-	db_addr_t	addr;
-	int		count;
+db_set_breakpoint(struct vm_map *map, db_addr_t addr, int count)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	if (db_find_breakpoint(map, addr)) {
 	    db_printf("Already set.\n");
@@ -116,12 +112,10 @@ db_set_breakpoint(map, addr, count)
 }
 
 void
-db_delete_breakpoint(map, addr)
-	struct vm_map  *map;
-	db_addr_t	addr;
+db_delete_breakpoint(struct vm_map *map, db_addr_t addr)
 {
-	register db_breakpoint_t	bkpt;
-	register db_breakpoint_t	*prev;
+	db_breakpoint_t	bkpt;
+	db_breakpoint_t	*prev;
 
 	for (prev = &db_breakpoint_list;
 	     (bkpt = *prev) != 0;
@@ -141,11 +135,9 @@ db_delete_breakpoint(map, addr)
 }
 
 db_breakpoint_t
-db_find_breakpoint(map, addr)
-	struct vm_map  *map;
-	db_addr_t	addr;
+db_find_breakpoint(struct vm_map *map, db_addr_t addr)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	for (bkpt = db_breakpoint_list;
 	     bkpt != 0;
@@ -159,8 +151,7 @@ db_find_breakpoint(map, addr)
 }
 
 db_breakpoint_t
-db_find_breakpoint_here(addr)
-	db_addr_t	addr;
+db_find_breakpoint_here(db_addr_t addr)
 {
     return db_find_breakpoint(db_map_addr(addr), addr);
 }
@@ -168,9 +159,9 @@ db_find_breakpoint_here(addr)
 boolean_t	db_breakpoints_inserted = TRUE;
 
 void
-db_set_breakpoints()
+db_set_breakpoints(void)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	if (!db_breakpoints_inserted) {
 
@@ -188,9 +179,9 @@ db_set_breakpoints()
 }
 
 void
-db_clear_breakpoints()
+db_clear_breakpoints(void)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	if (db_breakpoints_inserted) {
 
@@ -210,8 +201,7 @@ db_clear_breakpoints()
  * so the breakpoint does not have to be on the breakpoint list.
  */
 db_breakpoint_t
-db_set_temp_breakpoint(addr)
-	db_addr_t	addr;
+db_set_temp_breakpoint(db_addr_t addr)
 {
 	db_breakpoint_t	bkpt;
 
@@ -240,8 +230,7 @@ db_set_temp_breakpoint(addr)
 }
 
 void
-db_delete_temp_breakpoint(bkpt)
-	db_breakpoint_t	bkpt;
+db_delete_temp_breakpoint(db_breakpoint_t bkpt)
 {
 	db_put_value(bkpt->address, BKPT_SIZE, bkpt->bkpt_inst);
 	db_breakpoint_free(bkpt);
@@ -251,9 +240,9 @@ db_delete_temp_breakpoint(bkpt)
  * List breakpoints.
  */
 void
-db_list_breakpoints()
+db_list_breakpoints(void)
 {
-	register db_breakpoint_t	bkpt;
+	db_breakpoint_t	bkpt;
 
 	if (db_breakpoint_list == 0) {
 	    db_printf("No breakpoints set\n");
@@ -276,11 +265,7 @@ db_list_breakpoints()
 /* Delete breakpoint */
 /*ARGSUSED*/
 void
-db_delete_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_delete_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_delete_breakpoint(db_map_addr(addr), (db_addr_t)addr);
 }
@@ -288,11 +273,7 @@ db_delete_cmd(addr, have_addr, count, modif)
 /* Set breakpoint with skip count */
 /*ARGSUSED*/
 void
-db_breakpoint_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_breakpoint_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	if (count == -1)
 	    count = 1;
@@ -303,11 +284,7 @@ db_breakpoint_cmd(addr, have_addr, count, modif)
 /* list breakpoints */
 /*ARGSUSED*/
 void
-db_listbreak_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_listbreak_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_list_breakpoints();
 }
@@ -319,8 +296,7 @@ db_listbreak_cmd(addr, have_addr, count, modif)
  */
 
 boolean_t
-db_map_equal(map1, map2)
-	struct vm_map *map1, *map2;
+db_map_equal(struct vm_map *map1, struct vm_map *map2)
 {
 	return ((map1 == map2) ||
 		((map1 == NULL) && (map2 == kernel_map)) ||
@@ -328,8 +304,7 @@ db_map_equal(map1, map2)
 }
 
 boolean_t
-db_map_current(map)
-	struct vm_map *map;
+db_map_current(struct vm_map *map)
 {
 #if 0
 	thread_t	thread;
@@ -344,8 +319,7 @@ db_map_current(map)
 }
 
 struct vm_map *
-db_map_addr(addr)
-	vaddr_t addr;
+db_map_addr(vaddr_t addr)
 {
 #if 0
 	thread_t	thread;
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index f650e16d538..16b10cd9a04 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.c,v 1.40 2005/05/10 10:50:16 uwe Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.41 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /* 
@@ -78,7 +78,7 @@ db_addr_t	db_next;	/* next address to be examined
  * Utility routine - discard tokens through end-of-line.
  */
 void
-db_skip_to_eol()
+db_skip_to_eol(void)
 {
 	int	t;
 	do {
@@ -98,18 +98,15 @@ db_skip_to_eol()
  * Search for command prefix.
  */
 int
-db_cmd_search(name, table, cmdp)
-	char			*name;
-	struct db_command	*table;
-	struct db_command	**cmdp;	/* out */
+db_cmd_search(char *name, struct db_command *table, struct db_command **cmdp)
 {
 	struct db_command	*cmd;
 	int			result = CMD_NONE;
 
 	for (cmd = table; cmd->name != 0; cmd++) {
-	    register char *lp;
-	    register char *rp;
-	    register int  c;
+	    char *lp;
+	    char *rp;
+	    int  c;
 
 	    lp = name;
 	    rp = cmd->name;
@@ -140,10 +137,9 @@ db_cmd_search(name, table, cmdp)
 }
 
 void
-db_cmd_list(table)
-	struct db_command *table;
+db_cmd_list(struct db_command *table)
 {
-	register struct db_command *cmd;
+	struct db_command *cmd;
 
 	for (cmd = table; cmd->name != 0; cmd++) {
 	    db_printf("%-12s", cmd->name);
@@ -152,9 +148,7 @@ db_cmd_list(table)
 }
 
 void
-db_command(last_cmdp, cmd_table)
-	struct db_command	**last_cmdp;	/* IN_OUT */
-	struct db_command	*cmd_table;
+db_command(struct db_command **last_cmdp, struct db_command *cmd_table)
 {
 	struct db_command	*cmd;
 	int		t;
@@ -288,11 +282,7 @@ db_command(last_cmdp, cmd_table)
 
 /*ARGSUSED*/
 void
-db_map_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_map_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
         boolean_t full = FALSE;
         
@@ -303,11 +293,7 @@ db_map_print_cmd(addr, have_addr, count, modif)
 }
 /*ARGSUSED*/
 void
-db_malloc_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_malloc_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 #if defined(MALLOC_DEBUG)
 	extern void debug_malloc_printit(int (*)(const char *, ...), vaddr_t);
@@ -323,11 +309,7 @@ db_malloc_print_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_object_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_object_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
         boolean_t full = FALSE;
         
@@ -339,11 +321,7 @@ db_object_print_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_page_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_page_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
         boolean_t full = FALSE;
         
@@ -354,11 +332,7 @@ db_page_print_cmd(addr, have_addr, count, modif)
 }
 
 void
-db_show_panic_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_show_panic_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	if (panicstr)
 		db_printf("%s\n", panicstr);
@@ -368,33 +342,21 @@ db_show_panic_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_extent_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_extent_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	extent_print_all();
 }
 
 /*ARGSUSED*/
 void
-db_pool_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_pool_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	pool_printit((struct pool *)addr, modif, db_printf);
 }
 
 /*ARGSUSED*/
 void
-db_proc_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_proc_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	if (!have_addr)
 		addr = (db_expr_t)curproc;
@@ -404,11 +366,7 @@ db_proc_print_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_uvmexp_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_uvmexp_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	uvmexp_print(db_printf);
 }
@@ -490,8 +448,7 @@ struct db_command db_command_table[] = {
 
 /* this function should be called to install the machine dependent
    commands. It should be called before the debugger is enabled  */
-void db_machine_commands_install(ptr)
-struct db_command *ptr;
+void db_machine_commands_install(struct db_command *ptr)
 {
   db_command_table[0].more = ptr;
   return;
@@ -502,17 +459,13 @@ struct db_command *ptr;
 struct db_command	*db_last_command = 0;
 
 void
-db_help_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int	haddr;
-	db_expr_t count;
-	char	*modif;
+db_help_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	db_cmd_list(db_command_table);
 }
 
 void
-db_command_loop()
+db_command_loop(void)
 {
 	label_t		db_jmpbuf;
 	label_t		*savejmp;
@@ -550,8 +503,7 @@ db_command_loop()
 }
 
 void
-db_error(s)
-	char *s;
+db_error(char *s)
 {
 	if (s)
 		db_printf("%s", s);
@@ -566,11 +518,7 @@ db_error(s)
  */
 /*ARGSUSED*/
 void
-db_fncall(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_fncall(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_expr_t	fn_addr;
 #define	MAXARGS		11
@@ -624,71 +572,43 @@ db_fncall(addr, have_addr, count, modif)
 }
 
 void
-db_boot_sync_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_sync_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_AUTOBOOT | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_boot_crash_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_crash_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_NOSYNC | RB_DUMP | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_boot_dump_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_dump_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_DUMP | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_boot_halt_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_halt_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_NOSYNC | RB_HALT | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_boot_reboot_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_reboot_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_AUTOBOOT | RB_NOSYNC | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_boot_poweroff_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int haddr;
-	db_expr_t count;
-	char *modif;
+db_boot_poweroff_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	boot(RB_NOSYNC | RB_HALT | RB_POWERDOWN | RB_TIMEBAD | RB_USERREQ);
 }
 
 void
-db_dmesg_cmd(addr, haddr, count, modif)
-	db_expr_t addr;
-	int	haddr;
-	db_expr_t count;
-	char	*modif;
+db_dmesg_cmd(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	int i, off;
 	char *p;
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 16ff6d43a21..3370a5b92a6 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_elf.c,v 1.6 2003/06/01 16:19:00 art Exp $	*/
+/*	$OpenBSD: db_elf.c,v 1.7 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $	*/
 
 /*-
@@ -93,15 +93,14 @@ db_symformat_t db_symformat_elf = {
 
 /*
  * Find the symbol table and strings; tell ddb about them.
+ *
+ * symsize:	size of symbol table
+ * symtab:	pointer to start of symbol table
+ * esymtab:	pointer to end of string table, for checking - rounded up to
+ *		    integer boundry
  */
 boolean_t
-db_elf_sym_init(symsize, symtab, esymtab, name)
-	int symsize;		/* size of symbol table */
-	void *symtab;		/* pointer to start of symbol table */
-	void *esymtab;		/* pointer to end of string table,
-				   for checking - rounded up to integer
-				   boundary */
-	const char *name;
+db_elf_sym_init(int symsize, void *symtab, void *esymtab, const char *name)
 {
 	Elf_Ehdr *elf;
 	Elf_Shdr *shp;
@@ -230,8 +229,7 @@ db_elf_sym_init(symsize, symtab, esymtab, name)
  * for the current symbol table.
  */
 static char *
-db_elf_find_strtab(stab)
-	db_symtab_t *stab;
+db_elf_find_strtab(db_symtab_t *stab)
 {
 	Elf_Ehdr *elf = STAB_TO_EHDR(stab);
 	Elf_Shdr *shp = STAB_TO_SHDR(stab, elf);
@@ -253,9 +251,7 @@ db_elf_find_strtab(stab)
  * Lookup the symbol with the given name.
  */
 db_sym_t
-db_elf_lookup(stab, symstr)
-	db_symtab_t *stab;
-	char *symstr;
+db_elf_lookup(db_symtab_t *stab, char *symstr)
 {
 	Elf_Sym *symp, *symtab_start, *symtab_end;
 	char *strtab;
@@ -281,11 +277,8 @@ db_elf_lookup(stab, symstr)
  * provided threshold).
  */
 db_sym_t
-db_elf_search_symbol(symtab, off, strategy, diffp)
-	db_symtab_t *symtab;
-	db_addr_t off;
-	db_strategy_t strategy;
-	db_expr_t *diffp;		/* in/out */
+db_elf_search_symbol(db_symtab_t *symtab, db_addr_t off, db_strategy_t strategy,
+    db_expr_t *diffp)
 {
 	Elf_Sym *rsymp, *symp, *symtab_start, *symtab_end;
 	db_expr_t diff = *diffp;
@@ -347,11 +340,8 @@ db_elf_search_symbol(symtab, off, strategy, diffp)
  * Return the name and value for a symbol.
  */
 void
-db_elf_symbol_values(symtab, sym, namep, valuep)
-	db_symtab_t *symtab;
-	db_sym_t sym;
-	char **namep;
-	db_expr_t *valuep;
+db_elf_symbol_values(db_symtab_t *symtab, db_sym_t sym, char **namep,
+    db_expr_t *valuep)
 {
 	Elf_Sym *symp = (Elf_Sym *)sym;
 	char *strtab;
@@ -373,12 +363,8 @@ db_elf_symbol_values(symtab, sym, namep, valuep)
  * if we can find the appropriate debugging symbol.
  */
 boolean_t
-db_elf_line_at_pc(symtab, cursym, filename, linenum, off)
-	db_symtab_t *symtab;
-	db_sym_t cursym;
-	char **filename;
-	int *linenum;
-	db_expr_t off;
+db_elf_line_at_pc(db_symtab_t *symtab, db_sym_t cursym, char **filename,
+    int *linenum, db_expr_t off)
 {
 
 	/*
@@ -392,11 +378,8 @@ db_elf_line_at_pc(symtab, cursym, filename, linenum, off)
  * names if we can find the appropriate debugging symbol.
  */
 boolean_t
-db_elf_sym_numargs(symtab, cursym, nargp, argnamep)
-	db_symtab_t *symtab;
-	db_sym_t cursym;
-	int *nargp;
-	char **argnamep;
+db_elf_sym_numargs(db_symtab_t *symtab, db_sym_t cursym, int *nargp,
+    char **argnamep)
 {
 
 	/*
@@ -406,10 +389,7 @@ db_elf_sym_numargs(symtab, cursym, nargp, argnamep)
 }
 
 void
-db_elf_forall(stab, db_forall_func, arg)
-	db_symtab_t *stab;
-	db_forall_func_t db_forall_func;
-	void *arg;
+db_elf_forall(db_symtab_t *stab, db_forall_func_t db_forall_func, void *arg)
 {
 	char *strtab;
 	static char suffix[2];
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index c8e4fc03c0a..eab8e64adbb 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_examine.c,v 1.11 2004/04/25 03:21:50 itojun Exp $	*/
+/*	$OpenBSD: db_examine.c,v 1.12 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_examine.c,v 1.11 1996/03/30 22:30:07 christos Exp $	*/
 
 /*
@@ -57,11 +57,7 @@ char	db_examine_format[TOK_STRING_SIZE] = "x";
  */
 /*ARGSUSED*/
 void
-db_examine_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_examine_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	if (modif[0] != '\0')
 		db_strlcpy(db_examine_format, modif, sizeof(db_examine_format));
@@ -73,10 +69,7 @@ db_examine_cmd(addr, have_addr, count, modif)
 }
 
 void
-db_examine(addr, fmt, count)
-	db_addr_t	addr;
-	char *		fmt;	/* format string */
-	int		count;	/* repeat count */
+db_examine(db_addr_t addr, char *fmt, int count)
 {
 	int		c;
 	db_expr_t	value;
@@ -188,11 +181,7 @@ char	db_print_format = 'x';
 
 /*ARGSUSED*/
 void
-db_print_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_expr_t	value;
 
@@ -233,8 +222,7 @@ db_print_cmd(addr, have_addr, count, modif)
 }
 
 void
-db_print_loc_and_inst(loc)
-	db_addr_t	loc;
+db_print_loc_and_inst(db_addr_t loc)
 {
 	db_printsym(loc, DB_STGY_PROC, db_printf);
 	db_printf(":\t");
@@ -274,11 +262,7 @@ db_strlcpy(char *dst, const char *src, size_t siz)
  */
 /*ARGSUSED*/
 void
-db_search_cmd(daddr, have_addr, dcount, modif)
-	db_expr_t	daddr;
-	int		have_addr;
-	db_expr_t	dcount;
-	char *		modif;
+db_search_cmd(db_expr_t daddr, int have_addr, db_expr_t dcount, char *modif)
 {
 	int		t;
 	db_addr_t	addr;
@@ -343,13 +327,8 @@ db_search_cmd(daddr, have_addr, dcount, modif)
 }
 
 void
-db_search(addr, size, value, mask, count)
-	register
-	db_addr_t	addr;
-	int		size;
-	db_expr_t	value;
-	db_expr_t	mask;
-	db_expr_t	count;
+db_search(db_addr_t addr, int size, db_expr_t value, db_expr_t mask,
+    db_expr_t count)
 {
 	/* Negative counts means forever.  */
 	while (count < 0 || count-- != 0) {
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index f1fda9facb4..9549ea11623 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_expr.c,v 1.7 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_expr.c,v 1.8 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_expr.c,v 1.5 1996/02/05 01:56:58 christos Exp $	*/
 
 /* 
@@ -45,8 +45,7 @@
 #include <ddb/db_variables.h>
 
 boolean_t
-db_term(valuep)
-	db_expr_t *valuep;
+db_term(db_expr_t *valuep)
 {
 	int	t;
 
@@ -100,8 +99,7 @@ db_term(valuep)
 }
 
 boolean_t
-db_unary(valuep)
-	db_expr_t *valuep;
+db_unary(db_expr_t *valuep)
 {
 	int	t;
 
@@ -128,8 +126,7 @@ db_unary(valuep)
 }
 
 boolean_t
-db_mult_expr(valuep)
-	db_expr_t *valuep;
+db_mult_expr(db_expr_t *valuep)
 {
 	db_expr_t	lhs, rhs;
 	int		t;
@@ -165,8 +162,7 @@ db_mult_expr(valuep)
 }
 
 boolean_t
-db_add_expr(valuep)
-	db_expr_t *valuep;
+db_add_expr(db_expr_t *valuep)
 {
 	db_expr_t	lhs, rhs;
 	int		t;
@@ -192,8 +188,7 @@ db_add_expr(valuep)
 }
 
 boolean_t
-db_shift_expr(valuep)
-	db_expr_t *valuep;
+db_shift_expr(db_expr_t *valuep)
 {
 	db_expr_t	lhs, rhs;
 	int		t;
@@ -225,8 +220,7 @@ db_shift_expr(valuep)
 }
 
 int
-db_expression(valuep)
-	db_expr_t *valuep;
+db_expression(db_expr_t *valuep)
 {
 	return (db_shift_expr(valuep));
 }
diff --git a/sys/ddb/db_hangman.c b/sys/ddb/db_hangman.c
index c72564f5344..9af9f4bd16f 100644
--- a/sys/ddb/db_hangman.c
+++ b/sys/ddb/db_hangman.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_hangman.c,v 1.25 2005/01/08 19:36:30 mickey Exp $	*/
+/*	$OpenBSD: db_hangman.c,v 1.26 2006/03/13 06:23:20 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Theo de Raadt, Michael Shalayeff
@@ -87,13 +87,8 @@ static void db_hang_forall(db_symtab_t *, db_sym_t, char *, char *, int,
 			void *);
 
 static void
-db_hang_forall(stab, sym, name, suff, pre, varg)
-	db_symtab_t *stab;
-	db_sym_t sym;
-	char *name;
-	char *suff;
-	int pre;
-	void *varg;
+db_hang_forall(db_symtab_t *stab, db_sym_t sym, char *name, char *suff, int pre,
+    void *varg)
 {
 	struct db_hang_forall_arg *arg = (struct db_hang_forall_arg *)varg;
 
@@ -143,12 +138,9 @@ db_randomsym(size_t *lenp)
 }
 
 void
-db_hang(tries, word, sabc)
-	int	tries;
-	register char	*word;
-	register struct _abc *sabc;
+db_hang(int tries, char *word, struct _abc *sabc)
 {
-	register const char	*p;
+	const char	*p;
 	int i;
 	int c;
 #ifdef ABC_BITMASK
@@ -185,11 +177,7 @@ db_hang(tries, word, sabc)
 }
 
 void
-db_hangman(addr, haddr, count, modif)
-	db_expr_t addr;
-	int	haddr;
-	db_expr_t count;
-	char	*modif;
+db_hangman(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 {
 	char	*word;
 	size_t	tries;
@@ -215,15 +203,15 @@ db_hangman(addr, haddr, count, modif)
 		}
 
 		{
-			register int c;
+			int c;
 
 			db_hang(tries, word, sabc);
 			c = cngetc();
 			c = TOLOWER(c);
 
 			if (ISLOWALPHA(c) && ABC_ISCLR(c)) {
-				register char	*p;
-				register size_t	n;
+				char	*p;
+				size_t	n;
 
 					/* strchr(word,c) */
 				for (n = 0, p = word; *p ; p++)
@@ -244,7 +232,7 @@ db_hangman(addr, haddr, count, modif)
 			continue;
 
 		if (!tries && skill > 2) {
-			register char	*p = word;
+			char	*p = word;
 			for (; *p; p++)
 				if (ISALPHA(*p))
 					ABC_SETRIGHT(TOLOWER(*p));
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 60ad56bcb1d..af3a12412e6 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_input.c,v 1.9 2002/03/14 01:26:51 millert Exp $	*/
+/*	$OpenBSD: db_input.c,v 1.10 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $	*/
 
 /* 
@@ -75,18 +75,14 @@ char *  db_history_prev = (char *) 0;	/* start of previous line */
 static int cnmaygetc(void);
 
 void
-db_putstring(s, count)
-	char	*s;
-	int	count;
+db_putstring(char *s, int count)
 {
 	while (--count >= 0)
 	    cnputc(*s++);
 }
 
 void
-db_putnchars(c, count)
-	int	c;
-	int	count;
+db_putnchars(int c, int count)
 {
 	while (--count >= 0)
 	    cnputc(c);
@@ -98,11 +94,9 @@ db_putnchars(c, count)
 #define	DEL_FWD		0
 #define	DEL_BWD		1
 void
-db_delete(n, bwd)
-	int	n;
-	int	bwd;
+db_delete(int n, int bwd)
 {
-	register char *p;
+	char *p;
 
 	if (bwd) {
 	    db_lc -= n;
@@ -144,8 +138,7 @@ db_delete_line(void)
 		
 /* returns TRUE at end-of-line */
 int
-db_inputchar(c)
-	int	c;
+db_inputchar(int c)
 {
 	switch (c) {
 	    case CTRL('b'):
@@ -226,7 +219,7 @@ db_inputchar(c)
 			INC_DB_CURR();
 			db_le = db_lc = db_lbuf_start;
 		} else {
-			register char *p;
+			char *p;
 			INC_DB_CURR();
 			for (p = db_history_curr, db_le = db_lbuf_start;*p; ) {
 				*db_le++ = *p++;
@@ -247,7 +240,7 @@ db_inputchar(c)
 			INC_DB_CURR();
 			db_delete_line();
 			if (db_history_curr != db_history_last) {
-				register char *p;
+				char *p;
 				for (p = db_history_curr,
 				     db_le = db_lbuf_start; *p;) {
 					*db_le++ = *p++;
@@ -276,7 +269,7 @@ db_inputchar(c)
 		 * save it.
 		 */
 		if (db_history_curr == db_history_prev) {
-			register char *pp, *pc;
+			char *pp, *pc;
 
 			/*
 			 * Is it the same?
@@ -299,7 +292,7 @@ db_inputchar(c)
 			}
 		}
 		if (db_le != db_lbuf_start) {
-			register char *p;
+			char *p;
 			db_history_prev = db_history_last;
 			for (p = db_lbuf_start; p != db_le; p++) {
 				*db_history_last++ = *p;
@@ -318,7 +311,7 @@ db_inputchar(c)
 		    cnputc('\007');
 		}
 		else if (c >= ' ' && c <= '~') {
-		    register char *p;
+		    char *p;
 
 		    for (p = db_le; p > db_lc; p--)
 			*p = *(p-1);
@@ -334,9 +327,7 @@ db_inputchar(c)
 }
 
 int
-db_readline(lstart, lsize)
-	char *	lstart;
-	int	lsize;
+db_readline(char *lstart, int lsize)
 {
 	db_force_whitespace();	/* synch output position */
 
@@ -357,7 +348,7 @@ db_readline(lstart, lsize)
 void
 db_check_interrupt(void)
 {
-	register int	c;
+	int	c;
 
 	c = cnmaygetc();
 	switch (c) {
@@ -384,7 +375,7 @@ db_check_interrupt(void)
 }
 
 static int
-cnmaygetc ()
+cnmaygetc(void)
 {
 	return (-1);
 }
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index ae8243de188..1bc9352f5f2 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_lex.c,v 1.8 2002/07/01 21:56:55 miod Exp $	*/
+/*	$OpenBSD: db_lex.c,v 1.9 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_lex.c,v 1.8 1996/02/05 01:57:05 christos Exp $	*/
 
 /* 
@@ -54,7 +54,7 @@ db_expr_t db_tok_number;
 char	db_tok_string[TOK_STRING_SIZE];
 
 int
-db_read_line()
+db_read_line(void)
 {
 	int	i;
 
@@ -67,7 +67,7 @@ db_read_line()
 }
 
 void
-db_flush_line()
+db_flush_line(void)
 {
 	db_lp = db_line;
 	db_endlp = db_line;
@@ -76,7 +76,7 @@ db_flush_line()
 int	db_look_char = 0;
 
 int
-db_read_char()
+db_read_char(void)
 {
 	int	c;
 
@@ -92,8 +92,7 @@ db_read_char()
 }
 
 void
-db_unread_char(c)
-	int c;
+db_unread_char(int c)
 {
 	db_look_char = c;
 }
@@ -101,14 +100,13 @@ db_unread_char(c)
 int	db_look_token = 0;
 
 void
-db_unread_token(t)
-	int	t;
+db_unread_token(int t)
 {
 	db_look_token = t;
 }
 
 int
-db_read_token()
+db_read_token(void)
 {
 	int	t;
 
@@ -122,7 +120,7 @@ db_read_token()
 }
 
 void
-db_flush_lex()
+db_flush_lex(void)
 {
 	db_flush_line();
 	db_look_char = 0;
@@ -130,7 +128,7 @@ db_flush_lex()
 }
 
 int
-db_lex()
+db_lex(void)
 {
 	int	c;
 
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 918b7fe1316..6cb92fadc21 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_output.c,v 1.23 2006/03/09 23:06:20 miod Exp $	*/
+/*	$OpenBSD: db_output.c,v 1.24 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $	*/
 
 /* 
@@ -88,9 +88,9 @@ static void db_more(void);
  * Force pending whitespace.
  */
 void
-db_force_whitespace()
+db_force_whitespace(void)
 {
-	register int last_print, next_tab;
+	int last_print, next_tab;
 
 	last_print = db_last_non_space;
 	while (last_print < db_output_position) {
@@ -111,9 +111,9 @@ db_force_whitespace()
 
 #ifdef DDB
 static void
-db_more()
+db_more(void)
 {
-	register  char *p;
+	char *p;
 	int quit_output = 0;
 
 	for (p = "--db_more--"; *p; p++)
@@ -145,8 +145,7 @@ db_more()
  * Output character.  Buffer whitespace.
  */
 void
-db_putchar(c)
-	int	c;		/* character to output */
+db_putchar(int c)
 {
 #ifdef DDB
 	if (db_max_line >= DB_MIN_MAX_LINE && db_output_line >= db_max_line-1)
@@ -200,7 +199,7 @@ db_putchar(c)
  * Return output position
  */
 int
-db_print_position()
+db_print_position(void)
 {
 	return (db_output_position);
 }
@@ -209,8 +208,7 @@ db_print_position()
  * End line if too long.
  */
 void
-db_end_line(space)
-	int space;
+db_end_line(int space)
 {
 	if (db_output_position >= db_max_width - space)
 	    db_printf("\n");
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index d5bde59028e..9c1f1543d76 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_print.c,v 1.9 2003/07/08 16:57:20 mickey Exp $	*/
+/*	$OpenBSD: db_print.c,v 1.10 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_print.c,v 1.5 1996/02/05 01:57:11 christos Exp $	*/
 
 /* 
@@ -48,13 +48,9 @@
 
 /*ARGSUSED*/
 void
-db_show_regs(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_show_regs(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
-	register struct db_variable *regp;
+	struct db_variable *regp;
 	db_expr_t	value, offset;
 	char *		name;
 
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index b4739612b5a..e247f4c411b 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_run.c,v 1.18 2005/09/06 19:49:21 miod Exp $	*/
+/*	$OpenBSD: db_run.c,v 1.19 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $	*/
 
 /* 
@@ -75,9 +75,7 @@ int		db_loop_count;
 int		db_call_depth;
 
 boolean_t
-db_stop_at_pc(regs, is_breakpoint)
-	db_regs_t	*regs;
-	boolean_t	*is_breakpoint;
+db_stop_at_pc(db_regs_t *regs, boolean_t *is_breakpoint)
 {
 	db_addr_t	pc, old_pc;
 	db_breakpoint_t	bkpt;
@@ -154,7 +152,7 @@ db_stop_at_pc(regs, is_breakpoint)
 		(!inst_return(ins) || --db_call_depth != 0)) {
 		if (db_sstep_print) {
 		    if (inst_call(ins) || inst_return(ins)) {
-			register int i;
+			int i;
 
 			db_printf("[after %6d]     ", db_inst_count);
 			for (i = db_call_depth; --i > 0; )
@@ -183,9 +181,7 @@ db_stop_at_pc(regs, is_breakpoint)
 }
 
 void
-db_restart_at_pc(regs, watchpt)
-	db_regs_t *regs;
-	boolean_t watchpt;
+db_restart_at_pc(db_regs_t *regs, boolean_t watchpt)
 {
 	db_addr_t pc = PC_REGS(regs);
 
@@ -230,8 +226,7 @@ db_restart_at_pc(regs, watchpt)
 }
 
 void
-db_single_step(regs)
-	db_regs_t *regs;
+db_single_step(db_regs_t *regs)
 {
 	if (db_run_mode == STEP_CONTINUE) {
 	    db_run_mode = STEP_INVISIBLE;
@@ -244,11 +239,7 @@ extern int	db_cmd_loop_done;
 /* single-step */
 /*ARGSUSED*/
 void
-db_single_step_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_single_step_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	boolean_t	print = FALSE;
 
@@ -271,11 +262,8 @@ db_single_step_cmd(addr, have_addr, count, modif)
 /* trace and print until call/return */
 /*ARGSUSED*/
 void
-db_trace_until_call_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_trace_until_call_cmd(db_expr_t addr, int have_addr, db_expr_t count,
+    char *modif)
 {
 	boolean_t	print = FALSE;
 
@@ -293,11 +281,8 @@ db_trace_until_call_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_trace_until_matching_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_trace_until_matching_cmd(db_expr_t addr, int have_addr, db_expr_t count,
+    char *modif)
 {
 	boolean_t	print = FALSE;
 
@@ -317,11 +302,7 @@ db_trace_until_matching_cmd(addr, have_addr, count, modif)
 /* continue */
 /*ARGSUSED*/
 void
-db_continue_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_continue_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	if (modif[0] == 'c')
 	    db_run_mode = STEP_COUNT;
@@ -368,8 +349,7 @@ db_continue_cmd(addr, have_addr, count, modif)
  */			
 
 void
-db_set_single_step(regs)
-	register db_regs_t *regs;
+db_set_single_step(db_regs_t *regs)
 {
 	db_addr_t pc = PC_REGS(regs);
 #ifndef SOFTWARE_SSTEP_EMUL
@@ -397,8 +377,7 @@ db_set_single_step(regs)
 }
 
 void
-db_clear_single_step(regs)
-	db_regs_t *regs;
+db_clear_single_step(db_regs_t *regs)
 {
 	if (db_taken_bkpt != 0) {
 	    db_delete_temp_breakpoint(db_taken_bkpt);
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index c402704c5ae..a7bc8153f1f 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_sym.c,v 1.31 2005/09/29 05:57:14 deraadt Exp $	*/
+/*	$OpenBSD: db_sym.c,v 1.32 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_sym.c,v 1.24 2000/08/11 22:50:47 tv Exp $	*/
 
 /* 
@@ -91,9 +91,7 @@ int		X_db_sym_numargs(db_symtab_t *, db_sym_t, int *,
  */
 #if 0
 void
-ddb_init(symsize, vss, vse)
-	int symsize;
-	void *vss, *vse;
+ddb_init(int symsize, void *vss, void *vse)
 {
 	const db_symformat_t **symf;
 	const char *name = "bsd";
@@ -124,7 +122,7 @@ ddb_init(symsize, vss, vse)
 }
 #else
 void
-ddb_init()
+ddb_init(void)
 {
 	const db_symformat_t **symf;
 	const char *name = "bsd";
@@ -167,11 +165,7 @@ ddb_init()
  * Add symbol table, with given name, to list of symbol tables.
  */
 int
-db_add_symbol_table(start, end, name, ref)
-	char *start;
-	char *end;
-	const char *name;
-	char *ref;
+db_add_symbol_table(char *start, char *end, const char *name, char *ref)
 {
 	int slot;
 
@@ -196,8 +190,7 @@ db_add_symbol_table(start, end, name, ref)
  * Delete a symbol table. Caller is responsible for freeing storage.
  */
 void
-db_del_symbol_table(name)
-	char *name;
+db_del_symbol_table(char *name)
 {
 	int slot;
 
@@ -224,9 +217,7 @@ db_del_symbol_table(name)
  *  overwritten by each call... but in practice this seems okay.
  */
 char *
-db_qualify(sym, symtabname)
-	db_sym_t	sym;
-	const char	*symtabname;
+db_qualify(db_sym_t sym, const char *symtabname)
 {
 	char		*symname;
 	static char     tmp[256];
@@ -244,10 +235,7 @@ db_qualify(sym, symtabname)
 
 
 boolean_t
-db_eqname(src, dst, c)
-	char *src;
-	char *dst;
-	int c;
+db_eqname(char *src, char *dst, int c)
 {
 	if (!strcmp(src, dst))
 	    return (TRUE);
@@ -257,9 +245,7 @@ db_eqname(src, dst, c)
 }
 
 boolean_t
-db_value_of_name(name, valuep)
-	char		*name;
-	db_expr_t	*valuep;
+db_value_of_name(char *name, db_expr_t *valuep)
 {
 	db_sym_t	sym;
 
@@ -278,8 +264,7 @@ db_value_of_name(name, valuep)
  * otherwise, all symbol tables will be searched.
  */
 db_sym_t
-db_lookup(symstr)
-	char *symstr;
+db_lookup(char *symstr)
 {
 	db_sym_t sp;
 	int i;
@@ -336,13 +321,8 @@ struct db_sift_args {
  * criteria.
  */
 static void
-db_sift(stab, sym, name, suffix, prefix, arg)
-	db_symtab_t	*stab;
-	db_sym_t	sym;
-	char		*name;
-	char		*suffix;
-	int		prefix;
-	void		*arg;
+db_sift(db_symtab_t *stab, db_sym_t sym, char *name, char *suffix, int prefix,
+    void *arg)
 {
 	char c, sc;
 	char *find, *p;
@@ -381,9 +361,7 @@ db_sift(stab, sym, name, suffix, prefix, arg)
  * "mode" is how-to-display, set from modifiers.
  */
 void
-db_sifting(symstr, mode)
-	char	*symstr;
-	int	mode;
+db_sifting(char *symstr, int mode)
 {
 	char *cp;
 	int i;
@@ -438,8 +416,7 @@ db_sifting(symstr, mode)
 boolean_t db_qualify_ambiguous_names = FALSE;
 
 boolean_t
-db_symbol_is_ambiguous(sym)
-	db_sym_t	sym;
+db_symbol_is_ambiguous(db_sym_t sym)
 {
 	char		*sym_name;
 	int	i;
@@ -465,10 +442,7 @@ db_symbol_is_ambiguous(sym)
  * and the difference between val and the symbol found.
  */
 db_sym_t
-db_search_symbol( val, strategy, offp)
-	db_addr_t		val;
-	db_strategy_t		strategy;
-	db_expr_t		*offp;
+db_search_symbol(db_addr_t val, db_strategy_t strategy, db_expr_t *offp)
 {
 	unsigned int	diff;
 	db_expr_t	newdiff;
@@ -495,10 +469,7 @@ db_search_symbol( val, strategy, offp)
  * Return name and value of a symbol
  */
 void
-db_symbol_values(sym, namep, valuep)
-	db_sym_t	sym;
-	char		**namep;
-	db_expr_t	*valuep;
+db_symbol_values(db_sym_t sym, char **namep, db_expr_t *valuep)
 {
 	db_expr_t	value;
 
@@ -573,29 +544,19 @@ db_printsym(db_expr_t off, db_strategy_t strategy,
 
 
 boolean_t
-db_line_at_pc(sym, filename, linenum, pc)
-	db_sym_t	sym;
-	char		**filename;
-	int		*linenum;
-	db_expr_t	pc;
+db_line_at_pc(db_sym_t sym, char **filename, int *linenum, db_expr_t pc)
 {
 	return X_db_line_at_pc(db_last_symtab, sym, filename, linenum, pc);
 }
 
 int
-db_sym_numargs(sym, nargp, argnames)
-	db_sym_t	sym;
-	int		*nargp;
-	char		**argnames;
+db_sym_numargs(db_sym_t sym, int *nargp, char **argnames)
 {
 	return X_db_sym_numargs(db_last_symtab, sym, nargp, argnames);
 }
 
 boolean_t
-X_db_sym_init(symsize, vss, vse, name)
-	int symsize;
-	void *vss, *vse;
-	const char *name;
+X_db_sym_init(int symsize, void *vss, void *vse, const char *name)
 {
 
 	if (db_symformat != NULL)
@@ -604,9 +565,7 @@ X_db_sym_init(symsize, vss, vse, name)
 }
 
 db_sym_t
-X_db_lookup(stab, symstr)
-	db_symtab_t *stab;
-	char *symstr;
+X_db_lookup(db_symtab_t *stab, char *symstr)
 {
 
 	if (db_symformat != NULL)
@@ -615,11 +574,8 @@ X_db_lookup(stab, symstr)
 }
 
 db_sym_t
-X_db_search_symbol(stab, off, strategy, diffp)
-	db_symtab_t *stab;
-	db_addr_t off;
-	db_strategy_t strategy;
-	db_expr_t *diffp;
+X_db_search_symbol(db_symtab_t *stab, db_addr_t off, db_strategy_t strategy,
+    db_expr_t *diffp)
 {
 
 	if (db_symformat != NULL)
@@ -629,11 +585,8 @@ X_db_search_symbol(stab, off, strategy, diffp)
 }
 
 void
-X_db_symbol_values(stab, sym, namep, valuep)
-	db_symtab_t *stab;
-	db_sym_t sym;
-	char **namep;
-	db_expr_t *valuep;
+X_db_symbol_values(db_symtab_t *stab, db_sym_t sym, char **namep,
+    db_expr_t *valuep)
 {
 
 	if (db_symformat != NULL) 
@@ -641,12 +594,8 @@ X_db_symbol_values(stab, sym, namep, valuep)
 }
 
 boolean_t
-X_db_line_at_pc(stab, cursym, filename, linenum, off)
-	db_symtab_t *stab;
-	db_sym_t cursym;
-	char **filename;
-	int *linenum;
-	db_expr_t off;
+X_db_line_at_pc(db_symtab_t *stab, db_sym_t cursym, char **filename,
+    int *linenum, db_expr_t off)
 {
 
 	if (db_symformat != NULL)
@@ -656,11 +605,8 @@ X_db_line_at_pc(stab, cursym, filename, linenum, off)
 }
 
 boolean_t
-X_db_sym_numargs(stab, cursym, nargp, argnamep)
-	db_symtab_t *stab;
-	db_sym_t cursym;
-	int *nargp;
-	char **argnamep;
+X_db_sym_numargs(db_symtab_t *stab, db_sym_t cursym, int *nargp,
+    char **argnamep)
 {
 
 	if (db_symformat != NULL)
@@ -670,10 +616,7 @@ X_db_sym_numargs(stab, cursym, nargp, argnamep)
 }
 
 void
-X_db_forall(stab, db_forall_func, arg)
-	db_symtab_t	*stab;
-	db_forall_func_t db_forall_func;
-	void *arg;
+X_db_forall(db_symtab_t *stab, db_forall_func_t db_forall_func, void *arg)
 {
 	if (db_symformat != NULL)
 		(*db_symformat->sym_forall)(stab, db_forall_func, arg);
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index c0f9367fe24..a3c024af6fe 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trap.c,v 1.10 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_trap.c,v 1.11 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_trap.c,v 1.9 1996/02/05 01:57:18 christos Exp $	*/
 
 /* 
@@ -49,8 +49,7 @@
 #include <ddb/db_extern.h>
 
 void
-db_trap(type, code)
-	int	type, code;
+db_trap(int type, int code)
 {
 	boolean_t	bkpt;
 	boolean_t	watchpt;
diff --git a/sys/ddb/db_usrreq.c b/sys/ddb/db_usrreq.c
index a353689b930..5547c77dec1 100644
--- a/sys/ddb/db_usrreq.c
+++ b/sys/ddb/db_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_usrreq.c,v 1.9 2004/02/06 22:19:21 tedu Exp $	*/
+/*	$OpenBSD: db_usrreq.c,v 1.10 2006/03/13 06:23:20 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff.  All rights reserved.
@@ -36,14 +36,8 @@
 int	db_log = 1;
 
 int
-ddb_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-	int	*name;
-	u_int	namelen;
-	void	*oldp;
-	size_t	*oldlenp;
-	void	*newp;
-	size_t	newlen;
-	struct proc *p;
+ddb_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
+    size_t newlen, struct proc *p)
 {
 	int error, ctlval;
 
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 7d47b65c400..95399e25aed 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_variables.c,v 1.9 2002/03/14 01:26:51 millert Exp $	*/
+/*	$OpenBSD: db_variables.c,v 1.10 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $	*/
 
 /* 
@@ -51,8 +51,7 @@ struct db_variable db_vars[] = {
 struct db_variable *db_evars = db_vars + sizeof(db_vars)/sizeof(db_vars[0]);
 
 int
-db_find_variable(varp)
-	struct db_variable	**varp;
+db_find_variable(struct db_variable **varp)
 {
 	int	t;
 	struct db_variable *vp;
@@ -78,8 +77,7 @@ db_find_variable(varp)
 }
 
 int
-db_get_variable(valuep)
-	db_expr_t	*valuep;
+db_get_variable(db_expr_t *valuep)
 {
 	struct db_variable *vp;
 
@@ -92,8 +90,7 @@ db_get_variable(valuep)
 }
 
 int
-db_set_variable(value)
-	db_expr_t	value;
+db_set_variable(db_expr_t value)
 {
 	struct db_variable *vp;
 
@@ -107,9 +104,7 @@ db_set_variable(value)
 
 
 void
-db_read_variable(vp, valuep)
-	struct db_variable *vp;
-	db_expr_t	*valuep;
+db_read_variable(struct db_variable *vp, db_expr_t *valuep)
 {
 	int	(*func)(struct db_variable *, db_expr_t *, int) = vp->fcn;
 
@@ -120,9 +115,7 @@ db_read_variable(vp, valuep)
 }
 
 void
-db_write_variable(vp, valuep)
-	struct db_variable *vp;
-	db_expr_t	*valuep;
+db_write_variable(struct db_variable *vp, db_expr_t *valuep)
 {
 	int	(*func)(struct db_variable *, db_expr_t *, int) = vp->fcn;
 
@@ -134,11 +127,7 @@ db_write_variable(vp, valuep)
 
 /*ARGSUSED*/
 void
-db_set_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_set_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_expr_t	value;
 	struct db_variable *vp;
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 8f720b24561..102b9d3ba1a 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.c,v 1.8 2002/02/27 17:37:05 pefo Exp $ */
+/*	$OpenBSD: db_watch.c,v 1.9 2006/03/13 06:23:20 jsg Exp $ */
 /*	$NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $	*/
 
 /* 
@@ -58,9 +58,9 @@ db_watchpoint_t		db_free_watchpoints = 0;
 db_watchpoint_t		db_watchpoint_list = 0;
 
 db_watchpoint_t
-db_watchpoint_alloc()
+db_watchpoint_alloc(void)
 {
-	register db_watchpoint_t	watch;
+	db_watchpoint_t	watch;
 
 	if ((watch = db_free_watchpoints) != 0) {
 	    db_free_watchpoints = watch->link;
@@ -77,20 +77,16 @@ db_watchpoint_alloc()
 }
 
 void
-db_watchpoint_free(watch)
-	register db_watchpoint_t	watch;
+db_watchpoint_free(db_watchpoint_t watch)
 {
 	watch->link = db_free_watchpoints;
 	db_free_watchpoints = watch;
 }
 
 void
-db_set_watchpoint(map, addr, size)
-	struct vm_map	*map;
-	db_addr_t	addr;
-	vsize_t 	size;
+db_set_watchpoint(struct vm_map *map, db_addr_t addr, vsize_t size)
 {
-	register db_watchpoint_t	watch;
+	db_watchpoint_t	watch;
 
 	if (map == NULL) {
 	    db_printf("No map.\n");
@@ -128,12 +124,10 @@ db_set_watchpoint(map, addr, size)
 }
 
 void
-db_delete_watchpoint(map, addr)
-	struct vm_map	*map;
-	db_addr_t	addr;
+db_delete_watchpoint(struct vm_map *map, db_addr_t addr)
 {
-	register db_watchpoint_t	watch;
-	register db_watchpoint_t	*prev;
+	db_watchpoint_t	watch;
+	db_watchpoint_t	*prev;
 
 	for (prev = &db_watchpoint_list;
 	     (watch = *prev) != 0;
@@ -150,9 +144,9 @@ db_delete_watchpoint(map, addr)
 }
 
 void
-db_list_watchpoints()
+db_list_watchpoints(void)
 {
-	register db_watchpoint_t	watch;
+	db_watchpoint_t	watch;
 
 	if (db_watchpoint_list == 0) {
 	    db_printf("No watchpoints set\n");
@@ -172,11 +166,7 @@ db_list_watchpoints()
 /* Delete watchpoint */
 /*ARGSUSED*/
 void
-db_deletewatch_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_deletewatch_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_delete_watchpoint(db_map_addr(addr), addr);
 }
@@ -184,11 +174,7 @@ db_deletewatch_cmd(addr, have_addr, count, modif)
 /* Set watchpoint */
 /*ARGSUSED*/
 void
-db_watchpoint_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_watchpoint_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	vsize_t 	size;
 	db_expr_t	value;
@@ -205,19 +191,15 @@ db_watchpoint_cmd(addr, have_addr, count, modif)
 /* list watchpoints */
 /*ARGSUSED*/
 void
-db_listwatch_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_listwatch_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	db_list_watchpoints();
 }
 
 void
-db_set_watchpoints()
+db_set_watchpoints(void)
 {
-	register db_watchpoint_t	watch;
+	db_watchpoint_t	watch;
 
 	if (!db_watchpoints_inserted && db_watchpoint_list != NULL) {
 	    for (watch = db_watchpoint_list;
@@ -233,18 +215,15 @@ db_set_watchpoints()
 }
 
 void
-db_clear_watchpoints()
+db_clear_watchpoints(void)
 {
 	db_watchpoints_inserted = FALSE;
 }
 
 boolean_t
-db_find_watchpoint(map, addr, regs)
-	struct vm_map	*map;
-	db_addr_t	addr;
-	db_regs_t	*regs;
+db_find_watchpoint(struct vm_map *map, db_addr_t addr, db_regs_t *regs)
 {
-	register db_watchpoint_t watch;
+	db_watchpoint_t watch;
 	db_watchpoint_t found = 0;
 
 	for (watch = db_watchpoint_list;
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 5c592e5d64f..ef0a9797d53 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_write_cmd.c,v 1.7 2002/05/16 13:01:41 art Exp $	*/
+/*	$OpenBSD: db_write_cmd.c,v 1.8 2006/03/13 06:23:20 jsg Exp $	*/
 /*	$NetBSD: db_write_cmd.c,v 1.6 1996/02/05 01:57:25 christos Exp $	*/
 
 /* 
@@ -49,18 +49,13 @@
  */
 /*ARGSUSED*/
 void
-db_write_cmd(address, have_addr, count, modif)
-	db_expr_t	address;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	char *		modif;
+db_write_cmd(db_expr_t	address, boolean_t have_addr, db_expr_t count,
+    char *modif)
 {
-	register
 	db_addr_t	addr;
-	register
 	db_expr_t	old_value;
 	db_expr_t	new_value;
-	register int	size;
+	int		size;
 	boolean_t	wrote_one = FALSE;
 
 	addr = (db_addr_t) address;