Sync toplevel files with GCC

[deliverable/binutils-gdb.git] / gdb / inf-loop.c

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index f86b806f37c96567ec9dfbdeec4092675e01b804..eed881d5144e6a9a8538689c8576b70ed7a21570 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -1,6 +1,5 @@
 /* Handling of inferior events for the event loop for GDB, the GNU debugger.
-   Copyright (C) 1999, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -19,18 +18,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "inferior.h"          /* For fetch_inferior_event.  */
+#include "inferior.h"
+#include "infrun.h"
 #include "target.h"             /* For enum inferior_event_type.  */
 #include "event-loop.h"
 #include "event-top.h"
 #include "inf-loop.h"
 #include "remote.h"
-#include "exceptions.h"
 #include "language.h"
 #include "gdbthread.h"
 #include "continuations.h"
-
-static int fetch_inferior_event_wrapper (gdb_client_data client_data);
+#include "interps.h"
+#include "top.h"
+#include "observer.h"
 
 /* General function to handle events in the inferior.  So far it just
    takes care of detecting errors reported by select() or poll(),
@@ -40,43 +40,43 @@ void
 inferior_event_handler (enum inferior_event_type event_type, 
                        gdb_client_data client_data)
 {
-  struct gdb_exception e;
-  int was_sync = 0;
+  struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup ();
 
   switch (event_type)
     {
     case INF_REG_EVENT:
-      /* Use catch errors for now, until the inner layers of
+      /* Catch errors for now, until the inner layers of
         fetch_inferior_event (i.e. readchar) can return meaningful
         error status.  If an error occurs while getting an event from
         the target, just cancel the current command.  */
-      if (!catch_errors (fetch_inferior_event_wrapper, 
-                        client_data, "", RETURN_MASK_ALL))
-       {
-         do_all_intermediate_continuations (1);
-         do_all_continuations (1);
-         async_enable_stdin ();
-         display_gdb_prompt (0);
-       }
+      {
+
+       TRY
+         {
+           fetch_inferior_event (client_data);
+         }
+       CATCH (ex, RETURN_MASK_ALL)
+         {
+           bpstat_clear_actions ();
+           do_all_intermediate_continuations (1);
+           do_all_continuations (1);
+
+           throw_exception (ex);
+         }
+       END_CATCH
+      }
       break;
 
     case INF_EXEC_COMPLETE:
-
       if (!non_stop)
        {
          /* Unregister the inferior from the event loop.  This is done
             so that when the inferior is not running we don't get
             distracted by spurious inferior output.  */
          if (target_has_execution)
-           target_async (NULL, 0);
+           target_async (0);
        }
 
-      /* The call to async_enable_stdin below resets 'sync_execution'.
-        However, if sync_execution is 1 now, we also need to show the
-        prompt below, so save the current value.  */
-      was_sync = sync_execution;
-      async_enable_stdin ();
-
       /* Do all continuations associated with the whole inferior (not
         a particular thread).  */
       if (!ptid_equal (inferior_ptid, null_ptid))
@@ -107,24 +107,26 @@ inferior_event_handler (enum inferior_event_type event_type,
       else
        do_all_continuations (0);
 
-      if (info_verbose
-         && current_language != expected_language
-         && language_mode == language_mode_auto)
-       language_info (1);      /* Print what changed.  */
-
-      /* Don't propagate breakpoint commands errors.  Either we're
-        stopping or some command resumes the inferior.  The user will
-        be informed.  */
-      TRY_CATCH (e, RETURN_MASK_ALL)
+      /* When running a command list (from a user command, say), these
+        are only run when the command list is all done.  */
+      if (interpreter_async)
        {
-         bpstat_do_actions ();
-       }
 
-      if (!was_sync
-         && exec_done_display_p
-         && (ptid_equal (inferior_ptid, null_ptid)
-             || !is_running (inferior_ptid)))
-       printf_unfiltered (_("completed.\n"));
+         check_frame_language_change ();
+
+         /* Don't propagate breakpoint commands errors.  Either we're
+            stopping or some command resumes the inferior.  The user will
+            be informed.  */
+         TRY
+           {
+             bpstat_do_actions ();
+           }
+         CATCH (e, RETURN_MASK_ALL)
+           {
+             exception_print (gdb_stderr, e);
+           }
+         END_CATCH
+       }
       break;
 
     case INF_EXEC_CONTINUE:
@@ -142,11 +144,6 @@ inferior_event_handler (enum inferior_event_type event_type,
       printf_unfiltered (_("Event type not recognized.\n"));
       break;
     }
-}
 
-static int 
-fetch_inferior_event_wrapper (gdb_client_data client_data)
-{
-  fetch_inferior_event (client_data);
-  return 1;
+  discard_cleanups (cleanup_if_error);
 }