X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Finf-loop.c;h=f0d8def14157c5c0e6da3aae8fb6c11cdb443b18;hb=cedfc77485dbb566619dc1e2d729ce0a70d1a4ad;hp=e19056766f8c3d7d810da2c6dbb359929688c2cb;hpb=7b0e8051319071c234fd682d459148922622c35d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c index e19056766f..f0d8def141 100644 --- 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, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1999-2019 Free Software Foundation, Inc. Written by Elena Zannoni of Cygnus Solutions. This file is part of GDB. @@ -15,156 +15,79 @@ 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, see . */ + along with this program. If not, see . */ #include "defs.h" -#include "inferior.h" /* For fetch_inferior_event. */ -#include "target.h" /* For enum inferior_event_type. */ +#include "inferior.h" +#include "infrun.h" #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" +#include "observable.h" -static int fetch_inferior_event_wrapper (gdb_client_data client_data); +/* General function to handle events in the inferior. */ -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 - the fd. This however may not always be what we want to do. */ void 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: - 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. */ - 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); - } + fetch_inferior_event (client_data); break; case INF_EXEC_COMPLETE: - if (!non_stop) { - /* Unregister the inferior from the event loop. This is done + /* 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); + if (target_has_execution && target_can_async_p ()) + 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)) - do_all_inferior_continuations (); - - /* 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. */ - if (non_stop - && target_has_execution - && !ptid_equal (inferior_ptid, null_ptid)) - do_all_intermediate_continuations_thread (inferior_thread ()); - else - do_all_intermediate_continuations (); + if (inferior_ptid != null_ptid) + do_all_inferior_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. */ - if (non_stop - && target_has_execution - && !ptid_equal (inferior_ptid, null_ptid)) - do_all_continuations_thread (inferior_thread ()); - else - do_all_continuations (); - - 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) + /* When running a command list (from a user command, say), these + are only run when the command list is all done. */ + if (current_ui->async) { - bpstat_do_actions (); + 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 (const gdb_exception &e) + { + /* If the user was running a foreground execution + command, then propagate the error so that the prompt + can be reenabled. Otherwise, the user already has + the prompt and is typing some unrelated command, so + just inform the user and swallow the exception. */ + if (current_ui->prompt_state == PROMPT_BLOCKED) + throw; + else + 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: - /* Is there anything left to do for the command issued to - complete? */ - - if (non_stop) - do_all_intermediate_continuations_thread (inferior_thread ()); - 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); - break; - - case INF_TIMER: default: 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; -}