/* 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-2014 Free Software Foundation, Inc.
Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
This file is part of GDB.
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);
-
-void
-inferior_event_handler_wrapper (gdb_client_data client_data)
-{
- inferior_event_handler (INF_QUIT_REQ, 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(),
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_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
+ /* 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. */
- 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 ();
- async_enable_stdin ();
- display_gdb_prompt (0);
- }
+ the target, just cancel the current command. */
+ {
+ volatile struct gdb_exception ex;
+
+ TRY_CATCH (ex, RETURN_MASK_ALL)
+ {
+ fetch_inferior_event (client_data);
+ }
+ if (ex.reason < 0)
+ {
+ bpstat_clear_actions ();
+ do_all_intermediate_continuations (1);
+ do_all_continuations (1);
+
+ throw_exception (ex);
+ }
+ }
break;
case INF_EXEC_COMPLETE:
-
if (!non_stop)
{
/* Unregister the inferior from the event loop. This is done
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 ();
-
/* 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
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.
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
- && 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 ();
+ 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)
+ {
+ bpstat_do_actions ();
+ }
+ exception_print (gdb_stderr, e);
}
-
- if (!was_sync
- && exec_done_display_p
- && (ptid_equal (inferior_ptid, null_ptid)
- || !is_running (inferior_ptid)))
- printf_unfiltered (_("completed.\n"));
break;
case INF_EXEC_CONTINUE:
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:
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);
}