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 739785c1aeed6f3d8bcacd878fbe478350f709bf..eed881d5144e6a9a8538689c8576b70ed7a21570 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -1,5 +1,5 @@
 /* Handling of inferior events for the event loop for GDB, the GNU debugger.
-   Copyright (C) 1999, 2007-2012 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.
@@ -18,20 +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"
 #include "interps.h"
 #include "top.h"
-
-static int fetch_inferior_event_wrapper (gdb_client_data client_data);
+#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(),
@@ -46,19 +45,26 @@ inferior_event_handler (enum inferior_event_type event_type,
   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))
-       {
-         bpstat_clear_actions ();
-         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:
@@ -68,7 +74,7 @@ inferior_event_handler (enum inferior_event_type event_type,
             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);
        }
 
       /* Do all continuations associated with the whole inferior (not
@@ -105,18 +111,21 @@ inferior_event_handler (enum inferior_event_type event_type,
         are only run when the command list is all done.  */
       if (interpreter_async)
        {
-         volatile struct gdb_exception e;
 
          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_CATCH (e, RETURN_MASK_ALL)
+         TRY
            {
              bpstat_do_actions ();
            }
-         exception_print (gdb_stderr, e);
+         CATCH (e, RETURN_MASK_ALL)
+           {
+             exception_print (gdb_stderr, e);
+           }
+         END_CATCH
        }
       break;
 
@@ -138,10 +147,3 @@ inferior_event_handler (enum inferior_event_type event_type,
 
   discard_cleanups (cleanup_if_error);
 }
-
-static int 
-fetch_inferior_event_wrapper (gdb_client_data client_data)
-{
-  fetch_inferior_event (client_data);
-  return 1;
-}