Add "executing" property to threads.

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

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 487aa57a0e40198187d05cd895c01640b64e6a26..3f98bfcaa15d2e89d155186616e6f820e66a7e04 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -1,12 +1,12 @@
 /* Handling of inferior events for the event loop for GDB, the GNU debugger.
 /* Handling of inferior events for the event loop for GDB, the GNU debugger.

-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2007, 2008 Free Software Foundation, Inc.

    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    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
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    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 +15,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., 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 "inferior.h"          /* For fetch_inferior_event. */
 
 #include "defs.h"
 #include "inferior.h"          /* For fetch_inferior_event. */


@@ -26,9 +24,11 @@
 #include "event-top.h"
 #include "inf-loop.h"
 #include "remote.h"
 #include "event-top.h"
 #include "inf-loop.h"
 #include "remote.h"

+#include "exceptions.h"
+#include "language.h"
+#include "gdbthread.h"

 
 static int fetch_inferior_event_wrapper (gdb_client_data client_data);
 
 static int fetch_inferior_event_wrapper (gdb_client_data client_data);

-static void complete_execution (void);

 
 void
 inferior_event_handler_wrapper (gdb_client_data client_data)
 
 void
 inferior_event_handler_wrapper (gdb_client_data client_data)


@@ -44,14 +44,16 @@ void
 inferior_event_handler (enum inferior_event_type event_type, 
                        gdb_client_data client_data)
 {
 inferior_event_handler (enum inferior_event_type event_type, 
                        gdb_client_data client_data)
 {

+  struct gdb_exception e;
+  int was_sync = 0;

   switch (event_type)
     {
     case INF_ERROR:
   switch (event_type)
     {
     case INF_ERROR:

-      printf_unfiltered ("error detected from target.\n");
+      printf_unfiltered (_("error detected from target.\n"));

       target_async (NULL, 0);
       pop_target ();
       target_async (NULL, 0);
       pop_target ();

-      discard_all_continuations ();
-      do_exec_error_cleanups (ALL_CLEANUPS);
+      do_all_continuations (1);
+      async_enable_stdin ();

       break;
 
     case INF_REG_EVENT:
       break;
 
     case INF_REG_EVENT:


@@ -64,18 +66,72 @@ inferior_event_handler (enum inferior_event_type event_type,
        {
          target_async (NULL, 0);
          pop_target ();
        {
          target_async (NULL, 0);
          pop_target ();

-         discard_all_continuations ();
-         do_exec_error_cleanups (ALL_CLEANUPS);
+         do_all_continuations (1);
+         async_enable_stdin ();

          display_gdb_prompt (0);
        }
       break;
 
     case INF_EXEC_COMPLETE:
          display_gdb_prompt (0);
        }
       break;
 
     case INF_EXEC_COMPLETE:

+      /* 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);
+
+      /* 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 ();
+
+      /* If we were doing a multi-step (eg: step n, next n), but it
+        got interrupted by a breakpoint, still do the pending
+        continuations.  The continuation itself is responsible for
+        distinguishing the cases.  The continuations are allowed to
+        touch the inferior memory, e.g. to remove breakpoints, so run
+        them before running breakpoint commands, which may resume the
+        target.  */
+      do_all_intermediate_continuations (0);
+
+      /* Always finish the previous command before running any
+        breakpoint commands.  Any stop cancels the previous command.
+        E.g. a "finish" or "step-n" command interrupted by an
+        unrelated breakpoint is canceled.  */
+      do_all_continuations (0);
+
+      if (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)
+       {
+         bpstat_do_actions (&stop_bpstat);
+       }
+
+      /* If no breakpoint command resumed the inferior, prepare for
+        interaction with the user.  */
+      if (!is_running (inferior_ptid))
+       {
+         if (was_sync)
+           {
+             display_gdb_prompt (0);
+           }
+         else
+           {
+             if (exec_done_display_p)
+               printf_unfiltered (_("completed.\n"));
+           }
+       }
+      break;
+
+    case INF_EXEC_CONTINUE:

       /* Is there anything left to do for the command issued to
          complete? */
       /* Is there anything left to do for the command issued to
          complete? */

-      do_all_continuations ();
-      /* Reset things after target has stopped for the async commands. */
-      complete_execution ();
+      do_all_intermediate_continuations (0);

       break;
 
     case INF_QUIT_REQ: 
       break;
 
     case INF_QUIT_REQ: 


@@ -87,7 +143,7 @@ inferior_event_handler (enum inferior_event_type event_type,
 
     case INF_TIMER:
     default:
 
     case INF_TIMER:
     default:

-      printf_unfiltered ("Event type not recognized.\n");
+      printf_unfiltered (_("Event type not recognized.\n"));

       break;
     }
 }
       break;
     }
 }


@@ -98,29 +154,3 @@ fetch_inferior_event_wrapper (gdb_client_data client_data)
   fetch_inferior_event (client_data);
   return 1;
 }
   fetch_inferior_event (client_data);
   return 1;
 }

-
-/* Reset proper settings after an asynchronous command has finished.
-   If the execution command was in synchronous mode, register stdin
-   with the event loop, and reset the prompt. */
-
-static void
-complete_execution (void)
-{
-  target_executing = 0;
-  
-  /* 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. */
-  target_async (NULL, 0);
-
-  if (sync_execution)
-    {
-      do_exec_error_cleanups (ALL_CLEANUPS);
-      display_gdb_prompt (0);
-    }
-  else
-    {
-      if (exec_done_display_p)
-       printf_unfiltered ("completed.\n");
-    }
-}