X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmi%2Fmi-main.c;h=3ad11bb232a306c0b6f814c335dc53812c3a45c8;hb=19ba03f49581e407097a3e4821a957c422551ae5;hp=28de126aa9b4e80204ec42096d81908a89f0f24c;hpb=5799c0b96918061a27fd0be85177aeac9d8fe71e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 28de126aa9..3ad11bb232 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1,6 +1,6 @@ /* MI Command Set. - Copyright (C) 2000-2013 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. Contributed by Cygnus Solutions (a Red Hat company). @@ -23,8 +23,7 @@ #include "arch-utils.h" #include "target.h" #include "inferior.h" -#include "gdb_string.h" -#include "exceptions.h" +#include "infrun.h" #include "top.h" #include "gdbthread.h" #include "mi-cmds.h" @@ -49,11 +48,14 @@ #include "osdata.h" #include "splay-tree.h" #include "tracepoint.h" +#include "ctf.h" #include "ada-lang.h" #include "linespec.h" +#include "extension.h" +#include "gdbcmd.h" #include -#include +#include "gdb_sys_time.h" #if defined HAVE_SYS_RESOURCE_H #include @@ -95,11 +97,51 @@ static void mi_cmd_execute (struct mi_parse *parse); 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, +static void mi_execute_async_cli_command (char *cli_command, 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); +static void output_register (struct frame_info *, int regnum, int format, + int skip_unavailable); + +/* Controls whether the frontend wants MI in async mode. */ +static int mi_async = 0; + +/* The set command writes to this variable. If the inferior is + executing, mi_async is *not* updated. */ +static int mi_async_1 = 0; + +static void +set_mi_async_command (char *args, int from_tty, + struct cmd_list_element *c) +{ + if (have_live_inferiors ()) + { + mi_async_1 = mi_async; + error (_("Cannot change this setting while the inferior is running.")); + } + + mi_async = mi_async_1; +} + +static void +show_mi_async_command (struct ui_file *file, int from_tty, + struct cmd_list_element *c, + const char *value) +{ + fprintf_filtered (file, + _("Whether MI is in asynchronous mode is %s.\n"), + value); +} + +/* A wrapper for target_can_async_p that takes the MI setting into + account. */ + +int +mi_async_p (void) +{ + return mi_async && target_can_async_p (); +} /* Command implementations. FIXME: Is this libgdb? No. This is the MI layer that calls libgdb. Any operation used in the below should be @@ -189,7 +231,7 @@ mi_cmd_exec_return (char *command, char **argv, int argc) /* Because we have called return_command with from_tty = 0, we need to print the frame here. */ - print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS); + print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 1); } void @@ -198,19 +240,19 @@ mi_cmd_exec_jump (char *args, char **argv, int argc) /* FIXME: Should call a libgdb function, not a cli wrapper. */ mi_execute_async_cli_command ("jump", argv, argc); } - + static void proceed_thread (struct thread_info *thread, int pid) { if (!is_stopped (thread->ptid)) return; - if (pid != 0 && PIDGET (thread->ptid) != pid) + if (pid != 0 && ptid_get_pid (thread->ptid) != pid) return; switch_to_thread (thread->ptid); - clear_proceed_status (); - proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0); + clear_proceed_status (0); + proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); } static int @@ -225,6 +267,8 @@ proceed_thread_callback (struct thread_info *thread, void *arg) static void exec_continue (char **argv, int argc) { + prepare_execution_command (¤t_target, mi_async_p ()); + if (non_stop) { /* In non-stop mode, 'resume' always resumes a single thread. @@ -315,7 +359,7 @@ interrupt_thread_callback (struct thread_info *thread, void *arg) if (!is_running (thread->ptid)) return 0; - if (PIDGET (thread->ptid) != pid) + if (ptid_get_pid (thread->ptid) != pid) return 0; target_stop (thread->ptid); @@ -359,9 +403,19 @@ mi_cmd_exec_interrupt (char *command, char **argv, int argc) } } +/* Callback for iterate_over_inferiors which starts the execution + of the given inferior. + + ARG is a pointer to an integer whose value, if non-zero, indicates + that the program should be stopped when reaching the main subprogram + (similar to what the CLI "start" command does). */ + static int run_one_inferior (struct inferior *inf, void *arg) { + int start_p = *(int *) arg; + const char *run_cmd = start_p ? "start" : "run"; + if (inf->pid != 0) { if (inf->pid != ptid_get_pid (inferior_ptid)) @@ -381,25 +435,63 @@ run_one_inferior (struct inferior *inf, void *arg) switch_to_thread (null_ptid); set_current_program_space (inf->pspace); } - mi_execute_cli_command ("run", target_can_async_p (), - target_can_async_p () ? "&" : NULL); + mi_execute_cli_command (run_cmd, mi_async_p (), + mi_async_p () ? "&" : NULL); return 0; } void mi_cmd_exec_run (char *command, char **argv, int argc) { + int i; + int start_p = 0; + + /* Parse the command options. */ + enum opt + { + START_OPT, + }; + static const struct mi_opt opts[] = + { + {"-start", START_OPT, 0}, + {NULL, 0, 0}, + }; + + int oind = 0; + char *oarg; + + while (1) + { + int opt = mi_getopt ("-exec-run", argc, argv, opts, &oind, &oarg); + + if (opt < 0) + break; + switch ((enum opt) opt) + { + case START_OPT: + start_p = 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]); + if (current_context->all) { struct cleanup *back_to = save_current_space_and_thread (); - iterate_over_inferiors (run_one_inferior, NULL); + iterate_over_inferiors (run_one_inferior, &start_p); do_cleanups (back_to); } else { - mi_execute_cli_command ("run", target_can_async_p (), - target_can_async_p () ? "&" : NULL); + const char *run_cmd = start_p ? "start" : "run"; + + mi_execute_cli_command (run_cmd, mi_async_p (), + mi_async_p () ? "&" : NULL); } } @@ -409,7 +501,7 @@ find_thread_of_process (struct thread_info *ti, void *p) { int pid = *(int *)p; - if (PIDGET (ti->ptid) == pid && !is_exited (ti->ptid)) + if (ptid_get_pid (ti->ptid) == pid && !is_exited (ti->ptid)) return 1; return 0; @@ -508,8 +600,6 @@ mi_cmd_thread_info (char *command, char **argv, int argc) print_thread_info (current_uiout, argv[0], -1); } -DEF_VEC_I(int); - struct collect_cores_data { int pid; @@ -520,7 +610,7 @@ struct collect_cores_data static int collect_cores (struct thread_info *ti, void *xdata) { - struct collect_cores_data *data = xdata; + struct collect_cores_data *data = (struct collect_cores_data *) xdata; if (ptid_get_pid (ti->ptid) == data->pid) { @@ -553,7 +643,8 @@ struct print_one_inferior_data static int print_one_inferior (struct inferior *inferior, void *xdata) { - struct print_one_inferior_data *top_data = xdata; + struct print_one_inferior_data *top_data + = (struct print_one_inferior_data *) xdata; struct ui_out *uiout = current_uiout; if (VEC_empty (int, top_data->inferiors) @@ -567,13 +658,16 @@ print_one_inferior (struct inferior *inferior, void *xdata) ui_out_field_fmt (uiout, "id", "i%d", inferior->num); ui_out_field_string (uiout, "type", "process"); + if (inferior->has_exit_code) + ui_out_field_string (uiout, "exit-code", + int_string (inferior->exit_code, 8, 0, 0, 1)); if (inferior->pid != 0) ui_out_field_int (uiout, "pid", inferior->pid); - if (inferior->pspace->ebfd) + if (inferior->pspace->pspace_exec_filename != NULL) { ui_out_field_string (uiout, "executable", - bfd_get_filename (inferior->pspace->ebfd)); + inferior->pspace->pspace_exec_filename); } data.cores = 0; @@ -635,7 +729,7 @@ output_cores (struct ui_out *uiout, const char *field_name, const char *xcores) static void free_vector_of_ints (void *xvector) { - VEC (int) **vector = xvector; + VEC (int) **vector = (VEC (int) **) xvector; VEC_free (int, *vector); } @@ -666,7 +760,7 @@ splay_tree_int_comparator (splay_tree_key xa, splay_tree_key xb) static void free_splay_tree (void *xt) { - splay_tree t = xt; + splay_tree t = (splay_tree) xt; splay_tree_delete (t); } @@ -677,6 +771,7 @@ list_available_thread_groups (VEC (int) *ids, int recurse) struct osdata_item *item; int ix_items; struct ui_out *uiout = current_uiout; + struct cleanup *cleanup; /* This keeps a map from integer (pid) to VEC (struct osdata_item *)* The vector contains information about all threads for the given pid. @@ -686,7 +781,7 @@ list_available_thread_groups (VEC (int) *ids, int recurse) /* get_osdata will throw if it cannot return data. */ data = get_osdata ("processes"); - make_cleanup_osdata_free (data); + cleanup = make_cleanup_osdata_free (data); if (recurse) { @@ -789,6 +884,8 @@ list_available_thread_groups (VEC (int) *ids, int recurse) do_cleanups (back_to); } + + do_cleanups (cleanup); } void @@ -871,7 +968,7 @@ mi_cmd_list_thread_groups (char *command, char **argv, int argc) if (!inf) error (_("Non-existent thread group id '%d'"), id); - + print_thread_info (uiout, NULL, inf->pid); } else @@ -1065,7 +1162,18 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) struct gdbarch *gdbarch; int regnum, numregs, format; int i; - struct cleanup *list_cleanup, *tuple_cleanup; + struct cleanup *list_cleanup; + int skip_unavailable = 0; + int oind = 0; + enum opt + { + SKIP_UNAVAILABLE, + }; + static const struct mi_opt opts[] = + { + {"-skip-unavailable", SKIP_UNAVAILABLE, 0}, + { 0, 0, 0 } + }; /* Note that the test for a valid register must include checking the gdbarch_register_name because gdbarch_num_regs may be allocated @@ -1074,11 +1182,28 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) will change depending upon the particular processor being debugged. */ - if (argc == 0) + while (1) + { + char *oarg; + int opt = mi_getopt ("-data-list-register-values", argc, argv, + opts, &oind, &oarg); + + if (opt < 0) + break; + switch ((enum opt) opt) + { + case SKIP_UNAVAILABLE: + skip_unavailable = 1; + break; + } + } + + if (argc - oind < 1) error (_("-data-list-register-values: Usage: " - "-data-list-register-values [...]")); + "-data-list-register-values [--skip-unavailable] " + " [...]")); - format = (int) argv[0][0]; + format = (int) argv[oind][0]; frame = get_selected_frame (NULL); gdbarch = get_frame_arch (frame); @@ -1086,7 +1211,7 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, "register-values"); - if (argc == 1) + if (argc - oind == 1) { /* No args, beside the format: do all the regs. */ for (regnum = 0; @@ -1096,15 +1221,13 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) if (gdbarch_register_name (gdbarch, regnum) == NULL || *(gdbarch_register_name (gdbarch, regnum)) == '\0') continue; - tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_int (uiout, "number", regnum); - get_register (frame, regnum, format); - do_cleanups (tuple_cleanup); + + output_register (frame, regnum, format, skip_unavailable); } } /* Else, list of register #s, just do listed regs. */ - for (i = 1; i < argc; i++) + for (i = 1 + oind; i < argc; i++) { regnum = atoi (argv[i]); @@ -1112,75 +1235,56 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) && regnum < numregs && gdbarch_register_name (gdbarch, regnum) != NULL && *gdbarch_register_name (gdbarch, regnum) != '\000') - { - tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_int (uiout, "number", regnum); - get_register (frame, regnum, format); - do_cleanups (tuple_cleanup); - } + output_register (frame, regnum, format, skip_unavailable); else error (_("bad register number")); } do_cleanups (list_cleanup); } -/* Output one register's contents in the desired format. */ +/* Output one register REGNUM's contents in the desired FORMAT. If + SKIP_UNAVAILABLE is true, skip the register if it is + unavailable. */ static void -get_register (struct frame_info *frame, int regnum, int format) +output_register (struct frame_info *frame, int regnum, int format, + int skip_unavailable) { struct gdbarch *gdbarch = get_frame_arch (frame); struct ui_out *uiout = current_uiout; - struct value *val; + struct value *val = value_of_register (regnum, frame); + struct cleanup *tuple_cleanup; + struct value_print_options opts; + struct ui_file *stb; - if (format == 'N') - format = 0; + if (skip_unavailable && !value_entirely_available (val)) + return; - val = get_frame_register_value (frame, regnum); + tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + ui_out_field_int (uiout, "number", regnum); - if (value_optimized_out (val)) - error (_("Optimized out")); + if (format == 'N') + format = 0; if (format == 'r') - { - int j; - char *ptr, buf[1024]; - const gdb_byte *valaddr = value_contents_for_printing (val); + format = 'z'; - strcpy (buf, "0x"); - ptr = buf + 2; - for (j = 0; j < register_size (gdbarch, regnum); j++) - { - int idx = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG ? - j : register_size (gdbarch, regnum) - 1 - j; - - sprintf (ptr, "%02x", (unsigned char) valaddr[idx]); - ptr += 2; - } - ui_out_field_string (uiout, "value", buf); - } - else - { - struct value_print_options opts; - struct ui_file *stb; - struct cleanup *old_chain; - - stb = mem_fileopen (); - old_chain = make_cleanup_ui_file_delete (stb); + stb = mem_fileopen (); + make_cleanup_ui_file_delete (stb); + + get_formatted_print_options (&opts, format); + opts.deref_ref = 1; + val_print (value_type (val), + value_contents_for_printing (val), + value_embedded_offset (val), 0, + stb, 0, val, &opts, current_language); + ui_out_field_stream (uiout, "value", stb); - get_formatted_print_options (&opts, format); - opts.deref_ref = 1; - val_print (value_type (val), - value_contents_for_printing (val), - value_embedded_offset (val), 0, - stb, 0, val, &opts, current_language); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (old_chain); - } + do_cleanups (tuple_cleanup); } /* Write given values into registers. The registers and values are - given as pairs. The corresponding MI command is + given as pairs. The corresponding MI command is -data-write-register-values [ ... ] */ void @@ -1276,7 +1380,7 @@ mi_cmd_data_evaluate_expression (char *command, char **argv, int argc) /* This is the -data-read-memory command. ADDR: start address of data to be dumped. - WORD-FORMAT: a char indicating format for the ``word''. See + WORD-FORMAT: a char indicating format for the ``word''. See the ``x'' command. WORD-SIZE: size of each ``word''; 1,2,4, or 8 bytes. NR_ROW: Number of rows. @@ -1289,7 +1393,7 @@ mi_cmd_data_evaluate_expression (char *command, char **argv, int argc) {addr="...",rowN={wordN="..." ,... [,ascii="..."]}, ...} - Returns: + Returns: The number of bytes read is SIZE*ROW*COL. */ void @@ -1390,7 +1494,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) /* Create a buffer and read it in. */ total_bytes = word_size * nr_rows * nr_cols; - mbuf = xcalloc (total_bytes, 1); + mbuf = XCNEWVEC (gdb_byte, total_bytes); make_cleanup (xfree, mbuf); /* Dispatch memory reads to the topmost target, not the flattened @@ -1492,6 +1596,7 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc) int ix; VEC(memory_read_result_s) *result; long offset = 0; + int unit_size = gdbarch_addressable_memory_unit_size (gdbarch); int oind = 0; char *oarg; enum opt @@ -1541,16 +1646,18 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc) struct cleanup *t = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); char *data, *p; int i; + int alloc_len; 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); + alloc_len = (read_result->end - read_result->begin) * 2 * unit_size + 1; + data = (char *) xmalloc (alloc_len); for (i = 0, p = data; - i < (read_result->end - read_result->begin); + i < ((read_result->end - read_result->begin) * unit_size); ++i, p += 2) { sprintf (p, "%02x", read_result->data[i]); @@ -1570,7 +1677,7 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc) ADDR: start address of the row in the memory grid where the memory cell is, if OFFSET_COLUMN is specified. Otherwise, the address of the location to write to. - FORMAT: a char indicating format for the ``word''. See + FORMAT: a char indicating format for the ``word''. See the ``x'' command. WORD_SIZE: size of each ``word''; 1,2,4, or 8 bytes VALUE: value to be written into the memory address. @@ -1659,29 +1766,36 @@ mi_cmd_data_write_memory_bytes (char *command, char **argv, int argc) char *cdata; gdb_byte *data; gdb_byte *databuf; - size_t len, i, steps, remainder; - long int count, j; + size_t len_hex, len_bytes, len_units, i, steps, remaining_units; + long int count_units; struct cleanup *back_to; + int unit_size; if (argc != 2 && argc != 3) error (_("Usage: ADDR DATA [COUNT].")); addr = parse_and_eval_address (argv[0]); cdata = argv[1]; - if (strlen (cdata) % 2) - error (_("Hex-encoded '%s' must have an even number of characters."), + len_hex = strlen (cdata); + unit_size = gdbarch_addressable_memory_unit_size (get_current_arch ()); + + if (len_hex % (unit_size * 2) != 0) + error (_("Hex-encoded '%s' must represent an integral number of " + "addressable memory units."), cdata); - len = strlen (cdata)/2; + len_bytes = len_hex / 2; + len_units = len_bytes / unit_size; + if (argc == 3) - count = strtoul (argv[2], NULL, 10); + count_units = strtoul (argv[2], NULL, 10); else - count = len; + count_units = len_units; - databuf = xmalloc (len * sizeof (gdb_byte)); + databuf = XNEWVEC (gdb_byte, len_bytes); back_to = make_cleanup (xfree, databuf); - for (i = 0; i < len; ++i) + for (i = 0; i < len_bytes; ++i) { int x; if (sscanf (cdata + i * 2, "%02x", &x) != 1) @@ -1689,29 +1803,32 @@ mi_cmd_data_write_memory_bytes (char *command, char **argv, int argc) databuf[i] = (gdb_byte) x; } - if (len < count) + if (len_units < count_units) { - /* Pattern is made of less bytes than count: + /* Pattern is made of less units than count: repeat pattern to fill memory. */ - data = xmalloc (count); + data = (gdb_byte *) xmalloc (count_units * unit_size); make_cleanup (xfree, data); - - steps = count / len; - remainder = count % len; - for (j = 0; j < steps; j++) - memcpy (data + j * len, databuf, len); - if (remainder > 0) - memcpy (data + steps * len, databuf, remainder); + /* Number of times the pattern is entirely repeated. */ + steps = count_units / len_units; + /* Number of remaining addressable memory units. */ + remaining_units = count_units % len_units; + for (i = 0; i < steps; i++) + memcpy (data + i * len_bytes, databuf, len_bytes); + + if (remaining_units > 0) + memcpy (data + steps * len_bytes, databuf, + remaining_units * unit_size); } - else + else { - /* Pattern is longer than or equal to count: - just copy len bytes. */ + /* Pattern is longer than or equal to count: + just copy count addressable memory units. */ data = databuf; } - write_memory_with_notification (addr, data, count); + write_memory_with_notification (addr, data, count_units); do_cleanups (back_to); } @@ -1732,7 +1849,7 @@ mi_cmd_enable_timings (char *command, char **argv, int argc) } else goto usage_error; - + return; usage_error: @@ -1747,18 +1864,21 @@ mi_cmd_list_features (char *command, char **argv, int argc) struct cleanup *cleanup = NULL; struct ui_out *uiout = current_uiout; - 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"); ui_out_field_string (uiout, NULL, "ada-task-info"); - -#if HAVE_PYTHON - ui_out_field_string (uiout, NULL, "python"); -#endif - + ui_out_field_string (uiout, NULL, "language-option"); + ui_out_field_string (uiout, NULL, "info-gdb-mi-command"); + ui_out_field_string (uiout, NULL, "undefined-command-error-code"); + ui_out_field_string (uiout, NULL, "exec-run-start-option"); + + if (ext_lang_initialized_p (get_ext_lang_defn (EXT_LANG_PYTHON))) + ui_out_field_string (uiout, NULL, "python"); + do_cleanups (cleanup); return; } @@ -1774,12 +1894,11 @@ mi_cmd_list_target_features (char *command, char **argv, int argc) struct cleanup *cleanup = NULL; struct ui_out *uiout = current_uiout; - cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features"); - if (target_can_async_p ()) + cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features"); + if (mi_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; } @@ -1802,7 +1921,7 @@ mi_cmd_add_inferior (char *command, char **argv, int argc) /* Callback used to find the first inferior other than the current one. */ - + static int get_other_inferior (struct inferior *inf, void *arg) { @@ -1834,7 +1953,7 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc) if (inf == current_inferior ()) { struct thread_info *tp = 0; - struct inferior *new_inferior + struct inferior *new_inferior = iterate_over_inferiors (get_other_inferior, NULL); if (new_inferior == NULL) @@ -1847,7 +1966,7 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc) set_current_program_space (new_inferior->pspace); } - delete_inferior_1 (inf, 1 /* silent */); + delete_inferior (inf); } @@ -1935,7 +2054,7 @@ captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context) mi_out_put (uiout, raw_stdout); mi_out_rewind (uiout); mi_print_timing_maybe (); - fputs_unfiltered ("\n", raw_stdout); + fputs_unfiltered ("\n", raw_stdout); } else mi_out_rewind (uiout); @@ -1958,15 +2077,23 @@ mi_print_exception (const char *token, struct gdb_exception exception) fputs_unfiltered ("unknown error", raw_stdout); else fputstr_unfiltered (exception.message, '"', raw_stdout); - fputs_unfiltered ("\"\n", raw_stdout); + fputs_unfiltered ("\"", raw_stdout); + + switch (exception.error) + { + case UNDEFINED_COMMAND_ERROR: + fputs_unfiltered (",code=\"undefined-command\"", raw_stdout); + break; + } + + fputs_unfiltered ("\n", raw_stdout); } void -mi_execute_command (char *cmd, int from_tty) +mi_execute_command (const char *cmd, int from_tty) { 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. */ @@ -1975,47 +2102,48 @@ mi_execute_command (char *cmd, int from_tty) target_log_command (cmd); - TRY_CATCH (exception, RETURN_MASK_ALL) + TRY { command = mi_parse (cmd, &token); } - if (exception.reason < 0) + CATCH (exception, RETURN_MASK_ALL) { mi_print_exception (token, exception); xfree (token); } - else + END_CATCH + + if (command != NULL) { - volatile struct gdb_exception result; ptid_t previous_ptid = inferior_ptid; command->token = token; if (do_timings) { - command->cmd_start = (struct mi_timestamp *) - xmalloc (sizeof (struct mi_timestamp)); + command->cmd_start = XNEW (struct mi_timestamp); timestamp (command->cmd_start); } - TRY_CATCH (result, RETURN_MASK_ALL) + TRY { captured_mi_execute_command (current_uiout, command); } - if (result.reason < 0) + CATCH (result, RETURN_MASK_ALL) { /* The command execution failed and error() was called somewhere. */ mi_print_exception (command->token, result); mi_out_rewind (current_uiout); } + END_CATCH bpstat_do_actions (); if (/* The notifications are only output when the top-level - interpreter (specified on the command line) is MI. */ + interpreter (specified on the command line) is MI. */ ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ())) - /* Don't try report anything if there are no threads -- + /* Don't try report anything if there are no threads -- the program is dead. */ && thread_count () != 0 /* -thread-select explicitly changes thread. If frontend uses that @@ -2023,7 +2151,8 @@ mi_execute_command (char *cmd, int from_tty) =thread-selected is supposed to indicate user's intentions. */ && strcmp (command->command, "thread-select") != 0) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi + = (struct mi_interp *) top_level_interpreter_data (); int report_change = 0; if (command->thread == -1) @@ -2040,11 +2169,11 @@ mi_execute_command (char *cmd, int from_tty) } if (report_change) - { + { struct thread_info *ti = inferior_thread (); target_terminal_ours (); - fprintf_unfiltered (mi->event_channel, + fprintf_unfiltered (mi->event_channel, "thread-selected,id=\"%d\"", ti->num); gdb_flush (mi->event_channel); @@ -2059,6 +2188,7 @@ static void mi_cmd_execute (struct mi_parse *parse) { struct cleanup *cleanup; + enum language saved_language; cleanup = prepare_execute_command (); @@ -2120,6 +2250,12 @@ mi_cmd_execute (struct mi_parse *parse) error (_("Invalid frame id: %d"), frame); } + if (parse->language != language_unknown) + { + make_cleanup_restore_current_language (); + set_language (parse->language); + } + current_context = parse; if (parse->cmd->suppress_notification != NULL) @@ -2190,11 +2326,11 @@ mi_execute_async_cli_command (char *cli_command, char **argv, int argc) struct cleanup *old_cleanups; char *run; - if (target_can_async_p ()) + if (mi_async_p ()) run = xstrprintf ("%s %s&", cli_command, argc ? *argv : ""); else run = xstrprintf ("%s %s", cli_command, argc ? *argv : ""); - old_cleanups = make_cleanup (xfree, run); + old_cleanups = make_cleanup (xfree, run); execute_command (run, 0 /* from_tty */ ); @@ -2295,7 +2431,7 @@ mi_load_progress (const char *section_name, current_uiout = saved_uiout; } -static void +static void timestamp (struct mi_timestamp *tv) { gettimeofday (&tv->wallclock, NULL); @@ -2317,7 +2453,7 @@ timestamp (struct mi_timestamp *tv) #endif } -static void +static void print_diff_now (struct mi_timestamp *start) { struct mi_timestamp now; @@ -2335,21 +2471,21 @@ mi_print_timing_maybe (void) print_diff_now (current_command_ts); } -static long +static long timeval_diff (struct timeval start, struct timeval end) { return ((end.tv_sec - start.tv_sec) * 1000000L) + (end.tv_usec - start.tv_usec); } -static void +static void print_diff (struct mi_timestamp *start, struct mi_timestamp *end) { fprintf_unfiltered (raw_stdout, - ",time={wallclock=\"%0.5f\",user=\"%0.5f\",system=\"%0.5f\"}", - timeval_diff (start->wallclock, end->wallclock) / 1000000.0, - timeval_diff (start->utime, end->utime) / 1000000.0, + ",time={wallclock=\"%0.5f\",user=\"%0.5f\",system=\"%0.5f\"}", + timeval_diff (start->wallclock, end->wallclock) / 1000000.0, + timeval_diff (start->utime, end->utime) / 1000000.0, timeval_diff (start->stime, end->stime) / 1000000.0); } @@ -2357,7 +2493,6 @@ void mi_cmd_trace_define_variable (char *command, char **argv, int argc) { struct expression *expr; - struct cleanup *back_to; LONGEST initval = 0; struct trace_state_variable *tsv; char *name = 0; @@ -2365,19 +2500,11 @@ mi_cmd_trace_define_variable (char *command, char **argv, int argc) if (argc != 1 && argc != 2) error (_("Usage: -trace-define-variable VARIABLE [VALUE]")); - expr = parse_expression (argv[0]); - back_to = make_cleanup (xfree, expr); + name = argv[0]; + if (*name++ != '$') + error (_("Name of trace variable should start with '$'")); - if (expr->nelts == 3 && expr->elts[0].opcode == OP_INTERNALVAR) - { - struct internalvar *intvar = expr->elts[1].internalvar; - - if (intvar) - name = internalvar_name (intvar); - } - - if (!name || *name == '\0') - error (_("Invalid name of trace variable")); + validate_trace_state_variable_name (name); tsv = find_trace_state_variable (name); if (!tsv) @@ -2387,8 +2514,6 @@ mi_cmd_trace_define_variable (char *command, char **argv, int argc) initval = value_as_long (parse_and_eval (argv[1])); tsv->initial_value = initval; - - do_cleanups (back_to); } void @@ -2416,8 +2541,7 @@ mi_cmd_trace_find (char *command, char **argv, int argc) return; } - if (current_trace_status ()->running) - error (_("May not look at trace frames while trace is running.")); + check_trace_running (current_trace_status ()); if (strcmp (mode, "frame-number") == 0) { @@ -2481,32 +2605,52 @@ mi_cmd_trace_find (char *command, char **argv, int argc) error (_("Invalid mode '%s'"), mode); if (has_stack_frames () || get_traceframe_number () >= 0) - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); + print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 1); } void mi_cmd_trace_save (char *command, char **argv, int argc) { int target_saves = 0; + int generate_ctf = 0; char *filename; + int oind = 0; + char *oarg; - if (argc != 1 && argc != 2) - error (_("Usage: -trace-save [-r] filename")); - - if (argc == 2) + enum opt + { + TARGET_SAVE_OPT, CTF_OPT + }; + static const struct mi_opt opts[] = { - filename = argv[1]; - if (strcmp (argv[0], "-r") == 0) - target_saves = 1; - else - error (_("Invalid option: %s"), argv[0]); - } - else + {"r", TARGET_SAVE_OPT, 0}, + {"ctf", CTF_OPT, 0}, + { 0, 0, 0 } + }; + + while (1) { - filename = argv[0]; + int opt = mi_getopt ("-trace-save", argc, argv, opts, + &oind, &oarg); + + if (opt < 0) + break; + switch ((enum opt) opt) + { + case TARGET_SAVE_OPT: + target_saves = 1; + break; + case CTF_OPT: + generate_ctf = 1; + break; + } } + filename = argv[oind]; - trace_save (filename, target_saves); + if (generate_ctf) + trace_save_ctf (filename, target_saves); + else + trace_save_tfile (filename, target_saves); } void @@ -2538,3 +2682,320 @@ mi_cmd_ada_task_info (char *command, char **argv, int argc) print_ada_task_info (current_uiout, argv[0], current_inferior ()); } + +/* Print EXPRESSION according to VALUES. */ + +static void +print_variable_or_computed (char *expression, enum print_values values) +{ + struct expression *expr; + struct cleanup *old_chain; + struct value *val; + struct ui_file *stb; + struct value_print_options opts; + struct type *type; + struct ui_out *uiout = current_uiout; + + stb = mem_fileopen (); + old_chain = make_cleanup_ui_file_delete (stb); + + expr = parse_expression (expression); + + make_cleanup (free_current_contents, &expr); + + if (values == PRINT_SIMPLE_VALUES) + val = evaluate_type (expr); + else + val = evaluate_expression (expr); + + if (values != PRINT_NO_VALUES) + make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + ui_out_field_string (uiout, "name", expression); + + switch (values) + { + case PRINT_SIMPLE_VALUES: + type = check_typedef (value_type (val)); + type_print (value_type (val), "", stb, -1); + ui_out_field_stream (uiout, "type", stb); + if (TYPE_CODE (type) != TYPE_CODE_ARRAY + && TYPE_CODE (type) != TYPE_CODE_STRUCT + && TYPE_CODE (type) != TYPE_CODE_UNION) + { + struct value_print_options opts; + + get_no_prettyformat_print_options (&opts); + opts.deref_ref = 1; + common_val_print (val, stb, 0, &opts, current_language); + ui_out_field_stream (uiout, "value", stb); + } + break; + case PRINT_ALL_VALUES: + { + struct value_print_options opts; + + get_no_prettyformat_print_options (&opts); + opts.deref_ref = 1; + common_val_print (val, stb, 0, &opts, current_language); + ui_out_field_stream (uiout, "value", stb); + } + break; + } + + do_cleanups (old_chain); +} + +/* Implement the "-trace-frame-collected" command. */ + +void +mi_cmd_trace_frame_collected (char *command, char **argv, int argc) +{ + struct cleanup *old_chain; + struct bp_location *tloc; + int stepping_frame; + struct collection_list *clist; + struct collection_list tracepoint_list, stepping_list; + struct traceframe_info *tinfo; + int oind = 0; + enum print_values var_print_values = PRINT_ALL_VALUES; + enum print_values comp_print_values = PRINT_ALL_VALUES; + int registers_format = 'x'; + int memory_contents = 0; + struct ui_out *uiout = current_uiout; + enum opt + { + VAR_PRINT_VALUES, + COMP_PRINT_VALUES, + REGISTERS_FORMAT, + MEMORY_CONTENTS, + }; + static const struct mi_opt opts[] = + { + {"-var-print-values", VAR_PRINT_VALUES, 1}, + {"-comp-print-values", COMP_PRINT_VALUES, 1}, + {"-registers-format", REGISTERS_FORMAT, 1}, + {"-memory-contents", MEMORY_CONTENTS, 0}, + { 0, 0, 0 } + }; + + while (1) + { + char *oarg; + int opt = mi_getopt ("-trace-frame-collected", argc, argv, opts, + &oind, &oarg); + if (opt < 0) + break; + switch ((enum opt) opt) + { + case VAR_PRINT_VALUES: + var_print_values = mi_parse_print_values (oarg); + break; + case COMP_PRINT_VALUES: + comp_print_values = mi_parse_print_values (oarg); + break; + case REGISTERS_FORMAT: + registers_format = oarg[0]; + case MEMORY_CONTENTS: + memory_contents = 1; + break; + } + } + + if (oind != argc) + error (_("Usage: -trace-frame-collected " + "[--var-print-values PRINT_VALUES] " + "[--comp-print-values PRINT_VALUES] " + "[--registers-format FORMAT]" + "[--memory-contents]")); + + /* This throws an error is not inspecting a trace frame. */ + tloc = get_traceframe_location (&stepping_frame); + + /* This command only makes sense for the current frame, not the + selected frame. */ + old_chain = make_cleanup_restore_current_thread (); + select_frame (get_current_frame ()); + + encode_actions_and_make_cleanup (tloc, &tracepoint_list, + &stepping_list); + + if (stepping_frame) + clist = &stepping_list; + else + clist = &tracepoint_list; + + tinfo = get_traceframe_info (); + + /* Explicitly wholly collected variables. */ + { + struct cleanup *list_cleanup; + char *p; + int i; + + list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, + "explicit-variables"); + for (i = 0; VEC_iterate (char_ptr, clist->wholly_collected, i, p); i++) + print_variable_or_computed (p, var_print_values); + do_cleanups (list_cleanup); + } + + /* Computed expressions. */ + { + struct cleanup *list_cleanup; + char *p; + int i; + + list_cleanup + = make_cleanup_ui_out_list_begin_end (uiout, + "computed-expressions"); + for (i = 0; VEC_iterate (char_ptr, clist->computed, i, p); i++) + print_variable_or_computed (p, comp_print_values); + do_cleanups (list_cleanup); + } + + /* Registers. Given pseudo-registers, and that some architectures + (like MIPS) actually hide the raw registers, we don't go through + the trace frame info, but instead consult the register cache for + register availability. */ + { + struct cleanup *list_cleanup; + struct frame_info *frame; + struct gdbarch *gdbarch; + int regnum; + int numregs; + + list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, "registers"); + + frame = get_selected_frame (NULL); + gdbarch = get_frame_arch (frame); + numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); + + for (regnum = 0; regnum < numregs; regnum++) + { + if (gdbarch_register_name (gdbarch, regnum) == NULL + || *(gdbarch_register_name (gdbarch, regnum)) == '\0') + continue; + + output_register (frame, regnum, registers_format, 1); + } + + do_cleanups (list_cleanup); + } + + /* Trace state variables. */ + { + struct cleanup *list_cleanup; + int tvar; + char *tsvname; + int i; + + list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, "tvars"); + + tsvname = NULL; + make_cleanup (free_current_contents, &tsvname); + + for (i = 0; VEC_iterate (int, tinfo->tvars, i, tvar); i++) + { + struct cleanup *cleanup_child; + struct trace_state_variable *tsv; + + tsv = find_trace_state_variable_by_number (tvar); + + cleanup_child = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + + if (tsv != NULL) + { + tsvname = (char *) xrealloc (tsvname, strlen (tsv->name) + 2); + tsvname[0] = '$'; + strcpy (tsvname + 1, tsv->name); + ui_out_field_string (uiout, "name", tsvname); + + tsv->value_known = target_get_trace_state_variable_value (tsv->number, + &tsv->value); + ui_out_field_int (uiout, "current", tsv->value); + } + else + { + ui_out_field_skip (uiout, "name"); + ui_out_field_skip (uiout, "current"); + } + + do_cleanups (cleanup_child); + } + + do_cleanups (list_cleanup); + } + + /* Memory. */ + { + struct cleanup *list_cleanup; + VEC(mem_range_s) *available_memory = NULL; + struct mem_range *r; + int i; + + traceframe_available_memory (&available_memory, 0, ULONGEST_MAX); + make_cleanup (VEC_cleanup(mem_range_s), &available_memory); + + list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, "memory"); + + for (i = 0; VEC_iterate (mem_range_s, available_memory, i, r); i++) + { + struct cleanup *cleanup_child; + gdb_byte *data; + struct gdbarch *gdbarch = target_gdbarch (); + + cleanup_child = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + + ui_out_field_core_addr (uiout, "address", gdbarch, r->start); + ui_out_field_int (uiout, "length", r->length); + + data = (gdb_byte *) xmalloc (r->length); + make_cleanup (xfree, data); + + if (memory_contents) + { + if (target_read_memory (r->start, data, r->length) == 0) + { + int m; + char *data_str, *p; + + data_str = (char *) xmalloc (r->length * 2 + 1); + make_cleanup (xfree, data_str); + + for (m = 0, p = data_str; m < r->length; ++m, p += 2) + sprintf (p, "%02x", data[m]); + ui_out_field_string (uiout, "contents", data_str); + } + else + ui_out_field_skip (uiout, "contents"); + } + do_cleanups (cleanup_child); + } + + do_cleanups (list_cleanup); + } + + do_cleanups (old_chain); +} + +void +_initialize_mi_main (void) +{ + struct cmd_list_element *c; + + add_setshow_boolean_cmd ("mi-async", class_run, + &mi_async_1, _("\ +Set whether MI asynchronous mode is enabled."), _("\ +Show whether MI asynchronous mode is enabled."), _("\ +Tells GDB whether MI should be in asynchronous mode."), + set_mi_async_command, + show_mi_async_command, + &setlist, + &showlist); + + /* Alias old "target-async" to "mi-async". */ + c = add_alias_cmd ("target-async", "mi-async", class_run, 0, &setlist); + deprecate_cmd (c, "set mi-async"); + c = add_alias_cmd ("target-async", "mi-async", class_run, 0, &showlist); + deprecate_cmd (c, "show mi-async"); +}