From 347bddb745acda8fb591511a547e66bbe00d768b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 8 Sep 2008 21:46:21 +0000 Subject: * inferior.h (stop_bpstat): Delete. * breakpoint.h (bpstat_do_actions): Remove bpstat* argument. * breakpoint.c (bpstat_do_actions): Rename to ... (bpstat_do_actions_1): ... this. Make static. Change return type to int. Return true if a breakpoint proceeded. (bpstat_do_actions): New, as wrapper around bpstat_do_actions_1. (delete_breakpoint): Don't reference the global stop_bpstat; it's gone. * gdbthread.h (struct thread_info): Add stop_bpstat. (save_infrun_state, load_infrun_state): Remove stop_bpstat argument. * thread.c (load_infrun_state, save_infrun_state): Remove stop_bpstat argument, and the code referencing it. * infcall.c: Include "gdbthread.h". (call_function_by_hand): Adjust. * exceptions.c: Include "gdbthread.h". (throw_exception): Adjust. * infcmd.c (stop_bpstat): Delete. (continue_command): In all-stop, set the ignore count on the thread that reported the stop. In non-stop, set it on the current thread. (finish_command_continuation): Adjust. (program_info): Adjust. * infrun.c (clear_proceed_status): Adjust. (context_switch): Don't context-switch stop_bpstat. (handle_inferior_event): Adjust. (normal_stop): Adjust. (save_inferior_status, restore_inferior_status): Adjust. * inf-loop.c (inferior_event_handler): Remove parameter to bpstat_do_actions call. * top.c (command_loop): Remove parameter to bpstat_do_actions call. Call it unconditionally. * event-top.c (command_handler): Ditto. * python/python.c (execute_gdb_command): Ditto. --- gdb/python/python.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gdb/python/python.c') diff --git a/gdb/python/python.c b/gdb/python/python.c index 7186914..8bc24c2 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -241,27 +241,18 @@ execute_gdb_command (PyObject *self, PyObject *args) struct cmd_list_element *alias, *prefix, *cmd; char *arg, *newarg; volatile struct gdb_exception except; - struct cleanup *old_chain; if (! PyArg_ParseTuple (args, "s", &arg)) return NULL; - old_chain = make_cleanup (null_cleanup, 0); - TRY_CATCH (except, RETURN_MASK_ALL) { execute_command (arg, 0); } GDB_PY_HANDLE_EXCEPTION (except); - /* Do any commands attached to breakpoint we stopped at. Only if we - are always running synchronously. Or if we have just executed a - command that doesn't start the target. */ - if (!target_can_async_p () || !is_running (inferior_ptid)) - { - bpstat_do_actions (&stop_bpstat); - do_cleanups (old_chain); - } + /* Do any commands attached to breakpoint we stopped at. */ + bpstat_do_actions (); Py_RETURN_NONE; } -- cgit v1.1