mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
76727919ce
This converts observers from using a special source-generating script to be plain C++. This version of the patch takes advantage of C++11 by using std::function and variadic templates; incorporates Pedro's patches; and renames the header file to "observable.h" (this change eliminates the need for a clean rebuild). Note that Pedro's patches used a template lambda in tui-hooks.c, but this failed to compile on some buildbot instances (presumably due to differing C++ versions); I replaced this with an ordinary template function. Regression tested on the buildbot. gdb/ChangeLog 2018-03-19 Pedro Alves <palves@redhat.com> Tom Tromey <tom@tromey.com> * unittests/observable-selftests.c: New file. * common/observable.h: New file. * observable.h: New file. * ada-lang.c, ada-tasks.c, agent.c, aix-thread.c, annotate.c, arm-tdep.c, auto-load.c, auxv.c, break-catch-syscall.c, breakpoint.c, bsd-uthread.c, cli/cli-interp.c, cli/cli-setshow.c, corefile.c, dummy-frame.c, event-loop.c, event-top.c, exec.c, extension.c, frame.c, gdbarch.c, guile/scm-breakpoint.c, infcall.c, infcmd.c, inferior.c, inflow.c, infrun.c, jit.c, linux-tdep.c, linux-thread-db.c, m68klinux-tdep.c, mi/mi-cmd-break.c, mi/mi-interp.c, mi/mi-main.c, objfiles.c, ppc-linux-nat.c, ppc-linux-tdep.c, printcmd.c, procfs.c, python/py-breakpoint.c, python/py-finishbreakpoint.c, python/py-inferior.c, python/py-unwind.c, ravenscar-thread.c, record-btrace.c, record-full.c, record.c, regcache.c, remote.c, riscv-tdep.c, sol-thread.c, solib-aix.c, solib-spu.c, solib.c, spu-multiarch.c, spu-tdep.c, stack.c, symfile-mem.c, symfile.c, symtab.c, thread.c, top.c, tracepoint.c, tui/tui-hooks.c, tui/tui-interp.c, valops.c: Update all users. * tui/tui-hooks.c (tui_bp_created_observer) (tui_bp_deleted_observer, tui_bp_modified_observer) (tui_inferior_exit_observer, tui_before_prompt_observer) (tui_normal_stop_observer, tui_register_changed_observer): Remove. (tui_observers_token): New global. (attach_or_detach, tui_attach_detach_observers): New functions. (tui_install_hooks, tui_remove_hooks): Use tui_attach_detach_observers. * record-btrace.c (record_btrace_thread_observer): Remove. (record_btrace_thread_observer_token): New global. * observer.sh: Remove. * observer.c: Rename to observable.c. * observable.c (namespace gdb_observers): Define new objects. (observer_debug): Move into gdb_observers namespace. (struct observer, struct observer_list, xalloc_observer_list_node) (xfree_observer_list_node, generic_observer_attach) (generic_observer_detach, generic_observer_notify): Remove. (_initialize_observer): Update. Don't include observer.inc. * Makefile.in (generated_files): Remove observer.h, observer.inc. (clean mostlyclean): Likewise. (observer.h, observer.inc): Remove targets. (SUBDIR_UNITTESTS_SRCS): Add observable-selftests.c. (COMMON_SFILES): Use observable.c, not observer.c. * .gitignore: Remove observer.h. gdb/doc/ChangeLog 2018-03-19 Tom Tromey <tom@tromey.com> * observer.texi: Remove. gdb/testsuite/ChangeLog 2018-03-19 Tom Tromey <tom@tromey.com> * gdb.gdb/observer.exp: Remove.
599 lines
12 KiB
C
599 lines
12 KiB
C
/* Annotation routines for GDB.
|
||
Copyright (C) 1986-2018 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "annotate.h"
|
||
#include "value.h"
|
||
#include "target.h"
|
||
#include "gdbtypes.h"
|
||
#include "breakpoint.h"
|
||
#include "observable.h"
|
||
#include "inferior.h"
|
||
#include "infrun.h"
|
||
#include "top.h"
|
||
|
||
|
||
/* Prototypes for local functions. */
|
||
|
||
static void print_value_flags (struct type *);
|
||
|
||
static void breakpoint_changed (struct breakpoint *b);
|
||
|
||
|
||
void (*deprecated_annotate_signalled_hook) (void);
|
||
void (*deprecated_annotate_signal_hook) (void);
|
||
|
||
/* Booleans indicating whether we've emitted certain notifications.
|
||
Used to suppress useless repeated notifications until the next time
|
||
we're ready to accept more commands. Reset whenever a prompt is
|
||
displayed. */
|
||
static int frames_invalid_emitted;
|
||
static int breakpoints_invalid_emitted;
|
||
|
||
static void
|
||
print_value_flags (struct type *t)
|
||
{
|
||
if (can_dereference (t))
|
||
printf_filtered (("*"));
|
||
else
|
||
printf_filtered (("-"));
|
||
}
|
||
|
||
static void
|
||
annotate_breakpoints_invalid (void)
|
||
{
|
||
if (annotation_level == 2
|
||
&& (!breakpoints_invalid_emitted
|
||
|| current_ui->prompt_state != PROMPT_BLOCKED))
|
||
{
|
||
/* If the inferior owns the terminal (e.g., we're resuming),
|
||
make sure to leave with the inferior still owning it. */
|
||
int was_inferior = target_terminal::is_inferior ();
|
||
|
||
target_terminal::ours_for_output ();
|
||
|
||
printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
|
||
|
||
if (was_inferior)
|
||
target_terminal::inferior ();
|
||
|
||
breakpoints_invalid_emitted = 1;
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_breakpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032breakpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_catchpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032catchpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_watchpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032watchpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_starting (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032starting\n"));
|
||
}
|
||
|
||
void
|
||
annotate_stopped (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032stopped\n"));
|
||
}
|
||
|
||
void
|
||
annotate_exited (int exitstatus)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032exited %d\n"), exitstatus);
|
||
}
|
||
|
||
void
|
||
annotate_signalled (void)
|
||
{
|
||
if (deprecated_annotate_signalled_hook)
|
||
deprecated_annotate_signalled_hook ();
|
||
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032signalled\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_name (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-name\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_string (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-string\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_string_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-string-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal (void)
|
||
{
|
||
if (deprecated_annotate_signal_hook)
|
||
deprecated_annotate_signal_hook ();
|
||
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032signal\n"));
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_headers (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-headers\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field (int num)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_table (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-table\n"));
|
||
}
|
||
|
||
void
|
||
annotate_record (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032record\n"));
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_table_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-table-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frames_invalid (void)
|
||
{
|
||
if (annotation_level == 2
|
||
&& (!frames_invalid_emitted
|
||
|| current_ui->prompt_state != PROMPT_BLOCKED))
|
||
{
|
||
/* If the inferior owns the terminal (e.g., we're resuming),
|
||
make sure to leave with the inferior still owning it. */
|
||
int was_inferior = target_terminal::is_inferior ();
|
||
|
||
target_terminal::ours_for_output ();
|
||
|
||
printf_unfiltered (("\n\032\032frames-invalid\n"));
|
||
|
||
if (was_inferior)
|
||
target_terminal::inferior ();
|
||
|
||
frames_invalid_emitted = 1;
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_new_thread (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
{
|
||
printf_unfiltered (("\n\032\032new-thread\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_thread_changed (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
{
|
||
printf_unfiltered (("\n\032\032thread-changed\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_field_begin (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032field-begin "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_field_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_quit (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032quit\n"));
|
||
}
|
||
|
||
void
|
||
annotate_error (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032error\n"));
|
||
}
|
||
|
||
void
|
||
annotate_error_begin (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
fprintf_filtered (gdb_stderr, "\n\032\032error-begin\n");
|
||
}
|
||
|
||
void
|
||
annotate_value_history_begin (int histindex, struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032value-history-begin %d "), histindex);
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_value_begin (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032value-begin "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_value_history_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-history-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_value_history_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-history-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_value_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_number_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-number-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_format (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-format\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_expression (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-expression\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_expression_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-expression-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_value (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032arg-value "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_arg_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_source (char *filename, int line, int character, int mid,
|
||
struct gdbarch *gdbarch, CORE_ADDR pc)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032source "));
|
||
else
|
||
printf_filtered (("\032\032"));
|
||
|
||
printf_filtered (("%s:%d:%d:%s:%s\n"), filename, line, character,
|
||
mid ? "middle" : "beg", paddress (gdbarch, pc));
|
||
}
|
||
|
||
void
|
||
annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032frame-begin %d %s\n"),
|
||
level, paddress (gdbarch, pc));
|
||
}
|
||
|
||
void
|
||
annotate_function_call (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032function-call\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_handler_caller (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-handler-caller\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_address (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-address\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_address_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-address-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_function_name (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-function-name\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_args (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-args\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_file (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-file\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_file_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-file-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_line (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-line\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_where (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-where\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_array_section_begin (int idx, struct type *elttype)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032array-section-begin %d "), idx);
|
||
print_value_flags (elttype);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_elt_rep (unsigned int repcount)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt-rep %u\n"), repcount);
|
||
}
|
||
|
||
void
|
||
annotate_elt_rep_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt-rep-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_elt (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt\n"));
|
||
}
|
||
|
||
void
|
||
annotate_array_section_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032array-section-end\n"));
|
||
}
|
||
|
||
/* Called when GDB is about to display the prompt. Used to reset
|
||
annotation suppression whenever we're ready to accept new
|
||
frontend/user commands. */
|
||
|
||
void
|
||
annotate_display_prompt (void)
|
||
{
|
||
frames_invalid_emitted = 0;
|
||
breakpoints_invalid_emitted = 0;
|
||
}
|
||
|
||
static void
|
||
breakpoint_changed (struct breakpoint *b)
|
||
{
|
||
if (b->number <= 0)
|
||
return;
|
||
|
||
annotate_breakpoints_invalid ();
|
||
}
|
||
|
||
void
|
||
_initialize_annotate (void)
|
||
{
|
||
gdb::observers::breakpoint_created.attach (breakpoint_changed);
|
||
gdb::observers::breakpoint_deleted.attach (breakpoint_changed);
|
||
gdb::observers::breakpoint_modified.attach (breakpoint_changed);
|
||
}
|