/* MI Command Set.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
static void mi_execute_cli_command (const char *cmd, int args_p,
const char *args);
static void mi_execute_async_cli_command (char *cli_command,
- char **argv, int argc);
+ char **argv, int argc);
static int register_changed_p (int regnum, struct regcache *,
struct regcache *);
static void get_register (struct frame_info *, int regnum, int format);
proceed_thread_callback (struct thread_info *thread, void *arg)
{
int pid = *(int *)arg;
+
proceed_thread (thread, pid);
return 0;
}
if (!current_context->all)
{
- struct inferior *inf = find_inferior_id (current_context->thread_group);
+ struct inferior *inf
+ = find_inferior_id (current_context->thread_group);
+
pid = inf->pid;
}
iterate_over_threads (proceed_thread_callback, &pid);
else
{
struct cleanup *back_to = make_cleanup_restore_integer (&sched_multi);
+
if (current_context->all)
{
sched_multi = 1;
enum exec_direction_kind dir = execution_direction;
struct cleanup *old_chain;
- if (dir == EXEC_ERROR)
- error (_("Target %s does not support this command."), target_shortname);
-
if (dir == EXEC_REVERSE)
error (_("Already in reverse mode."));
else if (current_context->thread_group != -1)
{
struct inferior *inf = find_inferior_id (current_context->thread_group);
+
iterate_over_threads (interrupt_thread_callback, &inf->pid);
}
else
if (current_context->all)
{
struct cleanup *back_to = save_current_space_and_thread ();
+
iterate_over_inferiors (run_one_inferior, NULL);
do_cleanups (back_to);
}
find_thread_of_process (struct thread_info *ti, void *p)
{
int pid = *(int *)p;
+
if (PIDGET (ti->ptid) == pid && !is_exited (ti->ptid))
return 1;
mi_cmd_target_detach (char *command, char **argv, int argc)
{
if (argc != 0 && argc != 1)
- error ("Usage: -target-detach [thread-group]");
+ error (_("Usage: -target-detach [pid | thread-group]"));
if (argc == 1)
{
struct thread_info *tp;
char *end = argv[0];
- int pid = strtol (argv[0], &end, 10);
- if (*end != '\0')
- error (_("Cannot parse thread group id '%s'"), argv[0]);
+ int pid;
+
+ /* First see if we are dealing with a thread-group id. */
+ if (*argv[0] == 'i')
+ {
+ struct inferior *inf;
+ int id = strtoul (argv[0] + 1, &end, 0);
+
+ if (*end != '\0')
+ error (_("Invalid syntax of thread-group id '%s'"), argv[0]);
+
+ inf = find_inferior_id (id);
+ if (!inf)
+ error (_("Non-existent thread-group id '%d'"), id);
+
+ pid = inf->pid;
+ }
+ else
+ {
+ /* We must be dealing with a pid. */
+ pid = strtol (argv[0], &end, 10);
+
+ if (*end != '\0')
+ error (_("Invalid identifier '%s'"), argv[0]);
+ }
/* Pick any thread in the desired process. Current
- target_detach deteches from the parent of inferior_ptid. */
+ target_detach detaches from the parent of inferior_ptid. */
tp = iterate_over_threads (find_thread_of_process, &pid);
if (!tp)
error (_("Thread group is empty"));
char *mi_error_message;
if (argc != 1)
- error ("mi_cmd_thread_select: USAGE: threadnum.");
+ error (_("-thread-select: USAGE: threadnum."));
rc = gdb_thread_select (uiout, argv[0], &mi_error_message);
char *mi_error_message;
if (argc != 0)
- error ("mi_cmd_thread_list_ids: No arguments required.");
+ error (_("-thread-list-ids: No arguments required."));
rc = gdb_list_thread_ids (uiout, &mi_error_message);
void
mi_cmd_thread_info (char *command, char **argv, int argc)
{
- int thread = -1;
-
if (argc != 0 && argc != 1)
- error ("Invalid MI command");
+ error (_("Invalid MI command"));
- if (argc == 1)
- thread = atoi (argv[0]);
-
- print_thread_info (uiout, thread, -1);
+ print_thread_info (uiout, argv[0], -1);
}
struct collect_cores_data
if (ptid_get_pid (ti->ptid) == data->pid)
{
int core = target_core_of_thread (ti->ptid);
+
if (core != -1)
VEC_safe_push (int, data->cores, core);
}
unique (int *b, int *e)
{
int *d = b;
+
while (++b != e)
if (*d != *b)
*++d = *b;
}
if (top_data->recurse)
- print_thread_info (uiout, -1, inferior->pid);
+ print_thread_info (uiout, NULL, inferior->pid);
do_cleanups (back_to);
}
free_vector_of_ints (void *xvector)
{
VEC (int) **vector = xvector;
+
VEC_free (int, *vector);
}
free_vector_of_osdata_items (splay_tree_value xvalue)
{
VEC (osdata_item_s) *value = (VEC (osdata_item_s) *) xvalue;
+
/* We don't free the items itself, it will be done separately. */
VEC_free (osdata_item_s, value);
}
{
int a = xa;
int b = xb;
+
return a - b;
}
struct osdata *data;
struct osdata_item *item;
int ix_items;
+
/* This keeps a map from integer (pid) to VEC (struct osdata_item *)*
The vector contains information about all threads for the given pid.
This is assigned an initial value to avoid "may be used uninitialized"
if (recurse)
{
struct osdata *threads = get_osdata ("threads");
- make_cleanup_osdata_free (threads);
+ make_cleanup_osdata_free (threads);
tree = splay_tree_new (splay_tree_int_comparator,
do_nothing,
free_vector_of_osdata_items);
{
struct cleanup *back_to_2 =
make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
-
const char *tid = get_osdata_column (child, "tid");
const char *tcore = get_osdata_column (child, "core");
+
ui_out_field_string (uiout, "id", tid);
if (tcore)
ui_out_field_string (uiout, "core", tcore);
{
int opt = mi_getopt ("-list-thread-groups", argc, argv, opts,
&optind, &optarg);
+
if (opt < 0)
break;
switch ((enum opt) opt)
else if (strcmp (optarg, "1") == 0)
recurse = 1;
else
- error ("only '0' and '1' are valid values for the '--recurse' option");
+ error (_("only '0' and '1' are valid values "
+ "for the '--recurse' option"));
break;
}
}
for (; optind < argc; ++optind)
{
char *end;
- int inf = strtoul (argv[optind], &end, 0);
+ int inf;
+
+ if (*(argv[optind]) != 'i')
+ error (_("invalid syntax of group id '%s'"), argv[optind]);
+
+ inf = strtoul (argv[optind] + 1, &end, 0);
+
if (*end != '\0')
- error ("invalid group id '%s'", argv[optind]);
+ error (_("invalid syntax of group id '%s'"), argv[optind]);
VEC_safe_push (int, ids, inf);
}
if (VEC_length (int, ids) > 1)
else if (VEC_length (int, ids) == 1)
{
/* Local thread groups, single id. */
- int pid = *VEC_address (int, ids);
- if (!in_inferior_list (pid))
- error ("Invalid thread group id '%d'", pid);
- print_thread_info (uiout, -1, pid);
+ int id = *VEC_address (int, ids);
+ struct inferior *inf = find_inferior_id (id);
+
+ if (!inf)
+ error (_("Non-existent thread group id '%d'"), id);
+
+ print_thread_info (uiout, NULL, inf->pid);
}
else
{
struct print_one_inferior_data data;
+
data.recurse = recurse;
data.inferiors = ids;
{
regnum = atoi (argv[i]);
if (regnum < 0 || regnum >= numregs)
- error ("bad register number");
+ error (_("bad register number"));
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
continue;
changed = register_changed_p (regnum, prev_regs, this_regs);
if (changed < 0)
- error ("mi_cmd_data_list_changed_registers: Unable to read register contents.");
+ error (_("-data-list-changed-registers: "
+ "Unable to read register contents."));
else if (changed)
ui_out_field_int (uiout, NULL, regnum);
}
{
changed = register_changed_p (regnum, prev_regs, this_regs);
if (changed < 0)
- error ("mi_cmd_data_list_register_change: Unable to read register contents.");
+ error (_("-data-list-changed-registers: "
+ "Unable to read register contents."));
else if (changed)
ui_out_field_int (uiout, NULL, regnum);
}
else
- error ("bad register number");
+ error (_("bad register number"));
}
do_cleanups (cleanup);
}
struct gdbarch *gdbarch = get_regcache_arch (this_regs);
gdb_byte prev_buffer[MAX_REGISTER_SIZE];
gdb_byte this_buffer[MAX_REGISTER_SIZE];
+ enum register_status prev_status;
+ enum register_status this_status;
- /* Registers not valid in this frame return count as unchanged. */
- if (!regcache_valid_p (this_regs, regnum))
- return 0;
-
- /* First time through or after gdbarch change consider all registers as
- changed. Same for registers not valid in the previous frame. */
- if (!prev_regs || get_regcache_arch (prev_regs) != gdbarch
- || !regcache_valid_p (prev_regs, regnum))
+ /* First time through or after gdbarch change consider all registers
+ as changed. */
+ if (!prev_regs || get_regcache_arch (prev_regs) != gdbarch)
return 1;
/* Get register contents and compare. */
- regcache_cooked_read (prev_regs, regnum, prev_buffer);
- regcache_cooked_read (this_regs, regnum, this_buffer);
+ prev_status = regcache_cooked_read (prev_regs, regnum, prev_buffer);
+ this_status = regcache_cooked_read (this_regs, regnum, this_buffer);
- return memcmp (prev_buffer, this_buffer,
- register_size (gdbarch, regnum)) != 0;
+ if (this_status != prev_status)
+ return 1;
+ else if (this_status == REG_VALID)
+ return memcmp (prev_buffer, this_buffer,
+ register_size (gdbarch, regnum)) != 0;
+ else
+ return 0;
}
/* Return a list of register number and value pairs. The valid
upon the particular processor being debugged. */
if (argc == 0)
- error ("mi_cmd_data_list_register_values: Usage: -data-list-register-values <format> [<regnum1>...<regnumN>]");
+ error (_("-data-list-register-values: Usage: "
+ "-data-list-register-values <format> [<regnum1>...<regnumN>]"));
format = (int) argv[0][0];
do_cleanups (tuple_cleanup);
}
else
- error ("bad register number");
+ error (_("bad register number"));
}
do_cleanups (list_cleanup);
}
get_register (struct frame_info *frame, int regnum, int format)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
- gdb_byte buffer[MAX_REGISTER_SIZE];
- int optim;
- int realnum;
CORE_ADDR addr;
enum lval_type lval;
static struct ui_stream *stb = NULL;
+ struct value *val;
stb = ui_out_stream_new (uiout);
if (format == 'N')
format = 0;
- frame_register (frame, regnum, &optim, &lval, &addr, &realnum, buffer);
+ val = get_frame_register_value (frame, regnum);
- if (optim)
- error ("Optimized out");
+ if (value_optimized_out (val))
+ error (_("Optimized out"));
if (format == 'r')
{
int j;
char *ptr, buf[1024];
+ const gdb_byte *valaddr = value_contents_for_printing (val);
strcpy (buf, "0x");
ptr = buf + 2;
{
int idx = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG ?
j : register_size (gdbarch, regnum) - 1 - j;
- sprintf (ptr, "%02x", (unsigned char) buffer[idx]);
+
+ sprintf (ptr, "%02x", (unsigned char) valaddr[idx]);
ptr += 2;
}
ui_out_field_string (uiout, "value", buf);
else
{
struct value_print_options opts;
+
get_formatted_print_options (&opts, format);
opts.deref_ref = 1;
- val_print (register_type (gdbarch, regnum), buffer, 0, 0,
- stb->stream, 0, &opts, current_language);
+ val_print (value_type (val),
+ value_contents_for_printing (val),
+ value_embedded_offset (val), 0,
+ stb->stream, 0, val, &opts, current_language);
ui_out_field_stream (uiout, "value", stb);
ui_out_stream_delete (stb);
}
/* Write given values into registers. The registers and values are
given as pairs. The corresponding MI command is
- -data-write-register-values <format> [<regnum1> <value1>...<regnumN> <valueN>]*/
+ -data-write-register-values <format>
+ [<regnum1> <value1>...<regnumN> <valueN>] */
void
mi_cmd_data_write_register_values (char *command, char **argv, int argc)
{
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
if (argc == 0)
- error ("mi_cmd_data_write_register_values: Usage: -data-write-register-values <format> [<regnum1> <value1>...<regnumN> <valueN>]");
+ error (_("-data-write-register-values: Usage: -data-write-register-"
+ "values <format> [<regnum1> <value1>...<regnumN> <valueN>]"));
format = (int) argv[0][0];
if (!target_has_registers)
- error ("mi_cmd_data_write_register_values: No registers.");
+ error (_("-data-write-register-values: No registers."));
if (!(argc - 1))
- error ("mi_cmd_data_write_register_values: No regs and values specified.");
+ error (_("-data-write-register-values: No regs and values specified."));
if ((argc - 1) % 2)
- error ("mi_cmd_data_write_register_values: Regs and vals are not in pairs.");
+ error (_("-data-write-register-values: "
+ "Regs and vals are not in pairs."));
for (i = 1; i < argc; i = i + 2)
{
regcache_cooked_write_signed (regcache, regnum, value);
}
else
- error ("bad register number");
+ error (_("bad register number"));
}
}
if (argc != 1)
{
ui_out_stream_delete (stb);
- error ("mi_cmd_data_evaluate_expression: Usage: -data-evaluate-expression expression");
+ error (_("-data-evaluate-expression: "
+ "Usage: -data-evaluate-expression expression"));
}
expr = parse_expression (argv[0]);
/* Print the result of the expression evaluation. */
get_user_print_options (&opts);
opts.deref_ref = 0;
- val_print (value_type (val), value_contents (val),
- value_embedded_offset (val), value_address (val),
- stb->stream, 0, &opts, current_language);
+ common_val_print (val, stb->stream, 0, &opts, current_language);
ui_out_field_stream (uiout, "value", stb);
ui_out_stream_delete (stb);
while (1)
{
- int opt = mi_getopt ("mi_cmd_data_read_memory", argc, argv, opts,
+ int opt = mi_getopt ("-data-read-memory", argc, argv, opts,
&optind, &optarg);
+
if (opt < 0)
break;
switch ((enum opt) opt)
argc -= optind;
if (argc < 5 || argc > 6)
- error ("mi_cmd_data_read_memory: Usage: ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS [ASCHAR].");
+ error (_("-data-read-memory: Usage: "
+ "ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS [ASCHAR]."));
/* Extract all the arguments. */
/* The number of rows. */
nr_rows = atol (argv[3]);
if (nr_rows <= 0)
- error ("mi_cmd_data_read_memory: invalid number of rows.");
+ error (_("-data-read-memory: invalid number of rows."));
/* Number of bytes per row. */
nr_cols = atol (argv[4]);
if (nr_cols <= 0)
- error ("mi_cmd_data_read_memory: invalid number of columns.");
+ error (_("-data-read-memory: invalid number of columns."));
/* The un-printable character when printing ascii. */
if (argc == 6)
/* Dispatch memory reads to the topmost target, not the flattened
current_target. */
- nr_bytes = target_read_until_error (current_target.beneath,
- TARGET_OBJECT_MEMORY, NULL, mbuf,
- addr, total_bytes);
+ nr_bytes = target_read (current_target.beneath,
+ TARGET_OBJECT_MEMORY, NULL, mbuf,
+ addr, total_bytes);
if (nr_bytes <= 0)
- error ("Unable to read memory.");
+ error (_("Unable to read memory."));
/* Output the header information. */
ui_out_field_core_addr (uiout, "addr", gdbarch, addr);
struct cleanup *cleanup_list_memory;
int row;
int row_byte;
+
cleanup_list_memory = make_cleanup_ui_out_list_begin_end (uiout, "memory");
for (row = 0, row_byte = 0;
row < nr_rows;
cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
ui_out_field_core_addr (uiout, "addr", gdbarch, addr + row_byte);
- /* ui_out_field_core_addr_symbolic (uiout, "saddr", addr + row_byte); */
+ /* ui_out_field_core_addr_symbolic (uiout, "saddr", addr +
+ row_byte); */
cleanup_list_data = make_cleanup_ui_out_list_begin_end (uiout, "data");
get_formatted_print_options (&opts, word_format);
for (col = 0, col_byte = row_byte;
if (aschar)
{
int byte;
+
ui_file_rewind (stream->stream);
- for (byte = row_byte; byte < row_byte + word_size * nr_cols; byte++)
+ for (byte = row_byte;
+ byte < row_byte + word_size * nr_cols; byte++)
{
if (byte >= nr_bytes)
{
do_cleanups (cleanups);
}
+void
+mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc)
+{
+ struct gdbarch *gdbarch = get_current_arch ();
+ struct cleanup *cleanups;
+ CORE_ADDR addr;
+ LONGEST length;
+ memory_read_result_s *read_result;
+ int ix;
+ VEC(memory_read_result_s) *result;
+ long offset = 0;
+ int optind = 0;
+ char *optarg;
+ enum opt
+ {
+ OFFSET_OPT
+ };
+ static struct mi_opt opts[] =
+ {
+ {"o", OFFSET_OPT, 1},
+ { 0, 0, 0 }
+ };
+
+ while (1)
+ {
+ int opt = mi_getopt ("-data-read-memory-bytes", argc, argv, opts,
+ &optind, &optarg);
+ if (opt < 0)
+ break;
+ switch ((enum opt) opt)
+ {
+ case OFFSET_OPT:
+ offset = atol (optarg);
+ break;
+ }
+ }
+ argv += optind;
+ argc -= optind;
+
+ if (argc != 2)
+ error (_("Usage: [ -o OFFSET ] ADDR LENGTH."));
+
+ addr = parse_and_eval_address (argv[0]) + offset;
+ length = atol (argv[1]);
+
+ result = read_memory_robust (current_target.beneath, addr, length);
+
+ cleanups = make_cleanup (free_memory_read_result_vector, result);
+
+ if (VEC_length (memory_read_result_s, result) == 0)
+ error (_("Unable to read memory."));
+
+ make_cleanup_ui_out_list_begin_end (uiout, "memory");
+ for (ix = 0;
+ VEC_iterate (memory_read_result_s, result, ix, read_result);
+ ++ix)
+ {
+ struct cleanup *t = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ char *data, *p;
+ int i;
+
+ ui_out_field_core_addr (uiout, "begin", gdbarch, read_result->begin);
+ ui_out_field_core_addr (uiout, "offset", gdbarch, read_result->begin
+ - addr);
+ ui_out_field_core_addr (uiout, "end", gdbarch, read_result->end);
+
+ data = xmalloc ((read_result->end - read_result->begin) * 2 + 1);
+
+ for (i = 0, p = data;
+ i < (read_result->end - read_result->begin);
+ ++i, p += 2)
+ {
+ sprintf (p, "%02x", read_result->data[i]);
+ }
+ ui_out_field_string (uiout, "contents", data);
+ xfree (data);
+ do_cleanups (t);
+ }
+ do_cleanups (cleanups);
+}
+
+
/* DATA-MEMORY-WRITE:
- COLUMN_OFFSET: optional argument. Must be preceeded by '-o'. The
+ COLUMN_OFFSET: optional argument. Must be preceded by '-o'. The
offset from the beginning of the memory grid row where the cell to
be written is.
ADDR: start address of the row in the memory grid where the memory
while (1)
{
- int opt = mi_getopt ("mi_cmd_data_write_memory", argc, argv, opts,
+ int opt = mi_getopt ("-data-write-memory", argc, argv, opts,
&optind, &optarg);
+
if (opt < 0)
break;
switch ((enum opt) opt)
argc -= optind;
if (argc != 4)
- error ("mi_cmd_data_write_memory: Usage: [-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE.");
+ error (_("-data-write-memory: Usage: "
+ "[-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE."));
/* Extract all the arguments. */
/* Start address of the memory dump. */
do_cleanups (old_chain);
}
+/* DATA-MEMORY-WRITE-RAW:
+
+ ADDR: start address
+ DATA: string of bytes to write at that address. */
+void
+mi_cmd_data_write_memory_bytes (char *command, char **argv, int argc)
+{
+ CORE_ADDR addr;
+ char *cdata;
+ gdb_byte *data;
+ int len, r, i;
+ struct cleanup *back_to;
+
+ if (argc != 2)
+ error (_("Usage: ADDR DATA."));
+
+ addr = parse_and_eval_address (argv[0]);
+ cdata = argv[1];
+ len = strlen (cdata)/2;
+
+ data = xmalloc (len);
+ back_to = make_cleanup (xfree, data);
+
+ for (i = 0; i < len; ++i)
+ {
+ int x;
+ sscanf (cdata + i * 2, "%02x", &x);
+ data[i] = (gdb_byte)x;
+ }
+
+ r = target_write_memory (addr, data, len);
+ if (r != 0)
+ error (_("Could not write memory"));
+
+ do_cleanups (back_to);
+}
+
+
void
mi_cmd_enable_timings (char *command, char **argv, int argc)
{
return;
usage_error:
- error ("mi_cmd_enable_timings: Usage: %s {yes|no}", command);
+ error (_("-enable-timings: Usage: %s {yes|no}"), command);
}
void
if (argc == 0)
{
struct cleanup *cleanup = NULL;
- cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features");
+ cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features");
ui_out_field_string (uiout, NULL, "frozen-varobjs");
ui_out_field_string (uiout, NULL, "pending-breakpoints");
ui_out_field_string (uiout, NULL, "thread-info");
+ ui_out_field_string (uiout, NULL, "data-read-memory-bytes");
+ ui_out_field_string (uiout, NULL, "breakpoint-notifications");
#if HAVE_PYTHON
ui_out_field_string (uiout, NULL, "python");
return;
}
- error ("-list-features should be passed no arguments");
+ error (_("-list-features should be passed no arguments"));
}
void
if (argc == 0)
{
struct cleanup *cleanup = NULL;
- cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features");
+ cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features");
if (target_can_async_p ())
ui_out_field_string (uiout, NULL, "async");
+ if (target_can_execute_reverse)
+ ui_out_field_string (uiout, NULL, "reverse");
do_cleanups (cleanup);
return;
}
- error ("-list-target-features should be passed no arguments");
+ error (_("-list-target-features should be passed no arguments"));
}
void
ui_out_field_fmt (uiout, "inferior", "i%d", inf->num);
}
+/* Callback used to find the first inferior other than the
+ current one. */
+
+static int
+get_other_inferior (struct inferior *inf, void *arg)
+{
+ if (inf == current_inferior ())
+ return 0;
+
+ return 1;
+}
+
void
mi_cmd_remove_inferior (char *command, char **argv, int argc)
{
struct inferior *inf;
if (argc != 1)
- error ("-remove-inferior should be passed a single argument");
+ error (_("-remove-inferior should be passed a single argument"));
- if (sscanf (argv[1], "i%d", &id) != 1)
- error ("the thread group id is syntactically invalid");
+ if (sscanf (argv[0], "i%d", &id) != 1)
+ error (_("the thread group id is syntactically invalid"));
inf = find_inferior_id (id);
if (!inf)
- error ("the specified thread group does not exist");
+ error (_("the specified thread group does not exist"));
+
+ if (inf->pid != 0)
+ error (_("cannot remove an active inferior"));
+
+ if (inf == current_inferior ())
+ {
+ struct thread_info *tp = 0;
+ struct inferior *new_inferior
+ = iterate_over_inferiors (get_other_inferior, NULL);
+
+ if (new_inferior == NULL)
+ error (_("Cannot remove last inferior"));
+
+ set_current_inferior (new_inferior);
+ if (new_inferior->pid != 0)
+ tp = any_thread_of_process (new_inferior->pid);
+ switch_to_thread (tp ? tp->ptid : null_ptid);
+ set_current_program_space (new_inferior->pspace);
+ }
delete_inferior_1 (inf, 1 /* silent */);
}
prompt, display error). */
static void
-captured_mi_execute_command (struct ui_out *uiout, void *data)
+captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context)
{
struct cleanup *cleanup;
- struct mi_parse *context = (struct mi_parse *) data;
if (do_timings)
current_command_ts = context->cmd_start;
case CLI_COMMAND:
{
char *argv[2];
+
/* A CLI command was read from the input stream. */
/* This "feature" will be removed as soon as we have a
complete set of mi commands. */
return;
}
+/* Print a gdb exception to the MI output stream. */
+
+static void
+mi_print_exception (const char *token, struct gdb_exception exception)
+{
+ fputs_unfiltered (token, raw_stdout);
+ fputs_unfiltered ("^error,msg=\"", raw_stdout);
+ if (exception.message == NULL)
+ fputs_unfiltered ("unknown error", raw_stdout);
+ else
+ fputstr_unfiltered (exception.message, '"', raw_stdout);
+ fputs_unfiltered ("\"\n", raw_stdout);
+}
void
mi_execute_command (char *cmd, int from_tty)
{
- struct mi_parse *command;
+ char *token;
+ struct mi_parse *command = NULL;
+ volatile struct gdb_exception exception;
/* This is to handle EOF (^D). We just quit gdb. */
/* FIXME: we should call some API function here. */
target_log_command (cmd);
- command = mi_parse (cmd);
-
- if (command != NULL)
+ TRY_CATCH (exception, RETURN_MASK_ALL)
+ {
+ command = mi_parse (cmd, &token);
+ }
+ if (exception.reason < 0)
+ {
+ mi_print_exception (token, exception);
+ xfree (token);
+ }
+ else
{
- struct gdb_exception result;
+ volatile struct gdb_exception result;
ptid_t previous_ptid = inferior_ptid;
+ command->token = token;
+
if (do_timings)
{
command->cmd_start = (struct mi_timestamp *)
timestamp (command->cmd_start);
}
- result = catch_exception (uiout, captured_mi_execute_command, command,
- RETURN_MASK_ALL);
+ TRY_CATCH (result, RETURN_MASK_ALL)
+ {
+ captured_mi_execute_command (uiout, command);
+ }
if (result.reason < 0)
{
/* The command execution failed and error() was called
somewhere. */
- fputs_unfiltered (command->token, raw_stdout);
- fputs_unfiltered ("^error,msg=\"", raw_stdout);
- if (result.message == NULL)
- fputs_unfiltered ("unknown error", raw_stdout);
- else
- fputstr_unfiltered (result.message, '"', raw_stdout);
- fputs_unfiltered ("\"\n", raw_stdout);
+ mi_print_exception (command->token, result);
mi_out_rewind (uiout);
}
else if (!ptid_equal (inferior_ptid, null_ptid))
{
struct thread_info *ti = inferior_thread ();
+
report_change = (ti->num != command->thread);
}
if (report_change)
{
struct thread_info *ti = inferior_thread ();
+
target_terminal_ours ();
fprintf_unfiltered (mi->event_channel,
"thread-selected,id=\"%d\"",
{
struct cleanup *cleanup;
- prepare_execute_command ();
-
- cleanup = make_cleanup (null_cleanup, NULL);
+ cleanup = prepare_execute_command ();
if (parse->all && parse->thread_group != -1)
error (_("Cannot specify --thread-group together with --all"));
if (parse->thread != -1)
{
struct thread_info *tp = find_thread_id (parse->thread);
+
if (!tp)
error (_("Invalid thread id: %d"), parse->thread);
{
struct frame_info *fid;
int frame = parse->frame;
+
fid = find_relative_frame (get_current_frame (), &frame);
if (frame == 0)
/* find_relative_frame was successful */
current_context = parse;
+ if (strncmp (parse->command, "break-", sizeof ("break-") - 1 ) == 0)
+ {
+ make_cleanup_restore_integer (&mi_suppress_breakpoint_notifications);
+ mi_suppress_breakpoint_notifications = 1;
+ }
+
if (parse->cmd->argv_func != NULL)
- parse->cmd->argv_func (parse->command, parse->argv, parse->argc);
+ {
+ parse->cmd->argv_func (parse->command, parse->argv, parse->argc);
+ }
else if (parse->cmd->cli.cmd != 0)
{
/* FIXME: DELETE THIS. */
{
struct cleanup *old_cleanups;
char *run;
+
if (args_p)
run = xstrprintf ("%s %s", cmd, args);
else
execute_command ( /*ui */ run, 0 /*from_tty */ );
- if (target_can_async_p ())
- {
- /* If we're not executing, an exception should have been throw. */
- gdb_assert (is_running (inferior_ptid));
- do_cleanups (old_cleanups);
- }
- else
- {
- /* Do this before doing any printing. It would appear that some
- print code leaves garbage around in the buffer. */
- do_cleanups (old_cleanups);
- }
+ /* Do this before doing any printing. It would appear that some
+ print code leaves garbage around in the buffer. */
+ do_cleanups (old_cleanups);
}
void
if (new_section)
{
struct cleanup *cleanup_tuple;
+
xfree (previous_sect_name);
previous_sect_name = xstrdup (section_name);
delta.tv_usec >= update_threshold.tv_usec)
{
struct cleanup *cleanup_tuple;
+
last_update.tv_sec = time_now.tv_sec;
last_update.tv_usec = time_now.tv_usec;
if (current_token)
print_diff_now (struct mi_timestamp *start)
{
struct mi_timestamp now;
+
timestamp (&now);
print_diff (start, &now);
}
if (expr->nelts == 3 && expr->elts[0].opcode == OP_INTERNALVAR)
{
struct internalvar *intvar = expr->elts[1].internalvar;
+
if (intvar)
name = internalvar_name (intvar);
}
projects / deliverable / binutils-gdb.git / blobdiff