+2013-10-11 Joel Brobecker <brobecker@adacore.com>
+
+ * breakpoint.h (init_ada_exception_breakpoint): Add parameter
+ "enabled".
+ * breakpoint.c (init_ada_exception_breakpoint): Add parameter
+ "enabled". Set B->ENABLE_STATE accordingly.
+ * ada-lang.h (ada_exception_catchpoint_kind): Move here from
+ ada-lang.c.
+ (create_ada_exception_catchpoint): Add declaration.
+ * ada-lang.c (ada_exception_catchpoint_kind): Move to ada-lang.h.
+ (create_ada_exception_catchpoint): Make non-static. Add new
+ parameter "disabled". Use it in call to
+ init_ada_exception_breakpoint.
+ (catch_ada_exception_command): Add parameter "enabled" in call
+ to create_ada_exception_catchpoint.
+ (catch_assert_command): Likewise.
+
+ * mi/mi-cmds.h (mi_cmd_catch_assert, mi_cmd_catch_exception):
+ Add declarations.
+ * mi/mi-cmds.c (mi_cmds): Add the "catch-assert" and
+ "catch-exception" commands.
+ * mi/mi-cmd-catch.c: Add #include "ada-lang.h".
+ (mi_cmd_catch_assert, mi_cmd_catch_exception): New functions.
+
2013-10-11 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (enum ada_exception_catchpoint_kind): Renames
variants of the runtime, we use a sniffer that will determine
the runtime variant used by the program being debugged. */
-/* The different types of catchpoints that we introduced for catching
- Ada exceptions. */
-
-enum ada_exception_catchpoint_kind
-{
- ada_catch_exception,
- ada_catch_exception_unhandled,
- ada_catch_assert
-};
-
/* Ada's standard exceptions. */
static char *standard_exc[] = {
FROM_TTY is the usual argument passed to all commands implementations. */
-static void
+void
create_ada_exception_catchpoint (struct gdbarch *gdbarch,
enum ada_exception_catchpoint_kind ex_kind,
char *excep_string,
char *cond_string,
int tempflag,
+ int disabled,
int from_tty)
{
struct ada_catchpoint *c;
c = XNEW (struct ada_catchpoint);
init_ada_exception_breakpoint (&c->base, gdbarch, sal, addr_string,
- ops, tempflag, from_tty);
+ ops, tempflag, disabled, from_tty);
c->excep_string = excep_string;
create_excep_cond_exprs (c);
if (cond_string != NULL)
&cond_string);
create_ada_exception_catchpoint (gdbarch, ex_kind,
excep_string, cond_string,
- tempflag, from_tty);
+ tempflag, 1 /* enabled */,
+ from_tty);
}
/* Split the arguments specified in a "catch assert" command.
catch_ada_assert_command_split (arg, &cond_string);
create_ada_exception_catchpoint (gdbarch, ada_catch_assert,
NULL, cond_string,
- tempflag, from_tty);
+ tempflag, 1 /* enabled */,
+ from_tty);
}
/* Operators */
/* Information about operators given special treatment in functions
ADA_SUBPROGRAM_RENAMING
};
+/* The different types of catchpoints that we introduced for catching
+ Ada exceptions. */
+
+enum ada_exception_catchpoint_kind
+{
+ ada_catch_exception,
+ ada_catch_exception_unhandled,
+ ada_catch_assert
+};
+
/* Ada task structures. */
struct ada_task_info
extern char *ada_name_for_lookup (const char *name);
+extern void create_ada_exception_catchpoint
+ (struct gdbarch *gdbarch, enum ada_exception_catchpoint_kind ex_kind,
+ char *excep_string, char *cond_string, int tempflag, int disabled,
+ int from_tty);
+
/* Tasking-related: ada-tasks.c */
extern int valid_task_id (int);
char *addr_string,
const struct breakpoint_ops *ops,
int tempflag,
+ int enabled,
int from_tty)
{
if (from_tty)
init_raw_breakpoint (b, gdbarch, sal, bp_breakpoint, ops);
- b->enable_state = bp_enabled;
+ b->enable_state = enabled ? bp_enabled : bp_disabled;
b->disposition = tempflag ? disp_del : disp_donttouch;
b->addr_string = addr_string;
b->language = language_ada;
char *addr_string,
const struct breakpoint_ops *ops,
int tempflag,
+ int enabled,
int from_tty);
extern void init_catchpoint (struct breakpoint *b,
#include "breakpoint.h"
#include "gdb.h"
#include "libiberty.h"
+#include "ada-lang.h"
#include "mi-cmds.h"
#include "mi-getopt.h"
#include "mi-cmd-break.h"
+/* Handler for the -catch-assert command. */
+
+void
+mi_cmd_catch_assert (char *cmd, char *argv[], int argc)
+{
+ struct gdbarch *gdbarch = get_current_arch();
+ char *condition = NULL;
+ int enabled = 1;
+ int temp = 0;
+
+ int oind = 0;
+ char *oarg;
+
+ enum opt
+ {
+ OPT_CONDITION, OPT_DISABLED, OPT_TEMP,
+ };
+ static const struct mi_opt opts[] =
+ {
+ { "c", OPT_CONDITION, 1},
+ { "d", OPT_DISABLED, 0 },
+ { "t", OPT_TEMP, 0 },
+ { 0, 0, 0 }
+ };
+
+ for (;;)
+ {
+ int opt = mi_getopt ("-catch-assert", argc, argv, opts,
+ &oind, &oarg);
+
+ if (opt < 0)
+ break;
+
+ switch ((enum opt) opt)
+ {
+ case OPT_CONDITION:
+ condition = oarg;
+ break;
+ case OPT_DISABLED:
+ enabled = 0;
+ 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]);
+
+ setup_breakpoint_reporting ();
+ create_ada_exception_catchpoint (gdbarch, ada_catch_assert,
+ NULL, condition, temp, enabled, 0);
+}
+
+/* Handler for the -catch-exception command. */
+
+void
+mi_cmd_catch_exception (char *cmd, char *argv[], int argc)
+{
+ struct gdbarch *gdbarch = get_current_arch();
+ char *condition = NULL;
+ int enabled = 1;
+ char *exception_name = NULL;
+ int temp = 0;
+ enum ada_exception_catchpoint_kind ex_kind = ada_catch_exception;
+
+ int oind = 0;
+ char *oarg;
+
+ enum opt
+ {
+ OPT_CONDITION, OPT_DISABLED, OPT_EXCEPTION_NAME, OPT_TEMP,
+ OPT_UNHANDLED,
+ };
+ static const struct mi_opt opts[] =
+ {
+ { "c", OPT_CONDITION, 1},
+ { "d", OPT_DISABLED, 0 },
+ { "e", OPT_EXCEPTION_NAME, 1 },
+ { "t", OPT_TEMP, 0 },
+ { "u", OPT_UNHANDLED, 0},
+ { 0, 0, 0 }
+ };
+
+ for (;;)
+ {
+ int opt = mi_getopt ("-catch-exception", argc, argv, opts,
+ &oind, &oarg);
+
+ if (opt < 0)
+ break;
+
+ switch ((enum opt) opt)
+ {
+ case OPT_CONDITION:
+ condition = oarg;
+ break;
+ case OPT_DISABLED:
+ enabled = 0;
+ break;
+ case OPT_EXCEPTION_NAME:
+ exception_name = oarg;
+ break;
+ case OPT_TEMP:
+ temp = 1;
+ break;
+ case OPT_UNHANDLED:
+ ex_kind = ada_catch_exception_unhandled;
+ 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]);
+
+ /* Specifying an exception name does not make sense when requesting
+ an unhandled exception breakpoint. */
+ if (ex_kind == ada_catch_exception_unhandled && exception_name != NULL)
+ error (_("\"-e\" and \"-u\" are mutually exclusive"));
+
+ setup_breakpoint_reporting ();
+ create_ada_exception_catchpoint (gdbarch, ex_kind,
+ exception_name, condition,
+ temp, enabled, 0);
+}
/* Common path for the -catch-load and -catch-unload. */
&mi_suppress_notification.breakpoint),
DEF_MI_CMD_MI_1 ("break-watch", mi_cmd_break_watch,
&mi_suppress_notification.breakpoint),
+ DEF_MI_CMD_MI_1 ("catch-assert", mi_cmd_catch_assert,
+ &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-load", mi_cmd_catch_load,
&mi_suppress_notification.breakpoint),
DEF_MI_CMD_MI_1 ("catch-unload", mi_cmd_catch_unload,
extern mi_cmd_argv_ftype mi_cmd_break_commands;
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_load;
extern mi_cmd_argv_ftype mi_cmd_catch_unload;
extern mi_cmd_argv_ftype mi_cmd_disassemble;
projects / binutils-gdb.git / commitdiff