From 91985142973d550628c61d201e0a7cd3e36cd5b3 Mon Sep 17 00:00:00 2001 From: Mircea Gherzan Date: Wed, 12 Dec 2012 21:20:13 +0000 Subject: MI: add the -catch-load and -catch-unload commands They are equivalent to "catch load" and "catch unload" from CLI. Rationale: GUIs might be interested in catching solib load or unload events. 2012-11-16 Mircea Gherzan * Makefile.in (SUBDIR_MI_OBS): Add mi-cmd-catch.o. (SUBDIR_MI_SRCS): Add mi/mi-cmd-catch.c. * breakpoint.c (add_solib_catchpoint): New function that can be used by both CLI and MI, factored out from catch_load_or_unload. (catch_load_or_unload): Strip it down and make it use the new add_solib_catchpoint. * breakpoint.h (add_solib_catchpoint): Declare it. * mi/mi-cmd-break.h: New file. * mi/mi-cmd-break.c: Include mi-cmd-break.h. (setup_breakpoint_reporting): New function used for both catchpoints and breakpoints. (mi_cmd_break_insert): Use setup_breakpoint_reporting. * mi/mi-cmd-catch.c: New file. * mi/mi-cmds.c (mi_cmds): Add the handlers for -catch-load and -catch-unload. * mi/mi-cmds.h: Declare the handlers for -catch-load and -catch-unload. --- gdb/mi/mi-cmd-break.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'gdb/mi/mi-cmd-break.c') diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 487d42d..a36e1ef 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -29,6 +29,7 @@ #include "exceptions.h" #include "observer.h" #include "mi-main.h" +#include "mi-cmd-break.h" enum { @@ -59,6 +60,30 @@ enum bp_type REGEXP_BP }; +/* Arrange for all new breakpoints and catchpoints to be reported to + CURRENT_UIOUT until the cleanup returned by this function is run. + + Note that MI output will be probably invalid if more than one + breakpoint is created inside one MI command. */ + +struct cleanup * +setup_breakpoint_reporting (void) +{ + struct cleanup *rev_flag; + + if (! mi_breakpoint_observers_installed) + { + observer_attach_breakpoint_created (breakpoint_notify); + mi_breakpoint_observers_installed = 1; + } + + rev_flag = make_cleanup_restore_integer (&mi_can_breakpoint_notify); + mi_can_breakpoint_notify = 1; + + return rev_flag; +} + + /* Implements the -break-insert command. See the MI manual for the list of possible options. */ @@ -144,14 +169,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc) address = argv[oind]; /* Now we have what we need, let's insert the breakpoint! */ - if (! mi_breakpoint_observers_installed) - { - observer_attach_breakpoint_created (breakpoint_notify); - mi_breakpoint_observers_installed = 1; - } - - back_to = make_cleanup_restore_integer (&mi_can_breakpoint_notify); - mi_can_breakpoint_notify = 1; + back_to = setup_breakpoint_reporting (); /* Note that to request a fast tracepoint, the client uses the "hardware" flag, although there's nothing of hardware related to -- cgit v1.1