/* Annotation routines for GDB.
Copyright (C) 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
- 2000 Free Software Foundation, Inc.
+ 2000, 2007, 2008, 2009 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 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "annotate.h"
#include "target.h"
#include "gdbtypes.h"
#include "breakpoint.h"
+#include "observer.h"
\f
/* Prototypes for local functions. */
static void print_value_flags (struct type *);
-static void breakpoint_changed (struct breakpoint *);
+static void breakpoint_changed (int);
+
-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;
void
annotate_starting (void)
{
-
- if (deprecated_annotate_starting_hook)
- deprecated_annotate_starting_hook ();
- else
- {
- if (annotation_level > 1)
- {
- printf_filtered (("\n\032\032starting\n"));
- }
- }
+ if (annotation_level > 1)
+ printf_filtered (("\n\032\032starting\n"));
}
void
annotate_stopped (void)
{
- if (deprecated_annotate_stopped_hook)
- deprecated_annotate_stopped_hook ();
- else
- {
- if (annotation_level > 1)
- printf_filtered (("\n\032\032stopped\n"));
- }
+ if (annotation_level > 1)
+ printf_filtered (("\n\032\032stopped\n"));
if (annotation_level > 1 && ignore_count_changed)
{
ignore_count_changed = 0;
void
annotate_exited (int exitstatus)
{
- if (deprecated_annotate_exited_hook)
- deprecated_annotate_exited_hook ();
- else
- {
- if (annotation_level > 1)
- printf_filtered (("\n\032\032exited %d\n"), exitstatus);
- }
+ if (annotation_level > 1)
+ printf_filtered (("\n\032\032exited %d\n"), exitstatus);
}
void
}
}
+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)
{
}
void
-annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc)
+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:0x"), filename,
- line, character,
- mid ? "middle" : "beg");
- deprecated_print_address_numeric (pc, 0, gdb_stdout);
- printf_filtered (("\n"));
+ printf_filtered (("%s:%d:%d:%s:%s\n"), filename, line, character,
+ mid ? "middle" : "beg", paddress (gdbarch, pc));
}
void
-annotate_frame_begin (int level, CORE_ADDR pc)
+annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
{
if (annotation_level > 1)
- {
- printf_filtered (("\n\032\032frame-begin %d 0x"), level);
- deprecated_print_address_numeric (pc, 0, gdb_stdout);
- printf_filtered (("\n"));
- }
+ printf_filtered (("\n\032\032frame-begin %d %s\n"),
+ level, paddress (gdbarch, pc));
}
void
}
static void
-breakpoint_changed (struct breakpoint *b)
+breakpoint_changed (int bpno)
{
breakpoints_changed ();
}
{
if (annotation_level == 2)
{
- deprecated_delete_breakpoint_hook = breakpoint_changed;
- deprecated_modify_breakpoint_hook = breakpoint_changed;
+ observer_attach_breakpoint_deleted (breakpoint_changed);
+ observer_attach_breakpoint_modified (breakpoint_changed);
}
}