X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fannotate.h;h=5e9f11d60538b2c7107f9115b1e755c344084976;hb=7190276c52b9d86a52aae73d3a0f8b56e7a1f4f1;hp=fda8b1749d58fff9e6c3b85431521f6681e86ced;hpb=a14ed312fd86dd2c862847230931451da2e49942;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/annotate.h b/gdb/annotate.h
index fda8b1749d..5e9f11d605 100644
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -1,11 +1,11 @@
 /* Annotation routines for GDB.
-   Copyright 1986, 1989, 1990, 1991, 1992, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 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,
@@ -14,16 +14,14 @@
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef ANNOTATE_H
+#define ANNOTATE_H
 
 #include "symtab.h"
 #include "gdbtypes.h"
 
-extern void breakpoints_changed (void);
-
-extern void annotate_ignore_count_change (void);
 extern void annotate_breakpoint (int);
 extern void annotate_catchpoint (int);
 extern void annotate_watchpoint (int);
@@ -44,6 +42,10 @@ extern void annotate_record (void);
 extern void annotate_breakpoints_table_end (void);
 
 extern void annotate_frames_invalid (void);
+extern void annotate_new_thread (void);
+extern void annotate_thread_changed (void);
+
+extern void annotate_display_prompt (void);
 
 struct type;
 
@@ -75,9 +77,26 @@ extern void annotate_arg_name_end (void);
 extern void annotate_arg_value (struct type *);
 extern void annotate_arg_end (void);
 
-extern void annotate_source (char *, int, int, int, CORE_ADDR);
+/* Wrap calls to annotate_arg_begin and annotate_arg_end in an RAII
+   class. */
+struct annotate_arg_emitter
+{
+  annotate_arg_emitter () { annotate_arg_begin (); }
+  ~annotate_arg_emitter () { annotate_arg_end (); }
+
+  DISABLE_COPY_AND_ASSIGN (annotate_arg_emitter);
+};
 
-extern void annotate_frame_begin (int, CORE_ADDR);
+/* If annotations are turned on then print annotation describing the full
+   name of the source file S and the line number LINE and its corresponding
+   character position.
+
+   MID_STATEMENT is nonzero if the PC is not at the beginning of that
+   line.  */
+extern void annotate_source_line (struct symtab *s, int line,
+				  int mid_statement, CORE_ADDR pc);
+
+extern void annotate_frame_begin (int, struct gdbarch *, CORE_ADDR);
 extern void annotate_function_call (void);
 extern void annotate_signal_handler_caller (void);
 extern void annotate_frame_address (void);
@@ -98,8 +117,7 @@ extern void annotate_elt_rep_end (void);
 extern void annotate_elt (void);
 extern void annotate_array_section_end (void);
 
-extern void (*annotate_starting_hook) PARAMS ((void));
-extern void (*annotate_stopped_hook) PARAMS ((void));
-extern void (*annotate_signalled_hook) PARAMS ((void));
-extern void (*annotate_signal_hook) PARAMS ((void));
-extern void (*annotate_exited_hook) PARAMS ((void));
+extern void (*deprecated_annotate_signalled_hook) (void);
+extern void (*deprecated_annotate_signal_hook) (void);
+
+#endif /* ANNOTATE_H */