/* MI Command Set - breakpoint and watchpoint commands.
- Copyright (C) 2000, Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2007, 2008, 2009
+ Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "arch-utils.h"
#include "mi-cmds.h"
#include "ui-out.h"
#include "mi-out.h"
#include "breakpoint.h"
#include "gdb_string.h"
#include "mi-getopt.h"
-#include "gdb-events.h"
-
-/* Convenience macro for allocting typesafe memory. */
-
-#undef XMALLOC
-#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE))
+#include "gdb.h"
+#include "exceptions.h"
+#include "observer.h"
enum
{
FROM_TTY = 0
};
-/* Output a single breakpoint. */
+/* True if MI breakpoint observers have been registered. */
+
+static int mi_breakpoint_observers_installed;
+
+/* Control whether breakpoint_notify may act. */
+
+static int mi_can_breakpoint_notify;
+
+/* Output a single breakpoint, when allowed. */
static void
breakpoint_notify (int b)
{
- gdb_breakpoint_query (b);
+ if (mi_can_breakpoint_notify)
+ gdb_breakpoint_query (uiout, b, NULL);
}
-
-struct gdb_events breakpoint_hooks =
-{
- breakpoint_notify,
- breakpoint_notify,
- breakpoint_notify,
-};
-
-
enum bp_type
{
REG_BP,
REGEXP_BP
};
-/* Insert a breakpoint. The type of breakpoint is specified by the
- first argument: -break-insert <location> --> insert a regular
- breakpoint. -break-insert -t <location> --> insert a temporary
- breakpoint. -break-insert -h <location> --> insert an hardware
- breakpoint. -break-insert -t -h <location> --> insert a temporary
- hw bp.
- -break-insert -r <regexp> --> insert a bp at functions matching
- <regexp> */
+/* Implements the -break-insert command.
+ See the MI manual for the list of possible options. */
-enum mi_cmd_result
+void
mi_cmd_break_insert (char *command, char **argv, int argc)
{
char *address = NULL;
int thread = -1;
int ignore_count = 0;
char *condition = NULL;
- enum gdb_rc rc;
+ int pending = 0;
+ int enabled = 1;
+
+ struct gdb_exception e;
struct gdb_events *old_hooks;
enum opt
{
HARDWARE_OPT, TEMP_OPT /*, REGEXP_OPT */ , CONDITION_OPT,
- IGNORE_COUNT_OPT, THREAD_OPT
+ IGNORE_COUNT_OPT, THREAD_OPT, PENDING_OPT, DISABLE_OPT
};
static struct mi_opt opts[] =
{
{"c", CONDITION_OPT, 1},
{"i", IGNORE_COUNT_OPT, 1},
{"p", THREAD_OPT, 1},
- 0
+ {"f", PENDING_OPT, 0},
+ {"d", DISABLE_OPT, 0},
+ { 0, 0, 0 }
};
/* Parse arguments. It could be -r or -h or -t, <location> or ``--''
case THREAD_OPT:
thread = atol (optarg);
break;
+ case PENDING_OPT:
+ pending = 1;
+ break;
+ case DISABLE_OPT:
+ enabled = 0;
}
}
if (optind >= argc)
- error ("mi_cmd_break_insert: Missing <location>");
+ error (_("mi_cmd_break_insert: Missing <location>"));
if (optind < argc - 1)
- error ("mi_cmd_break_insert: Garbage following <location>");
+ error (_("mi_cmd_break_insert: Garbage following <location>"));
address = argv[optind];
/* Now we have what we need, let's insert the breakpoint! */
- old_hooks = set_gdb_event_hooks (&breakpoint_hooks);
- switch (type)
+ if (! mi_breakpoint_observers_installed)
{
- case REG_BP:
- rc = gdb_breakpoint (address, condition,
- 0 /*hardwareflag */ , temp_p,
- thread, ignore_count);
- break;
- case HW_BP:
- rc = gdb_breakpoint (address, condition,
- 1 /*hardwareflag */ , temp_p,
- thread, ignore_count);
- break;
+ observer_attach_breakpoint_created (breakpoint_notify);
+ observer_attach_breakpoint_modified (breakpoint_notify);
+ observer_attach_breakpoint_deleted (breakpoint_notify);
+ mi_breakpoint_observers_installed = 1;
+ }
+
+ mi_can_breakpoint_notify = 1;
+ /* Make sure we restore hooks even if exception is thrown. */
+ TRY_CATCH (e, RETURN_MASK_ALL)
+ {
+ switch (type)
+ {
+ case REG_BP:
+ set_breakpoint (get_current_arch (), address, condition,
+ 0 /*hardwareflag */ , temp_p,
+ thread, ignore_count,
+ pending, enabled);
+ break;
+ case HW_BP:
+ set_breakpoint (get_current_arch (), address, condition,
+ 1 /*hardwareflag */ , temp_p,
+ thread, ignore_count,
+ pending, enabled);
+ break;
#if 0
- case REGEXP_BP:
- if (temp_p)
- error ("mi_cmd_break_insert: Unsupported tempoary regexp breakpoint");
- else
- rbreak_command_wrapper (address, FROM_TTY);
- return MI_CMD_DONE;
- break;
+ case REGEXP_BP:
+ if (temp_p)
+ error (_("mi_cmd_break_insert: Unsupported tempoary regexp breakpoint"));
+ else
+ rbreak_command_wrapper (address, FROM_TTY);
+ break;
#endif
- default:
- internal_error ("mi_cmd_break_insert: Bad switch.");
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("mi_cmd_break_insert: Bad switch."));
+ }
}
- set_gdb_event_hooks (old_hooks);
-
- if (rc == GDB_RC_FAIL)
- return MI_CMD_CAUGHT_ERROR;
- else
- return MI_CMD_DONE;
+ mi_can_breakpoint_notify = 0;
+ if (e.reason < 0)
+ throw_exception (e);
}
enum wp_type
-break-watch -r <expr> --> insert a read watchpoint.
-break-watch -a <expr> --> insert an access wp. */
-enum mi_cmd_result
+void
mi_cmd_break_watch (char *command, char **argv, int argc)
{
char *expr = NULL;
{
{"r", READ_OPT, 0},
{"a", ACCESS_OPT, 0},
- 0
+ { 0, 0, 0 }
};
/* Parse arguments. */
}
}
if (optind >= argc)
- error ("mi_cmd_break_watch: Missing <expression>");
+ error (_("mi_cmd_break_watch: Missing <expression>"));
if (optind < argc - 1)
- error ("mi_cmd_break_watch: Garbage following <expression>");
+ error (_("mi_cmd_break_watch: Garbage following <expression>"));
expr = argv[optind];
/* Now we have what we need, let's insert the watchpoint! */
switch (type)
{
case REG_WP:
-#ifdef UI_OUT
watch_command_wrapper (expr, FROM_TTY);
-#endif
break;
case READ_WP:
-#ifdef UI_OUT
rwatch_command_wrapper (expr, FROM_TTY);
-#endif
break;
case ACCESS_WP:
-#ifdef UI_OUT
awatch_command_wrapper (expr, FROM_TTY);
-#endif
break;
default:
- error ("mi_cmd_break_watch: Unknown watchpoint type.");
+ error (_("mi_cmd_break_watch: Unknown watchpoint type."));
}
- return MI_CMD_DONE;
}
+
+/* The mi_read_next_line consults these variable to return successive
+ command lines. While it would be clearer to use a closure pointer,
+ it is not expected that any future code will use read_command_lines_1,
+ therefore no point of overengineering. */
+
+static char **mi_command_line_array;
+static int mi_command_line_array_cnt;
+static int mi_command_line_array_ptr;
+
+static char *
+mi_read_next_line ()
+{
+ if (mi_command_line_array_ptr == mi_command_line_array_cnt)
+ return NULL;
+ else
+ return mi_command_line_array[mi_command_line_array_ptr++];
+}
+
+void
+mi_cmd_break_commands (char *command, char **argv, int argc)
+{
+ struct command_line *break_command;
+ char *endptr;
+ int bnum;
+ struct breakpoint *b;
+
+ if (argc < 1)
+ error ("USAGE: %s <BKPT> [<COMMAND> [<COMMAND>...]]", command);
+
+ bnum = strtol (argv[0], &endptr, 0);
+ if (endptr == argv[0])
+ error ("breakpoint number argument \"%s\" is not a number.",
+ argv[0]);
+ else if (*endptr != '\0')
+ error ("junk at the end of breakpoint number argument \"%s\".",
+ argv[0]);
+
+ b = get_breakpoint (bnum);
+ if (b == NULL)
+ error ("breakpoint %d not found.", bnum);
+
+ mi_command_line_array = argv;
+ mi_command_line_array_ptr = 1;
+ mi_command_line_array_cnt = argc;
+
+ break_command = read_command_lines_1 (mi_read_next_line, 0);
+ breakpoint_set_commands (b, break_command);
+}
+
projects / deliverable / binutils-gdb.git / blobdiff