Move PTRACE_GETREGSET and PTRACE_SETREGSET to nat/linux-ptrace.h

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

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 188c88fdfa80b86613babc9ecc36aa24a25f86b6..3e257c44feabe72cbcad67654602cea03d7b3652 100644 (file)
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,12 +1,11 @@
 /* Annotation routines for GDB.
 /* Annotation routines for GDB.

-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 "defs.h"
 #include "annotate.h"


@@ -25,23 +22,39 @@
 #include "target.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"
 #include "target.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"

+#include "observer.h"
+#include "inferior.h"
+#include "infrun.h"

 \f
 
 \f
 

-/* Prototypes for local functions. */
+/* Prototypes for local functions.  */

 
 extern void _initialize_annotate (void);
 
 static void print_value_flags (struct type *);
 
 
 extern void _initialize_annotate (void);
 
 static void print_value_flags (struct type *);
 

-static void breakpoint_changed (struct breakpoint *);
+static void breakpoint_changed (struct breakpoint *b);
+

 
 

-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_signalled_hook) (void);
 void (*deprecated_annotate_signal_hook) (void);

-void (*deprecated_annotate_exited_hook) (void);

 
 

-static int ignore_count_changed = 0;
+/* 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;
+
+/* True if the target can async, and a synchronous execution command
+   is not in progress.  If true, input is accepted, so don't suppress
+   annotations.  */
+
+static int
+async_background_execution_p (void)
+{
+  return (target_can_async_p () && !sync_execution);
+}

 
 static void
 print_value_flags (struct type *t)
 
 static void
 print_value_flags (struct type *t)


@@ -51,30 +64,27 @@ print_value_flags (struct type *t)
   else
     printf_filtered (("-"));
 }
   else
     printf_filtered (("-"));
 }

-\f
-void
-breakpoints_changed (void)
+
+static void
+annotate_breakpoints_invalid (void)

 {
 {

-  if (annotation_level == 2)
+  if (annotation_level == 2
+      && (!breakpoints_invalid_emitted
+         || async_background_execution_p ()))

     {
     {

-      target_terminal_ours ();
+      /* 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"));
       printf_unfiltered (("\n\032\032breakpoints-invalid\n"));

-      if (ignore_count_changed)
-       ignore_count_changed = 0;       /* Avoid multiple break annotations. */
-    }
-}

 
 

-/* The GUI needs to be informed of ignore_count changes, but we don't
-   want to provide successive multiple breakpoints-invalid messages
-   that are all caused by the fact that the ignore count is changing
-   (which could keep the GUI very busy).  One is enough, after the
-   target actually "stops". */
+      if (was_inferior)
+       target_terminal_inferior ();

 
 

-void
-annotate_ignore_count_change (void)
-{
-  if (annotation_level > 1)
-    ignore_count_changed = 1;
+      breakpoints_invalid_emitted = 1;
+    }

 }
 
 void
 }
 
 void


@@ -101,45 +111,22 @@ annotate_watchpoint (int num)
 void
 annotate_starting (void)
 {
 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)
 {
 }
 
 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 && ignore_count_changed)
-    {
-      ignore_count_changed = 0;
-      breakpoints_changed ();
-    }
+  if (annotation_level > 1)
+    printf_filtered (("\n\032\032stopped\n"));

 }
 
 void
 annotate_exited (int exitstatus)
 {
 }
 
 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


@@ -228,10 +215,40 @@ annotate_breakpoints_table_end (void)
 void
 annotate_frames_invalid (void)
 {
 void
 annotate_frames_invalid (void)
 {

-  if (annotation_level == 2)
+  if (annotation_level == 2
+      && (!frames_invalid_emitted
+         || async_background_execution_p ()))

     {
     {

-      target_terminal_ours ();
+      /* 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"));
       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"));

     }
 }
 
     }
 }
 


@@ -413,29 +430,24 @@ annotate_arg_end (void)
 }
 
 void
 }
 
 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"));
 
 {
   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
 }
 
 void

-annotate_frame_begin (int level, CORE_ADDR pc)
+annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)

 {
 {

-  if (annotation_level == 2)
-    {
-      printf_filtered (("\n\032\032frame-begin %d 0x"), level);
-      deprecated_print_address_numeric (pc, 0, gdb_stdout);
-      printf_filtered (("\n"));
-    }
+  if (annotation_level > 1)
+    printf_filtered (("\n\032\032frame-begin %d %s\n"),
+                    level, paddress (gdbarch, pc));

 }
 
 void
 }
 
 void


@@ -530,11 +542,11 @@ annotate_frame_end (void)
 }
 \f
 void
 }
 \f
 void

-annotate_array_section_begin (int index, struct type *elttype)
+annotate_array_section_begin (int idx, struct type *elttype)

 {
   if (annotation_level == 2)
     {
 {
   if (annotation_level == 2)
     {

-      printf_filtered (("\n\032\032array-section-begin %d "), index);
+      printf_filtered (("\n\032\032array-section-begin %d "), idx);

       print_value_flags (elttype);
       printf_filtered (("\n"));
     }
       print_value_flags (elttype);
       printf_filtered (("\n"));
     }


@@ -568,18 +580,30 @@ annotate_array_section_end (void)
     printf_filtered (("\n\032\032array-section-end\n"));
 }
 
     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)
 {
 static void
 breakpoint_changed (struct breakpoint *b)
 {

-  breakpoints_changed ();
+  if (b->number <= 0)
+    return;
+
+  annotate_breakpoints_invalid ();

 }
 
 void
 _initialize_annotate (void)
 {
 }
 
 void
 _initialize_annotate (void)
 {

-  if (annotation_level == 2)
-    {
-      deprecated_delete_breakpoint_hook = breakpoint_changed;
-      deprecated_modify_breakpoint_hook = breakpoint_changed;
-    }
+  observer_attach_breakpoint_created (breakpoint_changed);
+  observer_attach_breakpoint_deleted (breakpoint_changed);
+  observer_attach_breakpoint_modified (breakpoint_changed);

 }
 }