2007-11-07 Markus Deuling <deuling@de.ibm.com>

[deliverable/binutils-gdb.git] / gdb / annotate.c

diff --git a/gdb/annotate.c b/gdb/annotate.c
index c84c63d96109c4f7d6d9b21ed220aa623f141589..cf62349e8356a3899f6274421656345290a8b1bb 100644 (file)
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,12 +1,12 @@
 /* Annotation routines for GDB.
-   Copyright 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
+   2000, 2007 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,
@@ -15,9 +15,7 @@
    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/>.  */
 
 #include "defs.h"
 #include "annotate.h"
@@ -47,18 +45,18 @@ static void
 print_value_flags (struct type *t)
 {
   if (can_dereference (t))
-    printf_filtered ("*");
+    printf_filtered (("*"));
   else
-    printf_filtered ("-");
+    printf_filtered (("-"));
 }
 \f
 void
 breakpoints_changed (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       target_terminal_ours ();
-      printf_unfiltered ("\n\032\032breakpoints-invalid\n");
+      printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
       if (ignore_count_changed)
        ignore_count_changed = 0;       /* Avoid multiple break annotations. */
     }
@@ -81,21 +79,21 @@ void
 annotate_breakpoint (int num)
 {
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032breakpoint %d\n", num);
+    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);
+    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);
+    printf_filtered (("\n\032\032watchpoint %d\n"), num);
 }
 
 void
@@ -108,7 +106,7 @@ annotate_starting (void)
     {
       if (annotation_level > 1)
        {
-         printf_filtered ("\n\032\032starting\n");
+         printf_filtered (("\n\032\032starting\n"));
        }
     }
 }
@@ -121,7 +119,7 @@ annotate_stopped (void)
   else
     {
       if (annotation_level > 1)
-       printf_filtered ("\n\032\032stopped\n");
+       printf_filtered (("\n\032\032stopped\n"));
     }
   if (annotation_level > 1 && ignore_count_changed)
     {
@@ -138,7 +136,7 @@ annotate_exited (int exitstatus)
   else
     {
       if (annotation_level > 1)
-       printf_filtered ("\n\032\032exited %d\n", exitstatus);
+       printf_filtered (("\n\032\032exited %d\n"), exitstatus);
     }
 }
 
@@ -149,35 +147,35 @@ annotate_signalled (void)
     deprecated_annotate_signalled_hook ();
 
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032signalled\n");
+    printf_filtered (("\n\032\032signalled\n"));
 }
 
 void
 annotate_signal_name (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032signal-name\n");
+    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");
+    printf_filtered (("\n\032\032signal-name-end\n"));
 }
 
 void
 annotate_signal_string (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032signal-string\n");
+    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");
+    printf_filtered (("\n\032\032signal-string-end\n"));
 }
 
 void
@@ -187,51 +185,51 @@ annotate_signal (void)
     deprecated_annotate_signal_hook ();
 
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032signal\n");
+    printf_filtered (("\n\032\032signal\n"));
 }
 \f
 void
 annotate_breakpoints_headers (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032breakpoints-headers\n");
+    printf_filtered (("\n\032\032breakpoints-headers\n"));
 }
 
 void
 annotate_field (int num)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032field %d\n", num);
+    printf_filtered (("\n\032\032field %d\n"), num);
 }
 
 void
 annotate_breakpoints_table (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032breakpoints-table\n");
+    printf_filtered (("\n\032\032breakpoints-table\n"));
 }
 
 void
 annotate_record (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032record\n");
+    printf_filtered (("\n\032\032record\n"));
 }
 
 void
 annotate_breakpoints_table_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032breakpoints-table-end\n");
+    printf_filtered (("\n\032\032breakpoints-table-end\n"));
 }
 
 void
 annotate_frames_invalid (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       target_terminal_ours ();
-      printf_unfiltered ("\n\032\032frames-invalid\n");
+      printf_unfiltered (("\n\032\032frames-invalid\n"));
     }
 }
 
@@ -240,9 +238,9 @@ annotate_field_begin (struct type *type)
 {
   if (annotation_level == 2)
     {
-      printf_filtered ("\n\032\032field-begin ");
+      printf_filtered (("\n\032\032field-begin "));
       print_value_flags (type);
-      printf_filtered ("\n");
+      printf_filtered (("\n"));
     }
 }
 
@@ -250,35 +248,35 @@ void
 annotate_field_name_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032field-name-end\n");
+    printf_filtered (("\n\032\032field-name-end\n"));
 }
 
 void
 annotate_field_value (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032field-value\n");
+    printf_filtered (("\n\032\032field-value\n"));
 }
 
 void
 annotate_field_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032field-end\n");
+    printf_filtered (("\n\032\032field-end\n"));
 }
 \f
 void
 annotate_quit (void)
 {
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032quit\n");
+    printf_filtered (("\n\032\032quit\n"));
 }
 
 void
 annotate_error (void)
 {
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032error\n");
+    printf_filtered (("\n\032\032error\n"));
 }
 
 void
@@ -293,9 +291,9 @@ annotate_value_history_begin (int histindex, struct type *type)
 {
   if (annotation_level == 2)
     {
-      printf_filtered ("\n\032\032value-history-begin %d ", histindex);
+      printf_filtered (("\n\032\032value-history-begin %d "), histindex);
       print_value_flags (type);
-      printf_filtered ("\n");
+      printf_filtered (("\n"));
     }
 }
 
@@ -304,9 +302,9 @@ annotate_value_begin (struct type *type)
 {
   if (annotation_level == 2)
     {
-      printf_filtered ("\n\032\032value-begin ");
+      printf_filtered (("\n\032\032value-begin "));
       print_value_flags (type);
-      printf_filtered ("\n");
+      printf_filtered (("\n"));
     }
 }
 
@@ -314,84 +312,84 @@ void
 annotate_value_history_value (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032value-history-value\n");
+    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");
+    printf_filtered (("\n\032\032value-history-end\n"));
 }
 
 void
 annotate_value_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032value-end\n");
+    printf_filtered (("\n\032\032value-end\n"));
 }
 
 void
 annotate_display_begin (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032display-begin\n");
+    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");
+    printf_filtered (("\n\032\032display-number-end\n"));
 }
 
 void
 annotate_display_format (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032display-format\n");
+    printf_filtered (("\n\032\032display-format\n"));
 }
 
 void
 annotate_display_expression (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032display-expression\n");
+    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");
+    printf_filtered (("\n\032\032display-expression-end\n"));
 }
 
 void
 annotate_display_value (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032display-value\n");
+    printf_filtered (("\n\032\032display-value\n"));
 }
 
 void
 annotate_display_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032display-end\n");
+    printf_filtered (("\n\032\032display-end\n"));
 }
 
 void
 annotate_arg_begin (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032arg-begin\n");
+    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");
+    printf_filtered (("\n\032\032arg-name-end\n"));
 }
 
 void
@@ -399,9 +397,9 @@ annotate_arg_value (struct type *type)
 {
   if (annotation_level == 2)
     {
-      printf_filtered ("\n\032\032arg-value ");
+      printf_filtered (("\n\032\032arg-value "));
       print_value_flags (type);
-      printf_filtered ("\n");
+      printf_filtered (("\n"));
     }
 }
 
@@ -409,32 +407,32 @@ void
 annotate_arg_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032arg-end\n");
+    printf_filtered (("\n\032\032arg-end\n"));
 }
 
 void
 annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc)
 {
   if (annotation_level > 1)
-    printf_filtered ("\n\032\032source ");
+    printf_filtered (("\n\032\032source "));
   else
-    printf_filtered ("\032\032");
+    printf_filtered (("\032\032"));
 
-  printf_filtered ("%s:%d:%d:%s:0x", filename,
+  printf_filtered (("%s:%d:%d:%s:0x"), filename,
                   line, character,
                   mid ? "middle" : "beg");
-  print_address_numeric (pc, 0, gdb_stdout);
-  printf_filtered ("\n");
+  deprecated_print_address_numeric (pc, 0, gdb_stdout);
+  printf_filtered (("\n"));
 }
 
 void
 annotate_frame_begin (int level, CORE_ADDR pc)
 {
-  if (annotation_level == 2)
+  if (annotation_level > 1)
     {
-      printf_filtered ("\n\032\032frame-begin %d 0x", level);
-      print_address_numeric (pc, 0, gdb_stdout);
-      printf_filtered ("\n");
+      printf_filtered (("\n\032\032frame-begin %d 0x"), level);
+      deprecated_print_address_numeric (pc, 0, gdb_stdout);
+      printf_filtered (("\n"));
     }
 }
 
@@ -442,91 +440,91 @@ void
 annotate_function_call (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032function-call\n");
+    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");
+    printf_filtered (("\n\032\032signal-handler-caller\n"));
 }
 
 void
 annotate_frame_address (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032frame-address\n");
+    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");
+    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");
+    printf_filtered (("\n\032\032frame-function-name\n"));
 }
 
 void
 annotate_frame_args (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032frame-args\n");
+    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");
+    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");
+    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");
+    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");
+    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");
+    printf_filtered (("\n\032\032frame-source-end\n"));
 }
 
 void
 annotate_frame_where (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032frame-where\n");
+    printf_filtered (("\n\032\032frame-where\n"));
 }
 
 void
 annotate_frame_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032frame-end\n");
+    printf_filtered (("\n\032\032frame-end\n"));
 }
 \f
 void
@@ -534,9 +532,9 @@ annotate_array_section_begin (int index, struct type *elttype)
 {
   if (annotation_level == 2)
     {
-      printf_filtered ("\n\032\032array-section-begin %d ", index);
+      printf_filtered (("\n\032\032array-section-begin %d "), index);
       print_value_flags (elttype);
-      printf_filtered ("\n");
+      printf_filtered (("\n"));
     }
 }
 
@@ -544,28 +542,28 @@ void
 annotate_elt_rep (unsigned int repcount)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032elt-rep %u\n", repcount);
+    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");
+    printf_filtered (("\n\032\032elt-rep-end\n"));
 }
 
 void
 annotate_elt (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032elt\n");
+    printf_filtered (("\n\032\032elt\n"));
 }
 
 void
 annotate_array_section_end (void)
 {
   if (annotation_level == 2)
-    printf_filtered ("\n\032\032array-section-end\n");
+    printf_filtered (("\n\032\032array-section-end\n"));
 }
 
 static void
@@ -577,7 +575,7 @@ breakpoint_changed (struct breakpoint *b)
 void
 _initialize_annotate (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       deprecated_delete_breakpoint_hook = breakpoint_changed;
       deprecated_modify_breakpoint_hook = breakpoint_changed;