diff options
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-cmd-catch.c | 72 | ||||
| -rw-r--r-- | gdb/mi/mi-cmds.c | 2 | ||||
| -rw-r--r-- | gdb/mi/mi-cmds.h | 1 |
3 files changed, 73 insertions, 2 deletions
diff --git a/gdb/mi/mi-cmd-catch.c b/gdb/mi/mi-cmd-catch.c index a0f311a..078e73a 100644 --- a/gdb/mi/mi-cmd-catch.c +++ b/gdb/mi/mi-cmd-catch.c @@ -157,8 +157,76 @@ mi_cmd_catch_exception (const char *cmd, char *argv[], int argc) if (exception_name != NULL) exception_name = xstrdup (exception_name); create_ada_exception_catchpoint (gdbarch, ex_kind, - exception_name, condition, - temp, enabled, 0); + exception_name, + condition, temp, enabled, 0); +} + +/* Handler for the -catch-handlers command. */ + +void +mi_cmd_catch_handlers (const char *cmd, char *argv[], int argc) +{ + struct gdbarch *gdbarch = get_current_arch (); + std::string condition; + int enabled = 1; + char *exception_name = NULL; + int temp = 0; + + int oind = 0; + char *oarg; + + enum opt + { + OPT_CONDITION, OPT_DISABLED, OPT_EXCEPTION_NAME, OPT_TEMP + }; + static const struct mi_opt opts[] = + { + { "c", OPT_CONDITION, 1}, + { "d", OPT_DISABLED, 0 }, + { "e", OPT_EXCEPTION_NAME, 1 }, + { "t", OPT_TEMP, 0 }, + { 0, 0, 0 } + }; + + for (;;) + { + int opt = mi_getopt ("-catch-handlers", argc, argv, opts, + &oind, &oarg); + + if (opt < 0) + break; + + switch ((enum opt) opt) + { + case OPT_CONDITION: + condition.assign (oarg); + break; + case OPT_DISABLED: + enabled = 0; + break; + case OPT_EXCEPTION_NAME: + exception_name = oarg; + break; + case OPT_TEMP: + temp = 1; + break; + } + } + + /* This command does not accept any argument. Make sure the user + did not provide any. */ + if (oind != argc) + error (_("Invalid argument: %s"), argv[oind]); + + scoped_restore restore_breakpoint_reporting + = setup_breakpoint_reporting (); + /* create_ada_exception_catchpoint needs EXCEPTION_NAME to be + xstrdup'ed, and will assume control of its lifetime. */ + if (exception_name != NULL) + exception_name = xstrdup (exception_name); + create_ada_exception_catchpoint (gdbarch, ada_catch_handlers, + exception_name, + condition, temp, enabled, 0); } /* Common path for the -catch-load and -catch-unload. */ diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c index c9ffda1..51014ed 100644 --- a/gdb/mi/mi-cmds.c +++ b/gdb/mi/mi-cmds.c @@ -69,6 +69,8 @@ static struct mi_cmd mi_cmds[] = &mi_suppress_notification.breakpoint), DEF_MI_CMD_MI_1 ("catch-exception", mi_cmd_catch_exception, &mi_suppress_notification.breakpoint), + DEF_MI_CMD_MI_1 ("catch-handlers", mi_cmd_catch_handlers, + &mi_suppress_notification.breakpoint), DEF_MI_CMD_MI_1 ("catch-load", mi_cmd_catch_load, &mi_suppress_notification.breakpoint), DEF_MI_CMD_MI_1 ("catch-unload", mi_cmd_catch_unload, diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index c27f3ba..af96585 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -41,6 +41,7 @@ extern mi_cmd_argv_ftype mi_cmd_break_passcount; extern mi_cmd_argv_ftype mi_cmd_break_watch; extern mi_cmd_argv_ftype mi_cmd_catch_assert; extern mi_cmd_argv_ftype mi_cmd_catch_exception; +extern mi_cmd_argv_ftype mi_cmd_catch_handlers; extern mi_cmd_argv_ftype mi_cmd_catch_load; extern mi_cmd_argv_ftype mi_cmd_catch_unload; extern mi_cmd_argv_ftype mi_cmd_disassemble; |