/* Annotation routines for GDB.
- Copyright (C) 1986-2017 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "target.h"
#include "gdbtypes.h"
#include "breakpoint.h"
-#include "observer.h"
+#include "observable.h"
#include "inferior.h"
#include "infrun.h"
#include "top.h"
+#include "source.h"
+#include "objfiles.h"
+#include "source-cache.h"
\f
/* Prototypes for local functions. */
-extern void _initialize_annotate (void);
-
static void print_value_flags (struct type *);
static void breakpoint_changed (struct breakpoint *b);
&& (!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 ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
-
- if (was_inferior)
- target_terminal_inferior ();
-
breakpoints_invalid_emitted = 1;
}
}
&& (!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 ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
printf_unfiltered (("\n\032\032frames-invalid\n"));
-
- if (was_inferior)
- target_terminal_inferior ();
-
frames_invalid_emitted = 1;
}
}
}
}
+/* Emit notification on thread exit. */
+
+static void
+annotate_thread_exited (struct thread_info *t, int silent)
+{
+ if (annotation_level > 1)
+ {
+ printf_filtered(("\n\032\032thread-exited,"
+ "id=\"%d\",group-id=\"i%d\"\n"),
+ t->global_num, t->inf->num);
+ }
+}
+
void
annotate_field_begin (struct type *type)
{
printf_filtered (("\n\032\032arg-end\n"));
}
-void
-annotate_source (char *filename, int line, int character, int mid,
+static void
+annotate_source (const char *filename, int line, int character, int mid,
struct gdbarch *gdbarch, CORE_ADDR pc)
{
if (annotation_level > 1)
mid ? "middle" : "beg", paddress (gdbarch, pc));
}
+/* See annotate.h. */
+
+void
+annotate_source_line (struct symtab *s, int line, int mid_statement,
+ CORE_ADDR pc)
+{
+ if (annotation_level > 0)
+ {
+ const std::vector<off_t> *offsets;
+ if (!g_source_cache.get_line_charpos (s, &offsets))
+ return;
+
+ /* Don't index off the end of the line_charpos array. */
+ if (line > offsets->size ())
+ return;
+
+ annotate_source (s->fullname, line, (int) (*offsets)[line - 1],
+ mid_statement, get_objfile_arch (SYMTAB_OBJFILE (s)),
+ pc);
+ }
+}
+
+
void
annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
{
void
_initialize_annotate (void)
{
- observer_attach_breakpoint_created (breakpoint_changed);
- observer_attach_breakpoint_deleted (breakpoint_changed);
- observer_attach_breakpoint_modified (breakpoint_changed);
+ gdb::observers::breakpoint_created.attach (breakpoint_changed);
+ gdb::observers::breakpoint_deleted.attach (breakpoint_changed);
+ gdb::observers::breakpoint_modified.attach (breakpoint_changed);
+ gdb::observers::thread_exit.attach (annotate_thread_exited);
}