Subject: Re: CVS commit: src/sys (bool changes)
To: None <mason@primenet.com.au>
From: Jason Thorpe <thorpej@shagadelic.org>
List: source-changes
Date: 02/21/2007 20:37:28
On Feb 21, 2007, at 6:37 PM, Geoff Wing wrote:
> Jason R Thorpe <thorpej@netbsd.org> typed:
> : src/sys/ddb: db_access.c db_access.h db_aout.c db_break.c
> db_break.h
> : db_command.c db_elf.c db_expr.c db_extern.h db_interface.h
> db_run.c
> : db_run.h db_sym.c db_sym.h db_trap.c db_watch.c db_write_cmd.c
> :
> : Log Message:
> : Replace the Mach-derived boolean_t type with the C99 bool type. A
> : future commit will replace use of TRUE and FALSE with true and
> false.
>
> This was the mechanical version. Presumably you'll be doing fixups
> soon.
Yes, and there is a lot more churn coming in the next couple of hours.
>
> e.g. in ddb changing have_addr from "int/boolean_t" to "bool" filters
> down to (not including arch/*/*/db_* except i386, nor dev/sbus/
> esp_sbus.c)
>
> Similarly for some other files in other areas.
>
> Regards,
> Geoff
>
>
> --- ddb/db_break.c.org 2007-02-22 12:45:42.000000000 +1100
> +++ ddb/db_break.c 2007-02-22 13:14:50.000000000 +1100
> @@ -224,7 +224,7 @@
> /* Delete breakpoint */
> /*ARGSUSED*/
> void
> -db_delete_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> +db_delete_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
>
> @@ -234,7 +234,7 @@
> /* Set breakpoint with skip count */
> /*ARGSUSED*/
> void
> -db_breakpoint_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> +db_breakpoint_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
>
> @@ -247,7 +247,7 @@
> /* list breakpoints */
> /*ARGSUSED*/
> void
> -db_listbreak_cmd(db_expr_t addr, int have_addr,
> +db_listbreak_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> --- ddb/db_break.h.org 2007-02-22 12:45:42.000000000 +1100
> +++ ddb/db_break.h 2007-02-22 13:16:49.000000000 +1100
> @@ -52,9 +52,9 @@
> db_breakpoint_t db_find_breakpoint_here(db_addr_t);
> void db_set_breakpoints(void);
> void db_clear_breakpoints(void);
> -void db_delete_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_breakpoint_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_listbreak_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_delete_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_breakpoint_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_listbreak_cmd(db_expr_t, bool, db_expr_t, const char *);
> bool db_map_equal(struct vm_map *, struct vm_map *);
> bool db_map_current(struct vm_map *);
> struct vm_map *db_map_addr(vaddr_t);
> --- ddb/db_command.c.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_command.c 2007-02-22 13:19:48.000000000 +1100
> @@ -102,30 +102,30 @@
> */
> static bool db_ed_style = TRUE;
>
> -static void db_buf_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> +static void db_buf_print_cmd(db_expr_t, bool, db_expr_t, const char
> *);
> static void db_cmd_list(const struct db_command *);
> static int db_cmd_search(const char *, const struct db_command *,
> const struct db_command **);
> static void db_command(const struct db_command **,
> const struct db_command *);
> -static void db_event_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_fncall(db_expr_t, int, db_expr_t, const char *);
> -static void db_malloc_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_map_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> -static void db_namecache_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_object_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_page_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> -static void db_show_all_pages(db_expr_t, int, db_expr_t, const char
> *);
> -static void db_pool_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> -static void db_reboot_cmd(db_expr_t, int, db_expr_t, const char *);
> -static void db_sifting_cmd(db_expr_t, int, db_expr_t, const char *);
> -static void db_stack_trace_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_sync_cmd(db_expr_t, int, db_expr_t, const char *);
> -static void db_uvmexp_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_vnode_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_lock_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> -static void db_mount_print_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -static void db_mbuf_print_cmd(db_expr_t, int, db_expr_t, const char
> *);
> +static void db_event_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_fncall(db_expr_t, bool, db_expr_t, const char *);
> +static void db_malloc_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_map_print_cmd(db_expr_t, bool, db_expr_t, const char
> *);
> +static void db_namecache_print_cmd(db_expr_t, bool, db_expr_t,
> const char *);
> +static void db_object_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_page_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_show_all_pages(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_pool_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_reboot_cmd(db_expr_t, bool, db_expr_t, const char *);
> +static void db_sifting_cmd(db_expr_t, bool, db_expr_t, const char *);
> +static void db_stack_trace_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_sync_cmd(db_expr_t, bool, db_expr_t, const char *);
> +static void db_uvmexp_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_vnode_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_lock_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_mount_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +static void db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const
> char *);
>
> /*
> * 'show' commands
> @@ -275,7 +275,7 @@
> db_prev = db_dot;
> db_next = db_dot;
>
> - db_cmd_loop_done = 0;
> + db_cmd_loop_done = FALSE;
>
> savejmp = db_recover;
> db_recover = &db_jmpbuf;
> @@ -283,7 +283,7 @@
>
> db_execute_commandlist(db_cmd_on_enter);
>
> - while (!db_cmd_loop_done) {
> + while (db_cmd_loop_done == FALSE) {
> if (db_print_position() != 0)
> db_printf("\n");
> db_output_line = 0;
> @@ -531,7 +531,7 @@
>
> /*ARGSUSED*/
> static void
> -db_map_print_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> +db_map_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
> bool full = FALSE;
> @@ -547,12 +547,12 @@
>
> /*ARGSUSED*/
> static void
> -db_malloc_print_cmd(db_expr_t addr, int have_addr,
> +db_malloc_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> #ifdef MALLOC_DEBUG
> - if (!have_addr)
> + if (have_addr == FALSE)
> addr = 0;
>
> debug_malloc_printit(db_printf, (vaddr_t) addr);
> @@ -563,7 +563,7 @@
>
> /*ARGSUSED*/
> static void
> -db_object_print_cmd(db_expr_t addr, int have_addr,
> +db_object_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -577,7 +577,7 @@
>
> /*ARGSUSED*/
> static void
> -db_page_print_cmd(db_expr_t addr, int have_addr,
> +db_page_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -590,7 +590,7 @@
>
> /*ARGSUSED*/
> static void
> -db_show_all_pages(db_expr_t addr, int have_addr,
> +db_show_all_pages(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -599,7 +599,7 @@
>
> /*ARGSUSED*/
> static void
> -db_buf_print_cmd(db_expr_t addr, int have_addr,
> +db_buf_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -612,7 +612,7 @@
>
> /*ARGSUSED*/
> static void
> -db_event_print_cmd(db_expr_t addr, int have_addr,
> +db_event_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -625,7 +625,7 @@
>
> /*ARGSUSED*/
> static void
> -db_vnode_print_cmd(db_expr_t addr, int have_addr,
> +db_vnode_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -637,7 +637,7 @@
> }
>
> static void
> -db_mount_print_cmd(db_expr_t addr, int have_addr,
> +db_mount_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool full = FALSE;
> @@ -650,7 +650,7 @@
>
> /*ARGSUSED*/
> static void
> -db_mbuf_print_cmd(db_expr_t addr, int have_addr,
> +db_mbuf_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -659,7 +659,7 @@
>
> /*ARGSUSED*/
> static void
> -db_pool_print_cmd(db_expr_t addr, int have_addr,
> +db_pool_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -668,7 +668,7 @@
>
> /*ARGSUSED*/
> static void
> -db_namecache_print_cmd(db_expr_t addr, int have_addr,
> +db_namecache_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -677,7 +677,7 @@
>
> /*ARGSUSED*/
> static void
> -db_uvmexp_print_cmd(db_expr_t addr, int have_addr,
> +db_uvmexp_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -686,7 +686,7 @@
>
> /*ARGSUSED*/
> static void
> -db_lock_print_cmd(db_expr_t addr, int have_addr,
> +db_lock_print_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -699,7 +699,7 @@
> */
> /*ARGSUSED*/
> static void
> -db_fncall(db_expr_t addr, int have_addr,
> +db_fncall(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> db_expr_t fn_addr;
> @@ -754,7 +754,7 @@
> }
>
> static void
> -db_reboot_cmd(db_expr_t addr, int have_addr,
> +db_reboot_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> db_expr_t bootflags;
> @@ -776,7 +776,7 @@
> }
>
> static void
> -db_sifting_cmd(db_expr_t addr, int have_addr,
> +db_sifting_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> int mode, t;
> @@ -807,7 +807,7 @@
> }
>
> static void
> -db_stack_trace_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> const char *modif)
> +db_stack_trace_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
> register const char *cp = modif;
> register char c;
> @@ -825,7 +825,7 @@
> }
>
> static void
> -db_sync_cmd(db_expr_t addr, int have_addr,
> +db_sync_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> --- ddb/db_command.h.org 2006-09-06 17:19:53.000000000 +1000
> +++ ddb/db_command.h 2007-02-22 13:14:34.000000000 +1100
> @@ -53,7 +53,7 @@
> struct db_command {
> const char *name; /* command name */
> /* function to call */
> - void (*fcn)(db_expr_t, int, db_expr_t, const char *);
> + void (*fcn)(db_expr_t, bool, db_expr_t, const char *);
> int flag; /* extra info: */
> #define CS_OWN 0x1 /* non-standard syntax */
> #define CS_MORE 0x2 /* standard syntax, but may have other
> --- ddb/db_examine.c.org 2006-11-16 12:39:47.000000000 +1100
> +++ ddb/db_examine.c 2007-02-22 13:15:52.000000000 +1100
> @@ -61,7 +61,7 @@
> */
> /*ARGSUSED*/
> void
> -db_examine_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> +db_examine_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
> if (modif[0] != '\0')
> @@ -230,7 +230,7 @@
>
> /*ARGSUSED*/
> void
> -db_print_cmd(db_expr_t addr, int have_addr, db_expr_t count,
> +db_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
> db_expr_t value;
> @@ -296,7 +296,7 @@
> */
> /*ARGSUSED*/
> void
> -db_search_cmd(db_expr_t daddr, int have_addr,
> +db_search_cmd(db_expr_t daddr, bool have_addr,
> db_expr_t dcount, const char *modif)
> {
> int t;
> --- ddb/db_extern.h.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_extern.h 2007-02-22 13:19:51.000000000 +1100
> @@ -43,12 +43,12 @@
> void ddb_init(int, void *, void *);
>
> /* db_command.c */
> -extern int db_cmd_loop_done;
> +extern bool db_cmd_loop_done;
> extern label_t *db_recover;
>
> /* db_examine.c */
> -void db_examine_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_print_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_examine_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_print_cmd(db_expr_t, bool, db_expr_t, const char *);
> void db_print_loc_and_inst(db_addr_t);
> void db_search_cmd(db_expr_t, bool, db_expr_t, const char *);
>
> --- ddb/db_interface.h.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_interface.h 2007-02-22 13:17:17.000000000 +1100
> @@ -44,26 +44,26 @@
>
> /* arch/<arch>/<arch>/db_trace.c */
> /* arch/vax/vax/db_machdep.c */
> -void db_stack_trace_print(db_expr_t, int, db_expr_t, const char *,
> +void db_stack_trace_print(db_expr_t, bool, db_expr_t, const char *,
> void (*)(const char *, ...));
>
> /* ddb/db_xxx.c */
> -void db_kgdb_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_kgdb_cmd(db_expr_t, bool, db_expr_t, const char *);
>
> /* kern/kern_proc.c */
> -void db_kill_proc(db_expr_t, int, db_expr_t, const char *);
> -void db_show_all_procs(db_expr_t, int, db_expr_t, const char *);
> -void db_show_all_pools(db_expr_t, int, db_expr_t, const char *);
> -void db_show_sched_qs(db_expr_t, int, db_expr_t, const char *);
> +void db_kill_proc(db_expr_t, bool, db_expr_t, const char *);
> +void db_show_all_procs(db_expr_t, bool, db_expr_t, const char *);
> +void db_show_all_pools(db_expr_t, bool, db_expr_t, const char *);
> +void db_show_sched_qs(db_expr_t, bool, db_expr_t, const char *);
>
> /* kern/kern_clock.c */
> -void db_show_callout(db_expr_t, int, db_expr_t, const char *);
> +void db_show_callout(db_expr_t, bool, db_expr_t, const char *);
>
> /* kern/subr_log.c */
> -void db_dmesg(db_expr_t, int, db_expr_t, const char *);
> +void db_dmesg(db_expr_t, bool, db_expr_t, const char *);
>
> /* netinet/if_arp.c */
> -void db_show_arptab(db_expr_t, int, db_expr_t, const char *);
> +void db_show_arptab(db_expr_t, bool, db_expr_t, const char *);
>
> /*
> * This is used in several places to determine which printf format
> --- ddb/db_print.c.org 2006-11-16 12:39:47.000000000 +1100
> +++ ddb/db_print.c 2007-02-22 13:16:00.000000000 +1100
> @@ -49,7 +49,7 @@
>
> /*ARGSUSED*/
> void
> -db_show_regs(db_expr_t addr, int have_addr,
> +db_show_regs(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> const struct db_variable *regp;
> --- ddb/db_run.c.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_run.c 2007-02-22 13:20:02.000000000 +1100
> @@ -252,7 +252,7 @@
> /* single-step */
> /*ARGSUSED*/
> void
> -db_single_step_cmd(db_expr_t addr, int have_addr,
> +db_single_step_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool print = FALSE;
> @@ -270,13 +270,13 @@
> db_load_count = 0;
> db_store_count = 0;
>
> - db_cmd_loop_done = 1;
> + db_cmd_loop_done = TRUE;
> }
>
> /* trace and print until call/return */
> /*ARGSUSED*/
> void
> -db_trace_until_call_cmd(db_expr_t addr, int have_addr,
> +db_trace_until_call_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool print = FALSE;
> @@ -290,12 +290,12 @@
> db_load_count = 0;
> db_store_count = 0;
>
> - db_cmd_loop_done = 1;
> + db_cmd_loop_done = TRUE;
> }
>
> /*ARGSUSED*/
> void
> -db_trace_until_matching_cmd(db_expr_t addr, int have_addr,
> +db_trace_until_matching_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> bool print = FALSE;
> @@ -310,13 +310,13 @@
> db_load_count = 0;
> db_store_count = 0;
>
> - db_cmd_loop_done = 1;
> + db_cmd_loop_done = TRUE;
> }
>
> /* continue */
> /*ARGSUSED*/
> void
> -db_continue_cmd(db_expr_t addr, int have_addr,
> +db_continue_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -328,7 +328,7 @@
> db_load_count = 0;
> db_store_count = 0;
>
> - db_cmd_loop_done = 1;
> + db_cmd_loop_done = TRUE;
> }
> #endif /* DDB */
>
> --- ddb/db_run.h.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_run.h 2007-02-22 13:17:36.000000000 +1100
> @@ -48,9 +48,9 @@
> #ifndef db_clear_single_step
> void db_clear_single_step(db_regs_t *);
> #endif
> -void db_single_step_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_trace_until_call_cmd(db_expr_t, int, db_expr_t, const char
> *);
> -void db_trace_until_matching_cmd(db_expr_t, int, db_expr_t, const
> char *);
> -void db_continue_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_single_step_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_trace_until_call_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +void db_trace_until_matching_cmd(db_expr_t, bool, db_expr_t, const
> char *);
> +void db_continue_cmd(db_expr_t, bool, db_expr_t, const char *);
>
> #endif /* _DDB_DB_RUN_ */
> --- ddb/db_sym.h.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_sym.h 2007-02-22 13:21:40.000000000 +1100
> @@ -91,7 +91,7 @@
> bool db_eqname(const char *, const char *, int);
> /* strcmp, modulo leading char */
>
> -int db_value_of_name(const char *, db_expr_t *);
> +bool db_value_of_name(const char *, db_expr_t *);
> /* find symbol value given name */
>
> void db_sifting(char *, int);
> @@ -115,4 +115,4 @@
> void db_printsym(db_expr_t, db_strategy_t,
> void(*)(const char *, ...));
> /* print closest symbol to a value */
> -int db_sym_numargs(db_sym_t, int *, char **);
> +bool db_sym_numargs(db_sym_t, int *, char **);
> --- ddb/db_variables.c.org 2006-11-16 12:39:47.000000000 +1100
> +++ ddb/db_variables.c 2007-02-22 13:16:14.000000000 +1100
> @@ -252,7 +252,7 @@
>
> /*ARGSUSED*/
> void
> -db_set_cmd(db_expr_t addr, int have_addr,
> +db_set_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> db_expr_t value;
> --- ddb/db_variables.h.org 2005-12-12 08:53:56.000000000 +1100
> +++ ddb/db_variables.h 2007-02-22 13:17:55.000000000 +1100
> @@ -55,6 +55,6 @@
> int db_set_variable(db_expr_t);
> void db_read_variable(const struct db_variable *, db_expr_t *);
> void db_write_variable(const struct db_variable *, db_expr_t *);
> -void db_set_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_set_cmd(db_expr_t, bool, db_expr_t, const char *);
>
> #endif /* _DB_VARIABLES_H_ */
> --- ddb/db_watch.c.org 2007-02-22 12:45:43.000000000 +1100
> +++ ddb/db_watch.c 2007-02-22 13:16:19.000000000 +1100
> @@ -170,7 +170,7 @@
> /* Delete watchpoint */
> /*ARGSUSED*/
> void
> -db_deletewatch_cmd(db_expr_t addr, int have_addr,
> +db_deletewatch_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -180,7 +180,7 @@
> /* Set watchpoint */
> /*ARGSUSED*/
> void
> -db_watchpoint_cmd(db_expr_t addr, int have_addr,
> +db_watchpoint_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> vsize_t size;
> @@ -198,7 +198,7 @@
> /* list watchpoints */
> /*ARGSUSED*/
> void
> -db_listwatch_cmd(db_expr_t addr, int have_addr,
> +db_listwatch_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> --- ddb/db_watch.h.org 2005-12-12 08:53:56.000000000 +1100
> +++ ddb/db_watch.h 2007-02-22 13:18:02.000000000 +1100
> @@ -42,9 +42,9 @@
> struct db_watchpoint *link; /* link in in-use or free chain */
> } *db_watchpoint_t;
>
> -void db_deletewatch_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_watchpoint_cmd(db_expr_t, int, db_expr_t, const char *);
> -void db_listwatch_cmd(db_expr_t, int, db_expr_t, const char *);
> +void db_deletewatch_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_watchpoint_cmd(db_expr_t, bool, db_expr_t, const char *);
> +void db_listwatch_cmd(db_expr_t, bool, db_expr_t, const char *);
> void db_set_watchpoints(void);
> void db_clear_watchpoints(void);
>
> --- ddb/db_xxx.c.org 2007-02-10 11:21:49.000000000 +1100
> +++ ddb/db_xxx.c 2007-02-22 13:23:43.000000000 +1100
> @@ -67,7 +67,7 @@
> #endif
>
> void
> -db_kill_proc(db_expr_t addr, int haddr,
> +db_kill_proc(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> struct proc *p;
> @@ -105,7 +105,7 @@
>
> #ifdef KGDB
> void
> -db_kgdb_cmd(db_expr_t addr, int haddr,
> +db_kgdb_cmd(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> kgdb_active++;
> @@ -115,7 +115,7 @@
> #endif
>
> void
> -db_show_all_procs(db_expr_t addr, int haddr,
> +db_show_all_procs(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> int i;
> @@ -233,7 +233,7 @@
> }
>
> void
> -db_show_all_pools(db_expr_t addr, int haddr,
> +db_show_all_pools(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
>
> @@ -241,7 +241,7 @@
> }
>
> void
> -db_dmesg(db_expr_t addr, int haddr, db_expr_t count,
> +db_dmesg(db_expr_t addr, bool have_addr, db_expr_t count,
> const char *modif)
> {
> struct kern_msgbuf *mbp;
> @@ -257,7 +257,7 @@
> mbp = msgbufp;
> bufdata = &mbp->msg_bufc[0];
>
> - if (haddr && addr < mbp->msg_bufs)
> + if (have_addr == TRUE && addr < mbp->msg_bufs)
> print = addr;
> else
> print = mbp->msg_bufs;
> @@ -295,7 +295,7 @@
> #endif
>
> void
> -db_show_sched_qs(db_expr_t addr, int haddr,
> +db_show_sched_qs(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> struct prochd *ph;
> --- netinet/if_arp.c.org 2007-02-18 09:54:15.000000000 +1100
> +++ netinet/if_arp.c 2007-02-22 13:26:08.000000000 +1100
> @@ -1505,7 +1505,7 @@
> * Use this from ddb: "show arptab"
> */
> void
> -db_show_arptab(db_expr_t addr, int have_addr,
> +db_show_arptab(db_expr_t addr, bool have_addr,
> db_expr_t count, const char *modif)
> {
> struct radix_node_head *rnh;
> --- arch/i386/i386/db_interface.c.org 2006-11-16 12:39:42.000000000
> +1100
> +++ arch/i386/i386/db_interface.c 2007-02-22 13:20:50.000000000 +1100
> @@ -68,7 +68,7 @@
> int db_active = 0;
> db_regs_t ddb_regs; /* register state */
>
> -void db_mach_cpu (db_expr_t, int, db_expr_t, const char *);
> +void db_mach_cpu (db_expr_t, bool, db_expr_t, const char *);
>
> const struct db_command db_machine_command_table[] = {
> #ifdef MULTIPROCESSOR
> @@ -342,12 +342,12 @@
> void
> db_mach_cpu(
> db_expr_t addr,
> - int have_addr,
> + bool have_addr,
> db_expr_t count,
> const char * modif)
> {
> struct cpu_info *ci;
> - if (!have_addr) {
> + if (have_addr == FALSE) {
> cpu_debug_dump();
> return;
> }
> --- arch/i386/i386/db_trace.c.org 2007-02-22 12:45:27.000000000 +1100
> +++ arch/i386/i386/db_trace.c 2007-02-22 13:22:46.000000000 +1100
> @@ -411,7 +411,7 @@
> }
> }
>
> - if (!have_addr) {
> + if (have_addr == FALSE) {
> frame = (int *)ddb_regs.tf_ebp;
> callpc = (db_addr_t)ddb_regs.tf_eip;
> } else {
> @@ -496,7 +496,7 @@
>
> (*pr)("%s(", name);
>
> - if (lastframe == 0 && offset == 0 && !have_addr) {
> + if (lastframe == 0 && offset == 0 && have_addr == FALSE) {
> /*
> * We have a breakpoint before the frame is set up
> * Use %esp instead
> @@ -518,7 +518,7 @@
> db_printsym(callpc, DB_STGY_PROC, pr);
> (*pr)("\n");
>
> - if (lastframe == 0 && offset == 0 && !have_addr) {
> + if (lastframe == 0 && offset == 0 && have_addr == FALSE) {
> /* Frame really belongs to next callpc */
> struct i386_frame *fp = (void *)(ddb_regs.tf_esp-4);
>
-- thorpej