From 9a4105ab85f462853dcc065d12659ea5ed44145b Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 21 Apr 2004 23:52:21 +0000 Subject: [PATCH] 2004-04-21 Andrew Cagney * annotate.h (deprecated_annotate_starting_hook) (deprecated_annotate_stopped_hook) (deprecated_annotate_exited_hook) (deprecated_annotate_signal_hook) (deprecated_annotate_signalled_hook): Deprecate. * tracepoint.h (deprecated_create_tracepoint_hook) (deprecated_delete_tracepoint_hook) (deprecated_modify_tracepoint_hook) (deprecated_trace_find_hook) (deprecated_trace_start_stop_hook): Deprecate. * target.h (deprecated_target_new_objfile_hook): Deprecate. * remote.h (deprecated_target_resume_hook) (deprecated_target_wait_loop_hook): Deprecate. * gdbcore.h (deprecated_exec_file_display_hook) (deprecated_file_changed_hook): Deprecate. * frame.h (deprecated_selected_frame_level_changed_hook): Deprecate. * defs.h (deprecated_modify_breakpoint_hook) (deprecated_command_loop_hook, deprecated_show_load_progress) (deprecated_print_frame_info_listing_hook) (deprecated_query_hook, deprecated_warning_hook) (deprecated_flush_hook, deprecated_create_breakpoint_hook) (deprecated_delete_breakpoint_hook) (deprecated_interactive_hook, deprecated_registers_changed_hook) (deprecated_readline_begin_hook, deprecated_readline_hook) (deprecated_readline_end_hook, deprecated_register_changed_hook) (deprecated_memory_changed_hook, deprecated_init_ui_hook) (deprecated_context_hook, deprecated_target_wait_hook) (deprecated_attach_hook, deprecated_detach_hook) (deprecated_call_command_hook, deprecated_set_hook) (deprecated_error_hook, deprecated_error_begin_hook) (deprecated_ui_load_progress_hook): Deprecate. * valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update. * tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update. * target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update. * remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update. * main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update. * exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update. * cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update. * annotate.c, aix-thread.c: Update. --- gdb/ChangeLog | 42 ++++++++++++++++++++ gdb/aix-thread.c | 9 +++-- gdb/annotate.c | 34 ++++++++-------- gdb/annotate.h | 10 ++--- gdb/breakpoint.c | 26 ++++++------- gdb/cli/cli-script.c | 10 ++--- gdb/cli/cli-setshow.c | 4 +- gdb/complaints.c | 4 +- gdb/corefile.c | 25 ++++++------ gdb/d10v-tdep.c | 4 +- gdb/defs.h | 76 ++++++++++++++++++------------------ gdb/dsrec.c | 10 +++-- gdb/exec.c | 10 ++--- gdb/frame.c | 4 +- gdb/frame.h | 2 +- gdb/gdbcore.h | 4 +- gdb/hpux-thread.c | 4 +- gdb/infcmd.c | 12 +++--- gdb/infrun.c | 26 ++++++------- gdb/interps.c | 48 +++++++++++------------ gdb/main.c | 8 ++-- gdb/mi/mi-interp.c | 56 +++++++++++++-------------- gdb/regcache.c | 4 +- gdb/remote-mips.c | 8 ++-- gdb/remote-sim.c | 4 +- gdb/remote.c | 20 +++++----- gdb/remote.h | 4 +- gdb/rs6000-nat.c | 8 ++-- gdb/sol-thread.c | 4 +- gdb/stack.c | 6 +-- gdb/symfile.c | 25 ++++++------ gdb/target.c | 4 +- gdb/target.h | 24 ++++++------ gdb/thread-db.c | 4 +- gdb/top.c | 90 ++++++++++++++++++++++--------------------- gdb/tracepoint.c | 30 +++++++-------- gdb/tracepoint.h | 10 ++--- gdb/tui/tui-hooks.c | 34 ++++++++-------- gdb/tui/tui-io.c | 4 +- gdb/utils.c | 18 ++++----- gdb/uw-thread.c | 9 +++-- gdb/valops.c | 8 ++-- 42 files changed, 399 insertions(+), 347 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5698945c03..99cbd945d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,45 @@ +2004-04-21 Andrew Cagney + + * annotate.h (deprecated_annotate_starting_hook) + (deprecated_annotate_stopped_hook) + (deprecated_annotate_exited_hook) + (deprecated_annotate_signal_hook) + (deprecated_annotate_signalled_hook): Deprecate. + * tracepoint.h (deprecated_create_tracepoint_hook) + (deprecated_delete_tracepoint_hook) + (deprecated_modify_tracepoint_hook) + (deprecated_trace_find_hook) + (deprecated_trace_start_stop_hook): Deprecate. + * target.h (deprecated_target_new_objfile_hook): Deprecate. + * remote.h (deprecated_target_resume_hook) + (deprecated_target_wait_loop_hook): Deprecate. + * gdbcore.h (deprecated_exec_file_display_hook) + (deprecated_file_changed_hook): Deprecate. + * frame.h (deprecated_selected_frame_level_changed_hook): Deprecate. + * defs.h (deprecated_modify_breakpoint_hook) + (deprecated_command_loop_hook, deprecated_show_load_progress) + (deprecated_print_frame_info_listing_hook) + (deprecated_query_hook, deprecated_warning_hook) + (deprecated_flush_hook, deprecated_create_breakpoint_hook) + (deprecated_delete_breakpoint_hook) + (deprecated_interactive_hook, deprecated_registers_changed_hook) + (deprecated_readline_begin_hook, deprecated_readline_hook) + (deprecated_readline_end_hook, deprecated_register_changed_hook) + (deprecated_memory_changed_hook, deprecated_init_ui_hook) + (deprecated_context_hook, deprecated_target_wait_hook) + (deprecated_attach_hook, deprecated_detach_hook) + (deprecated_call_command_hook, deprecated_set_hook) + (deprecated_error_hook, deprecated_error_begin_hook) + (deprecated_ui_load_progress_hook): Deprecate. + * valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update. + * tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update. + * target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update. + * remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update. + * main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update. + * exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update. + * cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update. + * annotate.c, aix-thread.c: Update. + 2004-04-21 Andrew Cagney * Makefile.in (vaxnbsd-tdep.o): Update dependencies. diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 18ee0b1f0f..1c2063ea52 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -129,7 +129,8 @@ static int pd_active = 0; static int arch64; -/* Saved pointer to previous owner of target_new_objfile_hook. */ +/* Saved pointer to previous owner of + deprecated_target_new_objfile_hook. */ static void (*target_new_objfile_chain)(struct objfile *); @@ -893,7 +894,7 @@ pd_disable (void) unpush_target (&aix_thread_ops); } -/* target_new_objfile_hook callback. +/* deprecated_target_new_objfile_hook callback. If OBJFILE is non-null, check whether a threaded application is being debugged, and if so, prepare for thread debugging. @@ -1695,8 +1696,8 @@ _initialize_aix_thread (void) add_target (&aix_thread_ops); /* Notice when object files get loaded and unloaded. */ - target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = new_objfile; + target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = new_objfile; add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger, (char *) &debug_aix_thread, diff --git a/gdb/annotate.c b/gdb/annotate.c index 0ba9b42f6c..c84c63d961 100644 --- a/gdb/annotate.c +++ b/gdb/annotate.c @@ -35,11 +35,11 @@ static void print_value_flags (struct type *); static void breakpoint_changed (struct breakpoint *); -void (*annotate_starting_hook) (void); -void (*annotate_stopped_hook) (void); -void (*annotate_signalled_hook) (void); -void (*annotate_signal_hook) (void); -void (*annotate_exited_hook) (void); +void (*deprecated_annotate_starting_hook) (void); +void (*deprecated_annotate_stopped_hook) (void); +void (*deprecated_annotate_signalled_hook) (void); +void (*deprecated_annotate_signal_hook) (void); +void (*deprecated_annotate_exited_hook) (void); static int ignore_count_changed = 0; @@ -102,8 +102,8 @@ void annotate_starting (void) { - if (annotate_starting_hook) - annotate_starting_hook (); + if (deprecated_annotate_starting_hook) + deprecated_annotate_starting_hook (); else { if (annotation_level > 1) @@ -116,8 +116,8 @@ annotate_starting (void) void annotate_stopped (void) { - if (annotate_stopped_hook) - annotate_stopped_hook (); + if (deprecated_annotate_stopped_hook) + deprecated_annotate_stopped_hook (); else { if (annotation_level > 1) @@ -133,8 +133,8 @@ annotate_stopped (void) void annotate_exited (int exitstatus) { - if (annotate_exited_hook) - annotate_exited_hook (); + if (deprecated_annotate_exited_hook) + deprecated_annotate_exited_hook (); else { if (annotation_level > 1) @@ -145,8 +145,8 @@ annotate_exited (int exitstatus) void annotate_signalled (void) { - if (annotate_signalled_hook) - annotate_signalled_hook (); + if (deprecated_annotate_signalled_hook) + deprecated_annotate_signalled_hook (); if (annotation_level > 1) printf_filtered ("\n\032\032signalled\n"); @@ -183,8 +183,8 @@ annotate_signal_string_end (void) void annotate_signal (void) { - if (annotate_signal_hook) - annotate_signal_hook (); + if (deprecated_annotate_signal_hook) + deprecated_annotate_signal_hook (); if (annotation_level > 1) printf_filtered ("\n\032\032signal\n"); @@ -579,7 +579,7 @@ _initialize_annotate (void) { if (annotation_level > 1) { - delete_breakpoint_hook = breakpoint_changed; - modify_breakpoint_hook = breakpoint_changed; + deprecated_delete_breakpoint_hook = breakpoint_changed; + deprecated_modify_breakpoint_hook = breakpoint_changed; } } diff --git a/gdb/annotate.h b/gdb/annotate.h index ac3cec8f94..cca14d3802 100644 --- a/gdb/annotate.h +++ b/gdb/annotate.h @@ -99,8 +99,8 @@ extern void annotate_elt_rep_end (void); extern void annotate_elt (void); extern void annotate_array_section_end (void); -extern void (*annotate_starting_hook) (void); -extern void (*annotate_stopped_hook) (void); -extern void (*annotate_signalled_hook) (void); -extern void (*annotate_signal_hook) (void); -extern void (*annotate_exited_hook) (void); +extern void (*deprecated_annotate_starting_hook) (void); +extern void (*deprecated_annotate_stopped_hook) (void); +extern void (*deprecated_annotate_signalled_hook) (void); +extern void (*deprecated_annotate_signal_hook) (void); +extern void (*deprecated_annotate_exited_hook) (void); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index f6437e8038..c38720a819 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4723,13 +4723,13 @@ mention (struct breakpoint *b) stb = ui_out_stream_new (uiout); old_chain = make_cleanup_ui_out_stream_delete (stb); - /* FIXME: This is misplaced; mention() is called by things (like hitting a - watchpoint) other than breakpoint creation. It should be possible to - clean this up and at the same time replace the random calls to - breakpoint_changed with this hook, as has already been done for - delete_breakpoint_hook and so on. */ - if (create_breakpoint_hook) - create_breakpoint_hook (b); + /* FIXME: This is misplaced; mention() is called by things (like + hitting a watchpoint) other than breakpoint creation. It should + be possible to clean this up and at the same time replace the + random calls to breakpoint_changed with this hook, as has already + been done for deprecated_delete_breakpoint_hook and so on. */ + if (deprecated_create_breakpoint_hook) + deprecated_create_breakpoint_hook (b); breakpoint_create_event (b->number); if (b->ops != NULL && b->ops->print_mention != NULL) @@ -6874,8 +6874,8 @@ delete_breakpoint (struct breakpoint *bpt) if (bpt->type == bp_none) return; - if (delete_breakpoint_hook) - delete_breakpoint_hook (bpt); + if (deprecated_delete_breakpoint_hook) + deprecated_delete_breakpoint_hook (bpt); breakpoint_delete_event (bpt->number); if (bpt->loc->inserted) @@ -7507,8 +7507,8 @@ disable_breakpoint (struct breakpoint *bpt) check_duplicates (bpt); - if (modify_breakpoint_hook) - modify_breakpoint_hook (bpt); + if (deprecated_modify_breakpoint_hook) + deprecated_modify_breakpoint_hook (bpt); breakpoint_modify_event (bpt->number); } @@ -7651,8 +7651,8 @@ have been allocated for other watchpoints.\n", bpt->number); } } - if (modify_breakpoint_hook) - modify_breakpoint_hook (bpt); + if (deprecated_modify_breakpoint_hook) + deprecated_modify_breakpoint_hook (bpt); breakpoint_modify_event (bpt->number); } diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index ca0c14f043..165702db3f 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -685,7 +685,7 @@ read_next_line (struct command_line **command) error ("Control nesting too deep!\n"); /* Set a prompt based on the nesting of the control commands. */ - if (instream == stdin || (instream == 0 && readline_hook != NULL)) + if (instream == stdin || (instream == 0 && deprecated_readline_hook != NULL)) { for (i = 0; i < control_level; i++) control_prompt[i] = ' '; @@ -893,10 +893,10 @@ read_command_lines (char *prompt_arg, int from_tty) enum misc_command_type val; control_level = 0; - if (readline_begin_hook) + if (deprecated_readline_begin_hook) { /* Note - intentional to merge messages with no newline */ - (*readline_begin_hook) ("%s %s\n", prompt_arg, END_MESSAGE); + (*deprecated_readline_begin_hook) ("%s %s\n", prompt_arg, END_MESSAGE); } else if (from_tty && input_from_terminal_p ()) { @@ -962,9 +962,9 @@ read_command_lines (char *prompt_arg, int from_tty) do_cleanups (old_chain); } - if (readline_end_hook) + if (deprecated_readline_end_hook) { - (*readline_end_hook) (); + (*deprecated_readline_end_hook) (); } return (head); } diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 62fe36f360..37b289dd8a 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -344,8 +344,8 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c) else error ("gdb internal error: bad cmd_type in do_setshow_command"); c->func (c, NULL, from_tty); - if (c->type == set_cmd && set_hook) - set_hook (c); + if (c->type == set_cmd && deprecated_set_hook) + deprecated_set_hook (c); } /* Show all the settings in a list of show commands. */ diff --git a/gdb/complaints.c b/gdb/complaints.c index ed24f43240..ec874da23d 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -186,8 +186,8 @@ vcomplaint (struct complaints **c, const char *file, int line, const char *fmt, if (complaint->file != NULL) internal_vwarning (complaint->file, complaint->line, complaint->fmt, args); - else if (warning_hook) - (*warning_hook) (complaint->fmt, args); + else if (deprecated_warning_hook) + (*deprecated_warning_hook) (complaint->fmt, args); else { if (complaints->explanation == NULL) diff --git a/gdb/corefile.c b/gdb/corefile.c index 572b4486cd..0ca469b693 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -41,17 +41,18 @@ extern void _initialize_core (void); static void call_extra_exec_file_hooks (char *filename); -/* You can have any number of hooks for `exec_file_command' command to call. - If there's only one hook, it is set in exec_file_display hook. - If there are two or more hooks, they are set in exec_file_extra_hooks[], - and exec_file_display_hook is set to a function that calls all of them. - This extra complexity is needed to preserve compatibility with - old code that assumed that only one hook could be set, and which called - exec_file_display_hook directly. */ +/* You can have any number of hooks for `exec_file_command' command to + call. If there's only one hook, it is set in exec_file_display + hook. If there are two or more hooks, they are set in + exec_file_extra_hooks[], and deprecated_exec_file_display_hook is + set to a function that calls all of them. This extra complexity is + needed to preserve compatibility with old code that assumed that + only one hook could be set, and which called + deprecated_exec_file_display_hook directly. */ typedef void (*hook_type) (char *); -hook_type exec_file_display_hook; /* the original hook */ +hook_type deprecated_exec_file_display_hook; /* the original hook */ static hook_type *exec_file_extra_hooks; /* array of additional hooks */ static int exec_file_hook_count = 0; /* size of array */ @@ -100,7 +101,7 @@ specify_exec_file_hook (void (*hook) (char *)) { hook_type *new_array; - if (exec_file_display_hook != NULL) + if (deprecated_exec_file_display_hook != NULL) { /* There's already a hook installed. Arrange to have both it * and the subsequent hooks called. */ @@ -108,8 +109,8 @@ specify_exec_file_hook (void (*hook) (char *)) { /* If this is the first extra hook, initialize the hook array. */ exec_file_extra_hooks = (hook_type *) xmalloc (sizeof (hook_type)); - exec_file_extra_hooks[0] = exec_file_display_hook; - exec_file_display_hook = call_extra_exec_file_hooks; + exec_file_extra_hooks[0] = deprecated_exec_file_display_hook; + deprecated_exec_file_display_hook = call_extra_exec_file_hooks; exec_file_hook_count = 1; } @@ -124,7 +125,7 @@ specify_exec_file_hook (void (*hook) (char *)) exec_file_extra_hooks[exec_file_hook_count - 1] = hook; } else - exec_file_display_hook = hook; + deprecated_exec_file_display_hook = hook; } /* The exec file must be closed before running an inferior. diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c index 4b977c6877..72211cd980 100644 --- a/gdb/d10v-tdep.c +++ b/gdb/d10v-tdep.c @@ -1542,8 +1542,8 @@ _initialize_d10v_tdep (void) { register_gdbarch_init (bfd_arch_d10v, d10v_gdbarch_init); - target_resume_hook = d10v_eva_prepare_to_trace; - target_wait_loop_hook = d10v_eva_get_trace_data; + deprecated_target_resume_hook = d10v_eva_prepare_to_trace; + deprecated_target_wait_loop_hook = d10v_eva_get_trace_data; deprecate_cmd (add_com ("regs", class_vars, show_regs, "Print all registers"), diff --git a/gdb/defs.h b/gdb/defs.h index e49f9e0e5b..a2c51ba807 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -198,7 +198,7 @@ extern void quit (void); #else #define QUIT { \ if (quit_flag) quit (); \ - if (interactive_hook) interactive_hook (); \ + if (deprecated_interactive_hook) deprecated_interactive_hook (); \ } #endif @@ -1197,9 +1197,10 @@ extern int watchdog; extern char *interpreter_p; /* If a given interpreter matches INTERPRETER_P then it should update - command_loop_hook and init_ui_hook with the per-interpreter - implementation. */ -/* FIXME: command_loop_hook and init_ui_hook should be moved here. */ + deprecated_command_loop_hook and deprecated_init_ui_hook with the + per-interpreter implementation. */ +/* FIXME: deprecated_command_loop_hook and deprecated_init_ui_hook + should be moved here. */ struct target_waitstatus; struct cmd_list_element; @@ -1208,46 +1209,47 @@ struct cmd_list_element; event-loop) be enabled? */ extern int event_loop_p; -extern void (*init_ui_hook) (char *argv0); -extern void (*command_loop_hook) (void); -extern void (*show_load_progress) (const char *section, - unsigned long section_sent, - unsigned long section_size, - unsigned long total_sent, - unsigned long total_size); -extern void (*print_frame_info_listing_hook) (struct symtab * s, - int line, int stopline, - int noerror); +extern void (*deprecated_init_ui_hook) (char *argv0); +extern void (*deprecated_command_loop_hook) (void); +extern void (*deprecated_show_load_progress) (const char *section, + unsigned long section_sent, + unsigned long section_size, + unsigned long total_sent, + unsigned long total_size); +extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s, + int line, int stopline, + int noerror); extern struct frame_info *parse_frame_specification (char *frame_exp); -extern int (*query_hook) (const char *, va_list); -extern void (*warning_hook) (const char *, va_list); -extern void (*flush_hook) (struct ui_file * stream); -extern void (*create_breakpoint_hook) (struct breakpoint * b); -extern void (*delete_breakpoint_hook) (struct breakpoint * bpt); -extern void (*modify_breakpoint_hook) (struct breakpoint * bpt); -extern void (*interactive_hook) (void); -extern void (*registers_changed_hook) (void); -extern void (*readline_begin_hook) (char *,...); -extern char *(*readline_hook) (char *); -extern void (*readline_end_hook) (void); -extern void (*register_changed_hook) (int regno); -extern void (*memory_changed_hook) (CORE_ADDR addr, int len); -extern void (*context_hook) (int); -extern ptid_t (*target_wait_hook) (ptid_t ptid, +extern int (*deprecated_query_hook) (const char *, va_list); +extern void (*deprecated_warning_hook) (const char *, va_list); +extern void (*deprecated_flush_hook) (struct ui_file * stream); +extern void (*deprecated_create_breakpoint_hook) (struct breakpoint * b); +extern void (*deprecated_delete_breakpoint_hook) (struct breakpoint * bpt); +extern void (*deprecated_modify_breakpoint_hook) (struct breakpoint * bpt); +extern void (*deprecated_interactive_hook) (void); +extern void (*deprecated_registers_changed_hook) (void); +extern void (*deprecated_readline_begin_hook) (char *,...); +extern char *(*deprecated_readline_hook) (char *); +extern void (*deprecated_readline_end_hook) (void); +extern void (*deprecated_register_changed_hook) (int regno); +extern void (*deprecated_memory_changed_hook) (CORE_ADDR addr, int len); +extern void (*deprecated_context_hook) (int); +extern ptid_t (*deprecated_target_wait_hook) (ptid_t ptid, struct target_waitstatus * status); -extern void (*attach_hook) (void); -extern void (*detach_hook) (void); -extern void (*call_command_hook) (struct cmd_list_element * c, - char *cmd, int from_tty); +extern void (*deprecated_attach_hook) (void); +extern void (*deprecated_detach_hook) (void); +extern void (*deprecated_call_command_hook) (struct cmd_list_element * c, + char *cmd, int from_tty); -extern void (*set_hook) (struct cmd_list_element * c); +extern void (*deprecated_set_hook) (struct cmd_list_element * c); -extern NORETURN void (*error_hook) (void) ATTR_NORETURN; +extern NORETURN void (*deprecated_error_hook) (void) ATTR_NORETURN; -extern void (*error_begin_hook) (void); +extern void (*deprecated_error_begin_hook) (void); -extern int (*ui_load_progress_hook) (const char *section, unsigned long num); +extern int (*deprecated_ui_load_progress_hook) (const char *section, + unsigned long num); /* Inhibit window interface if non-zero. */ diff --git a/gdb/dsrec.c b/gdb/dsrec.c index 142260002f..3021052203 100644 --- a/gdb/dsrec.c +++ b/gdb/dsrec.c @@ -124,8 +124,9 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset, do { serial_write (desc, srec, reclen); - if (ui_load_progress_hook) - if (ui_load_progress_hook (section_name, (unsigned long) i)) + if (deprecated_ui_load_progress_hook) + if (deprecated_ui_load_progress_hook (section_name, + (unsigned long) i)) error ("Canceled the download"); } while (waitack != NULL && !waitack ()); @@ -137,8 +138,9 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset, } } /* Per-packet (or S-record) loop */ - if (ui_load_progress_hook) - if (ui_load_progress_hook (section_name, (unsigned long) i)) + if (deprecated_ui_load_progress_hook) + if (deprecated_ui_load_progress_hook (section_name, + (unsigned long) i)) error ("Canceled the download"); putchar_unfiltered ('\n'); } diff --git a/gdb/exec.c b/gdb/exec.c index 418b0b3aa3..4b43808e24 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -53,7 +53,7 @@ struct vmap *map_vmap (bfd *, bfd *); -void (*file_changed_hook) (char *); +void (*deprecated_file_changed_hook) (char *); /* Prototypes for local functions */ @@ -267,8 +267,8 @@ exec_file_attach (char *filename, int from_tty) push_target (&exec_ops); /* Tell display code (if any) about the changed file name. */ - if (exec_file_display_hook) - (*exec_file_display_hook) (filename); + if (deprecated_exec_file_display_hook) + (*deprecated_exec_file_display_hook) (filename); } } @@ -324,8 +324,8 @@ file_command (char *arg, int from_tty) the exec file, but that's rough. */ exec_file_command (arg, from_tty); symbol_file_command (arg, from_tty); - if (file_changed_hook) - file_changed_hook (arg); + if (deprecated_file_changed_hook) + deprecated_file_changed_hook (arg); } diff --git a/gdb/frame.c b/gdb/frame.c index 840f7d197b..f9384fe5d5 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -914,8 +914,8 @@ select_frame (struct frame_info *fi) deprecated_selected_frame = fi; /* NOTE: cagney/2002-05-04: FI can be NULL. This occurs when the frame is being invalidated. */ - if (selected_frame_level_changed_hook) - selected_frame_level_changed_hook (frame_relative_level (fi)); + if (deprecated_selected_frame_level_changed_hook) + deprecated_selected_frame_level_changed_hook (frame_relative_level (fi)); /* FIXME: kseitz/2002-08-28: It would be nice to call selected_frame_level_changed_event() right here, but due to limitations diff --git a/gdb/frame.h b/gdb/frame.h index a5f1ade098..f58d85d43f 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -611,7 +611,7 @@ extern void args_info (char *, int); extern void locals_info (char *, int); -extern void (*selected_frame_level_changed_hook) (int); +extern void (*deprecated_selected_frame_level_changed_hook) (int); extern void return_command (char *, int); diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h index 9cf063f11d..2c8427c8c6 100644 --- a/gdb/gdbcore.h +++ b/gdb/gdbcore.h @@ -98,12 +98,12 @@ extern void generic_search (int len, char *data, char *mask, /* Hook for `exec_file_command' command to call. */ -extern void (*exec_file_display_hook) (char *filename); +extern void (*deprecated_exec_file_display_hook) (char *filename); /* Hook for "file_command", which is more useful than above (because it is invoked AFTER symbols are read, not before) */ -extern void (*file_changed_hook) (char *filename); +extern void (*deprecated_file_changed_hook) (char *filename); extern void specify_exec_file_hook (void (*hook) (char *filename)); diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c index 242d3a39a0..698c3d9205 100644 --- a/gdb/hpux-thread.c +++ b/gdb/hpux-thread.c @@ -581,6 +581,6 @@ _initialize_hpux_thread (void) child_suppress_run = 1; /* Hook into new_objfile notification. */ - target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = hpux_thread_new_objfile; + target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = hpux_thread_new_objfile; } diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 1ad12bf706..44ca59b097 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1861,8 +1861,8 @@ attach_command (char *args, int from_tty) normal_stop (); - if (attach_hook) - attach_hook (); + if (deprecated_attach_hook) + deprecated_attach_hook (); } /* @@ -1884,8 +1884,8 @@ detach_command (char *args, int from_tty) #if defined(SOLIB_RESTART) SOLIB_RESTART (); #endif - if (detach_hook) - detach_hook (); + if (deprecated_detach_hook) + deprecated_detach_hook (); } /* Disconnect from the current target without resuming it (leaving it @@ -1904,8 +1904,8 @@ disconnect_command (char *args, int from_tty) #if defined(SOLIB_RESTART) SOLIB_RESTART (); #endif - if (detach_hook) - detach_hook (); + if (deprecated_detach_hook) + deprecated_detach_hook (); } /* Stop the execution of the target while running in async mode, in diff --git a/gdb/infrun.c b/gdb/infrun.c index 611a8f4419..0b4f05a911 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -316,8 +316,8 @@ static struct breakpoint *through_sigtramp_breakpoint = NULL; static int number_of_threads_in_syscalls; /* This is a cached copy of the pid/waitstatus of the last event - returned by target_wait()/target_wait_hook(). This information is - returned by get_last_target_status(). */ + returned by target_wait()/deprecated_target_wait_hook(). This + information is returned by get_last_target_status(). */ static ptid_t target_last_wait_ptid; static struct target_waitstatus target_last_waitstatus; @@ -1038,8 +1038,8 @@ wait_for_inferior (void) while (1) { - if (target_wait_hook) - ecs->ptid = target_wait_hook (ecs->waiton_ptid, ecs->wp); + if (deprecated_target_wait_hook) + ecs->ptid = deprecated_target_wait_hook (ecs->waiton_ptid, ecs->wp); else ecs->ptid = target_wait (ecs->waiton_ptid, ecs->wp); @@ -1095,9 +1095,9 @@ fetch_inferior_event (void *client_data) registers_changed (); } - if (target_wait_hook) + if (deprecated_target_wait_hook) async_ecs->ptid = - target_wait_hook (async_ecs->waiton_ptid, async_ecs->wp); + deprecated_target_wait_hook (async_ecs->waiton_ptid, async_ecs->wp); else async_ecs->ptid = target_wait (async_ecs->waiton_ptid, async_ecs->wp); @@ -1154,9 +1154,9 @@ check_for_old_step_resume_breakpoint (void) } /* Return the cached copy of the last pid/waitstatus returned by - target_wait()/target_wait_hook(). The data is actually cached by - handle_inferior_event(), which gets called immediately after - target_wait()/target_wait_hook(). */ + target_wait()/deprecated_target_wait_hook(). The data is actually + cached by handle_inferior_event(), which gets called immediately + after target_wait()/deprecated_target_wait_hook(). */ void get_last_target_status (ptid_t *ptidp, struct target_waitstatus *status) @@ -1726,8 +1726,8 @@ handle_inferior_event (struct execution_control_state *ecs) ecs->ptid = saved_singlestep_ptid; context_switch (ecs); - if (context_hook) - context_hook (pid_to_thread_id (ecs->ptid)); + if (deprecated_context_hook) + deprecated_context_hook (pid_to_thread_id (ecs->ptid)); resume (1, TARGET_SIGNAL_0); prepare_to_wait (ecs); @@ -1841,8 +1841,8 @@ handle_inferior_event (struct execution_control_state *ecs) { context_switch (ecs); - if (context_hook) - context_hook (pid_to_thread_id (ecs->ptid)); + if (deprecated_context_hook) + deprecated_context_hook (pid_to_thread_id (ecs->ptid)); flush_cached_frames (); } diff --git a/gdb/interps.c b/gdb/interps.c index 82e9af690b..5856fa0702 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -268,10 +268,10 @@ void current_interp_command_loop (void) { /* Somewhat messy. For the moment prop up all the old ways of - selecting the command loop. `command_loop_hook' should be - deprecated. */ - if (command_loop_hook != NULL) - command_loop_hook (); + selecting the command loop. `deprecated_command_loop_hook' + should be deprecated. */ + if (deprecated_command_loop_hook != NULL) + deprecated_command_loop_hook (); else if (current_interpreter != NULL && current_interpreter->procs->command_loop_proc != NULL) current_interpreter->procs->command_loop_proc (current_interpreter->data); @@ -322,27 +322,27 @@ interp_exec (struct interp *interp, const char *command_str) void clear_interpreter_hooks (void) { - init_ui_hook = 0; - print_frame_info_listing_hook = 0; + deprecated_init_ui_hook = 0; + deprecated_print_frame_info_listing_hook = 0; /*print_frame_more_info_hook = 0; */ - query_hook = 0; - warning_hook = 0; - create_breakpoint_hook = 0; - delete_breakpoint_hook = 0; - modify_breakpoint_hook = 0; - interactive_hook = 0; - registers_changed_hook = 0; - readline_begin_hook = 0; - readline_hook = 0; - readline_end_hook = 0; - register_changed_hook = 0; - memory_changed_hook = 0; - context_hook = 0; - target_wait_hook = 0; - call_command_hook = 0; - error_hook = 0; - error_begin_hook = 0; - command_loop_hook = 0; + deprecated_query_hook = 0; + deprecated_warning_hook = 0; + deprecated_create_breakpoint_hook = 0; + deprecated_delete_breakpoint_hook = 0; + deprecated_modify_breakpoint_hook = 0; + deprecated_interactive_hook = 0; + deprecated_registers_changed_hook = 0; + deprecated_readline_begin_hook = 0; + deprecated_readline_hook = 0; + deprecated_readline_end_hook = 0; + deprecated_register_changed_hook = 0; + deprecated_memory_changed_hook = 0; + deprecated_context_hook = 0; + deprecated_target_wait_hook = 0; + deprecated_call_command_hook = 0; + deprecated_error_hook = 0; + deprecated_error_begin_hook = 0; + deprecated_command_loop_hook = 0; clear_gdb_event_hooks (); } diff --git a/gdb/main.c b/gdb/main.c index 7385cfdf20..a419309563 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -527,7 +527,7 @@ extern int gdbtk_test (char *); } /* Initialize all files. Give the interpreter a chance to take - control of the console via the init_ui_hook()) */ + control of the console via the deprecated_init_ui_hook(). */ gdb_init (argv[0]); /* Do these (and anything which might call wrap_here or *_filtered) @@ -779,10 +779,10 @@ extern int gdbtk_test (char *); /* GUIs generally have their own command loop, mainloop, or whatever. This is a good place to gain control because many error conditions will end up here via longjmp(). */ - if (command_loop_hook) - command_loop_hook (); + if (deprecated_command_loop_hook) + deprecated_command_loop_hook (); else - command_loop (); + deprecated_command_loop (); quit_command ((char *) 0, instream == stdin); } } diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 08201ca5bb..1a3031f2a6 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -127,17 +127,17 @@ mi_interpreter_resume (void *data) be a better way of doing this... */ clear_interpreter_hooks (); - show_load_progress = mi_load_progress; + deprecated_show_load_progress = mi_load_progress; /* If we're _the_ interpreter, take control. */ if (current_interp_named_p (INTERP_MI1)) - command_loop_hook = mi1_command_loop; + deprecated_command_loop_hook = mi1_command_loop; else if (current_interp_named_p (INTERP_MI2)) - command_loop_hook = mi2_command_loop; + deprecated_command_loop_hook = mi2_command_loop; else if (current_interp_named_p (INTERP_MI3)) - command_loop_hook = mi3_command_loop; + deprecated_command_loop_hook = mi3_command_loop; else - command_loop_hook = mi2_command_loop; + deprecated_command_loop_hook = mi2_command_loop; return 1; } @@ -282,13 +282,13 @@ mi_cmd_interpreter_exec (char *command, char **argv, int argc) static void mi_insert_notify_hooks (void) { - query_hook = mi_interp_query_hook; + deprecated_query_hook = mi_interp_query_hook; } static void mi_remove_notify_hooks (void) { - query_hook = NULL; + deprecated_query_hook = NULL; } static int @@ -341,27 +341,27 @@ mi_command_loop (int mi_version) uiout = mi_out_new (mi_version); /* HACK: Override any other interpreter hooks. We need to create a real event table and pass in that. */ - init_ui_hook = 0; - /* command_loop_hook = 0; */ - print_frame_info_listing_hook = 0; - query_hook = 0; - warning_hook = 0; - create_breakpoint_hook = 0; - delete_breakpoint_hook = 0; - modify_breakpoint_hook = 0; - interactive_hook = 0; - registers_changed_hook = 0; - readline_begin_hook = 0; - readline_hook = 0; - readline_end_hook = 0; - register_changed_hook = 0; - memory_changed_hook = 0; - context_hook = 0; - target_wait_hook = 0; - call_command_hook = 0; - error_hook = 0; - error_begin_hook = 0; - show_load_progress = mi_load_progress; + deprecated_init_ui_hook = 0; + /* deprecated_command_loop_hook = 0; */ + deprecated_print_frame_info_listing_hook = 0; + deprecated_query_hook = 0; + deprecated_warning_hook = 0; + deprecated_create_breakpoint_hook = 0; + deprecated_delete_breakpoint_hook = 0; + deprecated_modify_breakpoint_hook = 0; + deprecated_interactive_hook = 0; + deprecated_registers_changed_hook = 0; + deprecated_readline_begin_hook = 0; + deprecated_readline_hook = 0; + deprecated_readline_end_hook = 0; + deprecated_register_changed_hook = 0; + deprecated_memory_changed_hook = 0; + deprecated_context_hook = 0; + deprecated_target_wait_hook = 0; + deprecated_call_command_hook = 0; + deprecated_error_hook = 0; + deprecated_error_begin_hook = 0; + deprecated_show_load_progress = mi_load_progress; #endif /* Turn off 8 bit strings in quoted output. Any character with the high bit set is printed using C's octal format. */ diff --git a/gdb/regcache.c b/gdb/regcache.c index f8d885a402..91204b8e9a 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -594,8 +594,8 @@ registers_changed (void) for (i = 0; i < current_regcache->descr->nr_raw_registers; i++) set_register_cached (i, 0); - if (registers_changed_hook) - registers_changed_hook (); + if (deprecated_registers_changed_hook) + deprecated_registers_changed_hook (); } /* DEPRECATED_REGISTERS_FETCHED () diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index c75768406b..4886852e86 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -2662,8 +2662,8 @@ mips_load_srec (char *args) reclen = mips_make_srec (srec, '3', s->vma + i, buffer, numbytes); send_srec (srec, reclen, s->vma + i); - if (ui_load_progress_hook) - ui_load_progress_hook (s->name, i); + if (deprecated_ui_load_progress_hook) + deprecated_ui_load_progress_hook (s->name, i); if (hashmark) { @@ -3186,8 +3186,8 @@ pmon_load_fast (char *file) break; } - if (ui_load_progress_hook) - ui_load_progress_hook (s->name, i); + if (deprecated_ui_load_progress_hook) + deprecated_ui_load_progress_hook (s->name, i); if (hashmark) { diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 9b0b3fd99f..253782a712 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -268,8 +268,8 @@ gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap) static void gdb_os_error (host_callback * p, const char *format,...) { - if (error_hook) - (*error_hook) (); + if (deprecated_error_hook) + (*deprecated_error_hook) (); else { va_list args; diff --git a/gdb/remote.c b/gdb/remote.c index e23a30f412..1e173d27b9 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1006,8 +1006,8 @@ static void *sigint_remote_token; /* These are pointers to hook functions that may be set in order to modify resume/wait behavior for a particular architecture. */ -void (*target_resume_hook) (void); -void (*target_wait_loop_hook) (void); +void (*deprecated_target_resume_hook) (void); +void (*deprecated_target_wait_loop_hook) (void); @@ -2552,8 +2552,8 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) /* A hook for when we need to do something at the last moment before resumption. */ - if (target_resume_hook) - (*target_resume_hook) (); + if (deprecated_target_resume_hook) + (*deprecated_target_resume_hook) (); /* The vCont packet doesn't need to specify threads via Hc. */ if (remote_vcont_resume (ptid, step, siggnal)) @@ -2883,8 +2883,8 @@ remote_wait (ptid_t ptid, struct target_waitstatus *status) /* This is a hook for when we need to do something (perhaps the collection of trace data) every time the target stops. */ - if (target_wait_loop_hook) - (*target_wait_loop_hook) (); + if (deprecated_target_wait_loop_hook) + (*deprecated_target_wait_loop_hook) (); remote_stopped_by_watchpoint_p = 0; @@ -3074,8 +3074,8 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) /* This is a hook for when we need to do something (perhaps the collection of trace data) every time the target stops. */ - if (target_wait_loop_hook) - (*target_wait_loop_hook) (); + if (deprecated_target_wait_loop_hook) + (*deprecated_target_wait_loop_hook) (); switch (buf[0]) { @@ -5479,8 +5479,8 @@ _initialize_remote (void) add_target (&extended_async_remote_ops); /* Hook into new objfile notification. */ - remote_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = remote_new_objfile; + remote_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = remote_new_objfile; #if 0 init_remote_threadtests (); diff --git a/gdb/remote.h b/gdb/remote.h index 7c0df32ad6..40c55f17a8 100644 --- a/gdb/remote.h +++ b/gdb/remote.h @@ -58,7 +58,7 @@ extern int remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len); extern int remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len); -extern void (*target_resume_hook) (void); -extern void (*target_wait_loop_hook) (void); +extern void (*deprecated_target_resume_hook) (void); +extern void (*deprecated_target_wait_loop_hook) (void); #endif diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index c0a95da564..02bb2e2d41 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -880,8 +880,8 @@ vmap_ldinfo (LdInfo *ldi) /* Announce new object files. Doing this after symbol relocation makes aix-thread.c's job easier. */ - if (target_new_objfile_hook && vp->objfile) - target_new_objfile_hook (vp->objfile); + if (deprecated_target_new_objfile_hook && vp->objfile) + deprecated_target_new_objfile_hook (vp->objfile); /* There may be more, so we don't break out of the loop. */ } @@ -1162,8 +1162,8 @@ xcoff_relocate_core (struct target_ops *target) vmap_symtab (vp); - if (target_new_objfile_hook && vp != vmap && vp->objfile) - target_new_objfile_hook (vp->objfile); + if (deprecated_target_new_objfile_hook && vp != vmap && vp->objfile) + deprecated_target_new_objfile_hook (vp->objfile); } while (LDI_NEXT (ldi, arch64) != 0); vmap_exec (); diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 3ac2a34d62..25d67463c8 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -1702,8 +1702,8 @@ _initialize_sol_thread (void) add_target (&core_ops); /* Hook into new_objfile notification. */ - target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = sol_thread_new_objfile; + target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = sol_thread_new_objfile; return; die: diff --git a/gdb/stack.c b/gdb/stack.c index 93e36b5210..d2a25c1b07 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -52,7 +52,7 @@ void args_info (char *, int); void locals_info (char *, int); -void (*selected_frame_level_changed_hook) (int); +void (*deprecated_selected_frame_level_changed_hook) (int); void _initialize_stack (void); @@ -494,8 +494,8 @@ print_frame_info (struct frame_info *fi, int level, int source, int args) get_frame_pc (fi)); if (!done) { - if (print_frame_info_listing_hook) - print_frame_info_listing_hook (sal.symtab, sal.line, sal.line + 1, 0); + if (deprecated_print_frame_info_listing_hook) + deprecated_print_frame_info_listing_hook (sal.symtab, sal.line, sal.line + 1, 0); else { /* We used to do this earlier, but that is clearly diff --git a/gdb/symfile.c b/gdb/symfile.c index c06fbd1cee..7c83011426 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -72,15 +72,15 @@ extern int hp_cxx_exception_support_initialized; } while (0) #endif -int (*ui_load_progress_hook) (const char *section, unsigned long num); -void (*show_load_progress) (const char *section, +int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); +void (*deprecated_show_load_progress) (const char *section, unsigned long section_sent, unsigned long section_size, unsigned long total_sent, unsigned long total_size); void (*pre_add_symbol_hook) (const char *); void (*post_add_symbol_hook) (void); -void (*target_new_objfile_hook) (struct objfile *); +void (*deprecated_target_new_objfile_hook) (struct objfile *); static void clear_symtab_users_cleanup (void *ignore); @@ -903,8 +903,8 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd, int from_tty, new_symfile_objfile (objfile, mainline, from_tty); - if (target_new_objfile_hook) - target_new_objfile_hook (objfile); + if (deprecated_target_new_objfile_hook) + deprecated_target_new_objfile_hook (objfile); return (objfile); } @@ -1440,13 +1440,14 @@ load_section_callback (bfd *abfd, asection *asec, void *data) args->write_count += 1; sent += len; if (quit_flag - || (ui_load_progress_hook != NULL - && ui_load_progress_hook (sect_name, sent))) + || (deprecated_ui_load_progress_hook != NULL + && deprecated_ui_load_progress_hook (sect_name, sent))) error ("Canceled the download"); - if (show_load_progress != NULL) - show_load_progress (sect_name, sent, size, - args->data_count, args->total_size); + if (deprecated_show_load_progress != NULL) + deprecated_show_load_progress (sect_name, sent, size, + args->data_count, + args->total_size); } while (sent < size); @@ -2398,8 +2399,8 @@ clear_symtab_users (void) set_default_breakpoint (0, 0, 0, 0); clear_current_source_symtab_and_line (); clear_pc_function_cache (); - if (target_new_objfile_hook) - target_new_objfile_hook (NULL); + if (deprecated_target_new_objfile_hook) + deprecated_target_new_objfile_hook (NULL); } static void diff --git a/gdb/target.c b/gdb/target.c index d4ff6c05af..94a8f8a24a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1551,8 +1551,8 @@ generic_mourn_inferior (void) if (!show_breakpoint_hit_counts) breakpoint_clear_ignore_counts (); - if (detach_hook) - detach_hook (); + if (deprecated_detach_hook) + deprecated_detach_hook (); } /* Helper function for child_wait and the Lynx derivatives of child_wait. diff --git a/gdb/target.h b/gdb/target.h index 2d8ce372fc..086e3e1d43 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -949,19 +949,19 @@ extern char *normal_pid_to_str (ptid_t ptid); * The old way of doing this is to define a macro 'target_new_objfile' * that points to the function that you want to be called on every * objfile/shlib load. - * - * The new way is to grab the function pointer, 'target_new_objfile_hook', - * and point it to the function that you want to be called on every - * objfile/shlib load. - * - * If multiple clients are willing to be cooperative, they can each - * save a pointer to the previous value of target_new_objfile_hook - * before modifying it, and arrange for their function to call the - * previous function in the chain. In that way, multiple clients - * can receive this notification (something like with signal handlers). - */ -extern void (*target_new_objfile_hook) (struct objfile *); + The new way is to grab the function pointer, + 'deprecated_target_new_objfile_hook', and point it to the function + that you want to be called on every objfile/shlib load. + + If multiple clients are willing to be cooperative, they can each + save a pointer to the previous value of + deprecated_target_new_objfile_hook before modifying it, and arrange + for their function to call the previous function in the chain. In + that way, multiple clients can receive this notification (something + like with signal handlers). */ + +extern void (*deprecated_target_new_objfile_hook) (struct objfile *); #ifndef target_pid_or_tid_to_str #define target_pid_or_tid_to_str(ID) \ diff --git a/gdb/thread-db.c b/gdb/thread-db.c index 46838474e3..99f77ae80a 100644 --- a/gdb/thread-db.c +++ b/gdb/thread-db.c @@ -1359,7 +1359,7 @@ _initialize_thread_db (void) add_target (&thread_db_ops); /* Add ourselves to objfile event chain. */ - target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = thread_db_new_objfile; + target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = thread_db_new_objfile; } } diff --git a/gdb/top.c b/gdb/top.c index d6bdfd0928..f68d618631 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -193,7 +193,7 @@ static void stop_sig (int); If the UI fails to initialize and it wants GDB to continue using the default UI, then it should clear this hook before returning. */ -void (*init_ui_hook) (char *argv0); +void (*deprecated_init_ui_hook) (char *argv0); /* This hook is called from within gdb's many mini-event loops which could steal control from a real user interface's event loop. It returns @@ -204,92 +204,93 @@ int (*ui_loop_hook) (int); /* Called instead of command_loop at top level. Can be invoked via throw_exception(). */ -void (*command_loop_hook) (void); +void (*deprecated_command_loop_hook) (void); /* Called from print_frame_info to list the line we stopped in. */ -void (*print_frame_info_listing_hook) (struct symtab * s, int line, - int stopline, int noerror); +void (*deprecated_print_frame_info_listing_hook) (struct symtab * s, int line, + int stopline, int noerror); /* Replaces most of query. */ -int (*query_hook) (const char *, va_list); +int (*deprecated_query_hook) (const char *, va_list); /* Replaces most of warning. */ -void (*warning_hook) (const char *, va_list); +void (*deprecated_warning_hook) (const char *, va_list); -/* These three functions support getting lines of text from the user. They - are used in sequence. First readline_begin_hook is called with a text - string that might be (for example) a message for the user to type in a - sequence of commands to be executed at a breakpoint. If this function - calls back to a GUI, it might take this opportunity to pop up a text - interaction window with this message. Next, readline_hook is called - with a prompt that is emitted prior to collecting the user input. - It can be called multiple times. Finally, readline_end_hook is called - to notify the GUI that we are done with the interaction window and it - can close it. */ +/* These three functions support getting lines of text from the user. + They are used in sequence. First deprecated_readline_begin_hook is + called with a text string that might be (for example) a message for + the user to type in a sequence of commands to be executed at a + breakpoint. If this function calls back to a GUI, it might take + this opportunity to pop up a text interaction window with this + message. Next, deprecated_readline_hook is called with a prompt + that is emitted prior to collecting the user input. It can be + called multiple times. Finally, deprecated_readline_end_hook is + called to notify the GUI that we are done with the interaction + window and it can close it. */ -void (*readline_begin_hook) (char *, ...); -char *(*readline_hook) (char *); -void (*readline_end_hook) (void); +void (*deprecated_readline_begin_hook) (char *, ...); +char *(*deprecated_readline_hook) (char *); +void (*deprecated_readline_end_hook) (void); /* Called as appropriate to notify the interface of the specified breakpoint conditions. */ -void (*create_breakpoint_hook) (struct breakpoint * bpt); -void (*delete_breakpoint_hook) (struct breakpoint * bpt); -void (*modify_breakpoint_hook) (struct breakpoint * bpt); +void (*deprecated_create_breakpoint_hook) (struct breakpoint * bpt); +void (*deprecated_delete_breakpoint_hook) (struct breakpoint * bpt); +void (*deprecated_modify_breakpoint_hook) (struct breakpoint * bpt); /* Called as appropriate to notify the interface that we have attached to or detached from an already running process. */ -void (*attach_hook) (void); -void (*detach_hook) (void); +void (*deprecated_attach_hook) (void); +void (*deprecated_detach_hook) (void); /* Called during long calculations to allow GUI to repair window damage, and to check for stop buttons, etc... */ -void (*interactive_hook) (void); +void (*deprecated_interactive_hook) (void); /* Called when the registers have changed, as a hint to a GUI to minimize window update. */ -void (*registers_changed_hook) (void); +void (*deprecated_registers_changed_hook) (void); /* Tell the GUI someone changed the register REGNO. -1 means that the caller does not know which register changed or that several registers have changed (see value_assign). */ -void (*register_changed_hook) (int regno); +void (*deprecated_register_changed_hook) (int regno); /* Tell the GUI someone changed LEN bytes of memory at ADDR */ -void (*memory_changed_hook) (CORE_ADDR addr, int len); +void (*deprecated_memory_changed_hook) (CORE_ADDR addr, int len); /* Called when going to wait for the target. Usually allows the GUI to run while waiting for target events. */ -ptid_t (*target_wait_hook) (ptid_t ptid, - struct target_waitstatus * status); +ptid_t (*deprecated_target_wait_hook) (ptid_t ptid, + struct target_waitstatus * status); /* Used by UI as a wrapper around command execution. May do various things like enabling/disabling buttons, etc... */ -void (*call_command_hook) (struct cmd_list_element * c, char *cmd, - int from_tty); +void (*deprecated_call_command_hook) (struct cmd_list_element * c, char *cmd, + int from_tty); /* Called after a `set' command has finished. Is only run if the `set' command succeeded. */ -void (*set_hook) (struct cmd_list_element * c); +void (*deprecated_set_hook) (struct cmd_list_element * c); /* Called when the current thread changes. Argument is thread id. */ -void (*context_hook) (int id); +void (*deprecated_context_hook) (int id); /* Takes control from error (). Typically used to prevent longjmps out of the middle of the GUI. Usually used in conjunction with a catch routine. */ -NORETURN void (*error_hook) (void) ATTR_NORETURN; +NORETURN void (*deprecated_error_hook) (void) ATTR_NORETURN; /* One should use catch_errors rather than manipulating these @@ -737,8 +738,8 @@ execute_command (char *p, int from_tty) do_setshow_command (arg, from_tty & caution, c); else if (!cmd_func_p (c)) error ("That is not a command, just a help topic."); - else if (call_command_hook) - call_command_hook (c, arg, from_tty & caution); + else if (deprecated_call_command_hook) + deprecated_call_command_hook (c, arg, from_tty & caution); else cmd_func (c, arg, from_tty & caution); @@ -1234,9 +1235,9 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix) } /* Don't use fancy stuff if not talking to stdin. */ - if (readline_hook && instream == NULL) + if (deprecated_readline_hook && instream == NULL) { - rl = (*readline_hook) (local_prompt); + rl = (*deprecated_readline_hook) (local_prompt); } else if (command_editing_p && instream == stdin && ISATTY (instream)) { @@ -1452,7 +1453,7 @@ quit_confirm (void) /* This is something of a hack. But there's no reliable way to see if a GUI is running. The `use_windows' variable doesn't cut it. */ - if (init_ui_hook) + if (deprecated_init_ui_hook) s = "A debugging session is active.\nDo you still want to close the debugger?"; else if (attach_flag) s = "The program is running. Quit anyway (and detach it)? "; @@ -1905,8 +1906,9 @@ gdb_init (char *argv0) set_language (language_c); expected_language = current_language; /* don't warn about the change. */ - /* Allow another UI to initialize. If the UI fails to initialize, and - it wants GDB to revert to the CLI, it should clear init_ui_hook. */ - if (init_ui_hook) - init_ui_hook (argv0); + /* Allow another UI to initialize. If the UI fails to initialize, + and it wants GDB to revert to the CLI, it should clear + deprecated_init_ui_hook. */ + if (deprecated_init_ui_hook) + deprecated_init_ui_hook (argv0); } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 39c6877c2a..fe9557ffc6 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -65,9 +65,9 @@ #define MAX_AGENT_EXPR_LEN 184 -extern void (*readline_begin_hook) (char *, ...); -extern char *(*readline_hook) (char *); -extern void (*readline_end_hook) (void); +extern void (*deprecated_readline_begin_hook) (char *, ...); +extern char *(*deprecated_readline_hook) (char *); +extern void (*deprecated_readline_end_hook) (void); extern void x_command (char *, int); extern int addressprint; /* Print machine addresses? */ @@ -787,8 +787,8 @@ trace_actions_command (char *args, int from_tty) if (from_tty) { - if (readline_begin_hook) - (*readline_begin_hook) ("%s %s\n", tmpbuf, end_msg); + if (deprecated_readline_begin_hook) + (*deprecated_readline_begin_hook) ("%s %s\n", tmpbuf, end_msg); else if (input_from_terminal_p ()) printf_filtered ("%s\n%s\n", tmpbuf, end_msg); } @@ -797,8 +797,8 @@ trace_actions_command (char *args, int from_tty) t->step_count = 0; /* read_actions may set this */ read_actions (t); - if (readline_end_hook) - (*readline_end_hook) (); + if (deprecated_readline_end_hook) + (*deprecated_readline_end_hook) (); /* tracepoints_changed () */ } /* else just return */ @@ -842,8 +842,8 @@ read_actions (struct tracepoint *t) gdb_flush (gdb_stdout); gdb_flush (gdb_stderr); - if (readline_hook && instream == NULL) - line = (*readline_hook) (prompt); + if (deprecated_readline_hook && instream == NULL) + line = (*deprecated_readline_hook) (prompt); else if (instream == stdin && ISATTY (instream)) { line = gdb_readline_wrapper (prompt); @@ -1804,8 +1804,8 @@ trace_start_command (char *args, int from_tty) set_tracepoint_num (-1); set_traceframe_context (-1); trace_running_p = 1; - if (trace_start_stop_hook) - trace_start_stop_hook (1, from_tty); + if (deprecated_trace_start_stop_hook) + deprecated_trace_start_stop_hook (1, from_tty); } else @@ -1823,8 +1823,8 @@ trace_stop_command (char *args, int from_tty) if (strcmp (target_buf, "OK")) error ("Bogus reply from target: %s", target_buf); trace_running_p = 0; - if (trace_start_stop_hook) - trace_start_stop_hook (0, from_tty); + if (deprecated_trace_start_stop_hook) + deprecated_trace_start_stop_hook (0, from_tty); } else error ("Trace can only be run on remote targets."); @@ -1985,8 +1985,8 @@ trace_find_command (char *args, int from_tty) if (target_is_remote ()) { - if (trace_find_hook) - trace_find_hook (args, from_tty); + if (deprecated_trace_find_hook) + deprecated_trace_find_hook (args, from_tty); if (args == 0 || *args == 0) { /* TFIND with no args means find NEXT trace frame. */ diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index c464ae1f98..280d36c6e0 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -109,11 +109,11 @@ extern unsigned long trace_running_p; /* A hook used to notify the UI of tracepoint operations */ -void (*create_tracepoint_hook) (struct tracepoint *); -void (*delete_tracepoint_hook) (struct tracepoint *); -void (*modify_tracepoint_hook) (struct tracepoint *); -void (*trace_find_hook) (char *arg, int from_tty); -void (*trace_start_stop_hook) (int start, int from_tty); +void (*deprecated_create_tracepoint_hook) (struct tracepoint *); +void (*deprecated_delete_tracepoint_hook) (struct tracepoint *); +void (*deprecated_modify_tracepoint_hook) (struct tracepoint *); +void (*deprecated_trace_find_hook) (char *arg, int from_tty); +void (*deprecated_trace_start_stop_hook) (int start, int from_tty); struct tracepoint *get_tracepoint_by_number (char **, int, int); int get_traceframe_number (void); diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index a3a80dd51b..6f880aba99 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -127,7 +127,7 @@ tui_query_hook (const char * msg, va_list argp) return retval; } -/* Prevent recursion of registers_changed_hook(). */ +/* Prevent recursion of deprecated_registers_changed_hook(). */ static int tui_refreshing_registers = 0; static void @@ -283,31 +283,31 @@ tui_detach_hook (void) void tui_install_hooks (void) { - target_wait_hook = tui_target_wait_hook; - selected_frame_level_changed_hook = tui_selected_frame_level_changed_hook; - print_frame_info_listing_hook = tui_print_frame_info_listing_hook; + deprecated_target_wait_hook = tui_target_wait_hook; + deprecated_selected_frame_level_changed_hook = tui_selected_frame_level_changed_hook; + deprecated_print_frame_info_listing_hook = tui_print_frame_info_listing_hook; - query_hook = tui_query_hook; + deprecated_query_hook = tui_query_hook; /* Install the event hooks. */ tui_old_event_hooks = set_gdb_event_hooks (&tui_event_hooks); - registers_changed_hook = tui_registers_changed_hook; - register_changed_hook = tui_register_changed_hook; - detach_hook = tui_detach_hook; + deprecated_registers_changed_hook = tui_registers_changed_hook; + deprecated_register_changed_hook = tui_register_changed_hook; + deprecated_detach_hook = tui_detach_hook; } /* Remove the TUI specific hooks. */ void tui_remove_hooks (void) { - target_wait_hook = 0; - selected_frame_level_changed_hook = 0; - print_frame_info_listing_hook = 0; - query_hook = 0; - registers_changed_hook = 0; - register_changed_hook = 0; - detach_hook = 0; + deprecated_target_wait_hook = 0; + deprecated_selected_frame_level_changed_hook = 0; + deprecated_print_frame_info_listing_hook = 0; + deprecated_query_hook = 0; + deprecated_registers_changed_hook = 0; + deprecated_register_changed_hook = 0; + deprecated_detach_hook = 0; /* Restore the previous event hooks. */ set_gdb_event_hooks (tui_old_event_hooks); @@ -319,6 +319,6 @@ void _initialize_tui_hooks (void) { /* Install the permanent hooks. */ - tui_target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = tui_new_objfile_hook; + tui_target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = tui_new_objfile_hook; } diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index a91a416900..07926d9e9b 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -603,8 +603,8 @@ tui_initialize_io (void) tui_stderr = tui_fileopen (stderr); tui_out = tui_out_new (tui_stdout); - /* Create the default UI. It is not created because we installed - a init_ui_hook. */ + /* Create the default UI. It is not created because we installed a + deprecated_init_ui_hook. */ tui_old_uiout = uiout = cli_out_new (gdb_stdout); #ifdef TUI_USE_PIPE_FOR_READLINE diff --git a/gdb/utils.c b/gdb/utils.c index a5b28c1258..89fca0694c 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -83,7 +83,7 @@ extern char *canonicalize_file_name (const char *); /* readline defines this. */ #undef savestring -void (*error_begin_hook) (void); +void (*deprecated_error_begin_hook) (void); /* Holds the last error message issued by gdb */ @@ -566,8 +566,8 @@ discard_all_intermediate_continuations (void) void vwarning (const char *string, va_list args) { - if (warning_hook) - (*warning_hook) (string, args); + if (deprecated_warning_hook) + (*deprecated_warning_hook) (string, args); else { target_terminal_ours (); @@ -659,8 +659,8 @@ error_output_message (char *pre_print, char *msg) NORETURN void error_stream (struct ui_file *stream) { - if (error_begin_hook) - error_begin_hook (); + if (deprecated_error_begin_hook) + deprecated_error_begin_hook (); /* Copy the stream into the GDB_LASTERR buffer. */ ui_file_rewind (gdb_lasterr); @@ -1270,10 +1270,10 @@ query (const char *ctlstr, ...) int ans2; int retval; - if (query_hook) + if (deprecated_query_hook) { va_start (args, ctlstr); - return query_hook (ctlstr, args); + return deprecated_query_hook (ctlstr, args); } /* Automatically answer "yes" if input is not from a terminal. */ @@ -1373,9 +1373,9 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) n_string = "[n]"; } - if (query_hook) + if (deprecated_query_hook) { - return query_hook (ctlstr, args); + return deprecated_query_hook (ctlstr, args); } /* Automatically answer default value if input is not from a terminal. */ diff --git a/gdb/uw-thread.c b/gdb/uw-thread.c index cc6ed6daf4..947fb147e2 100644 --- a/gdb/uw-thread.c +++ b/gdb/uw-thread.c @@ -206,7 +206,8 @@ static struct target_ops uw_thread_ops; they lack current_target's default callbacks. */ static struct target_ops base_ops; -/* Saved pointer to previous owner of target_new_objfile_hook. */ +/* Saved pointer to previous owner of + deprecated_target_new_objfile_hook. */ static void (*target_new_objfile_chain)(struct objfile *); /* Whether we are debugging a user-space thread program. This isn't @@ -1000,7 +1001,7 @@ libthread_init (void) deactivate_uw_thread (); } -/* target_new_objfile_hook callback. +/* deprecated_target_new_objfile_hook callback. If OBJFILE is non-null, check whether libthread.so was just loaded, and if so, prepare for user-mode thread debugging. @@ -1062,6 +1063,6 @@ _initialize_uw_thread (void) procfs_suppress_run = 1; /* Notice when libthread.so gets loaded. */ - target_new_objfile_chain = target_new_objfile_hook; - target_new_objfile_hook = uw_thread_new_objfile; + target_new_objfile_chain = deprecated_target_new_objfile_hook; + deprecated_target_new_objfile_hook = uw_thread_new_objfile; } diff --git a/gdb/valops.c b/gdb/valops.c index def8e8fb9d..be7dec585f 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -606,8 +606,8 @@ value_assign (struct value *toval, struct value *fromval) } write_memory (changed_addr, dest_buffer, changed_len); - if (memory_changed_hook) - memory_changed_hook (changed_addr, changed_len); + if (deprecated_memory_changed_hook) + deprecated_memory_changed_hook (changed_addr, changed_len); target_changed_event (); } break; @@ -698,8 +698,8 @@ value_assign (struct value *toval, struct value *fromval) put_frame_register (frame, regno, buffer + amount_copied); } - if (register_changed_hook) - register_changed_hook (-1); + if (deprecated_register_changed_hook) + deprecated_register_changed_hook (-1); target_changed_event (); break; } -- 2.34.1