gdb/

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

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 1645c38b6e1889eeffc1468b932ea406ffb2e2b1..f86b806f37c96567ec9dfbdeec4092675e01b804 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -32,12 +32,6 @@
 
 static int fetch_inferior_event_wrapper (gdb_client_data client_data);
 
-void
-inferior_event_handler_wrapper (gdb_client_data client_data)
-{
-  inferior_event_handler (INF_QUIT_REQ, client_data);
-}
-
 /* General function to handle events in the inferior.  So far it just
    takes care of detecting errors reported by select() or poll(),
    otherwise it assumes that all is OK, and goes on reading data from
@@ -51,25 +45,16 @@ inferior_event_handler (enum inferior_event_type event_type,
 
   switch (event_type)
     {
-    case INF_ERROR:
-      printf_unfiltered (_("error detected from target.\n"));
-      pop_all_targets_above (file_stratum, 0);
-      discard_all_intermediate_continuations ();
-      discard_all_continuations ();
-      async_enable_stdin ();
-      break;
-
     case INF_REG_EVENT:
       /* Use 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 get rid of the target.  */
+        the target, just cancel the current command.  */
       if (!catch_errors (fetch_inferior_event_wrapper, 
                         client_data, "", RETURN_MASK_ALL))
        {
-         pop_all_targets_above (file_stratum, 0);
-         discard_all_intermediate_continuations ();
-         discard_all_continuations ();
+         do_all_intermediate_continuations (1);
+         do_all_continuations (1);
          async_enable_stdin ();
          display_gdb_prompt (0);
        }
@@ -95,7 +80,7 @@ inferior_event_handler (enum inferior_event_type event_type,
       /* Do all continuations associated with the whole inferior (not
         a particular thread).  */
       if (!ptid_equal (inferior_ptid, null_ptid))
-       do_all_inferior_continuations ();
+       do_all_inferior_continuations (0);
 
       /* If we were doing a multi-step (eg: step n, next n), but it
         got interrupted by a breakpoint, still do the pending
@@ -107,9 +92,9 @@ inferior_event_handler (enum inferior_event_type event_type,
       if (non_stop
          && target_has_execution
          && !ptid_equal (inferior_ptid, null_ptid))
-       do_all_intermediate_continuations_thread (inferior_thread ());
+       do_all_intermediate_continuations_thread (inferior_thread (), 0);
       else
-       do_all_intermediate_continuations ();
+       do_all_intermediate_continuations (0);
 
       /* Always finish the previous command before running any
         breakpoint commands.  Any stop cancels the previous command.
@@ -118,9 +103,9 @@ inferior_event_handler (enum inferior_event_type event_type,
       if (non_stop
          && target_has_execution
          && !ptid_equal (inferior_ptid, null_ptid))
-       do_all_continuations_thread (inferior_thread ());
+       do_all_continuations_thread (inferior_thread (), 0);
       else
-       do_all_continuations ();
+       do_all_continuations (0);
 
       if (info_verbose
          && current_language != expected_language
@@ -147,16 +132,9 @@ inferior_event_handler (enum inferior_event_type event_type,
          complete?  */
 
       if (non_stop)
-       do_all_intermediate_continuations_thread (inferior_thread ());
+       do_all_intermediate_continuations_thread (inferior_thread (), 0);
       else
-       do_all_intermediate_continuations ();
-      break;
-
-    case INF_QUIT_REQ: 
-      /* FIXME: ezannoni 1999-10-04.  This call should really be a
-        target vector entry, so that it can be used for any kind of
-        targets.  */
-      async_remote_interrupt_twice (NULL);
+       do_all_intermediate_continuations (0);
       break;
 
     case INF_TIMER: