X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmi%2Fmi-cmd-var.c;h=f0a9056c4e6131da51ba2a310a943256b03aa572;hb=112e8700a6fd2fed65ca70132c9cbed4132e8bd4;hp=4848a4e29c18ff22aba25c1a8b6d58dcc29beafa;hpb=349c5d5f6c08699c3e433b28e2beaa24b65a63b0;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 4848a4e29c..f0a9056c4e 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -1,6 +1,5 @@
/* MI Command Set - varobj commands.
-
- Copyright 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
@@ -8,7 +7,7 @@
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,
@@ -17,53 +16,103 @@
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 . */
#include "defs.h"
#include "mi-cmds.h"
+#include "mi-main.h"
#include "ui-out.h"
#include "mi-out.h"
#include "varobj.h"
+#include "language.h"
#include "value.h"
#include
+#include "mi-getopt.h"
+#include "gdbthread.h"
+#include "mi-parse.h"
+
+extern unsigned int varobjdebug; /* defined in varobj.c. */
+
+static void varobj_update_one (struct varobj *var,
+ enum print_values print_values,
+ int is_explicit);
+
+static int mi_print_value_p (struct varobj *var,
+ enum print_values print_values);
+
+/* Print variable object VAR. The PRINT_VALUES parameter controls
+ if the value should be printed. The PRINT_EXPRESSION parameter
+ controls if the expression should be printed. */
+
+static void
+print_varobj (struct varobj *var, enum print_values print_values,
+ int print_expression)
+{
+ struct ui_out *uiout = current_uiout;
+ int thread_id;
+
+ uiout->field_string ("name", varobj_get_objname (var));
+ if (print_expression)
+ {
+ std::string exp = varobj_get_expression (var);
+
+ uiout->field_string ("exp", exp.c_str ());
+ }
+ uiout->field_int ("numchild", varobj_get_num_children (var));
+
+ if (mi_print_value_p (var, print_values))
+ {
+ std::string val = varobj_get_value (var);
-extern int varobjdebug; /* defined in varobj.c */
+ uiout->field_string ("value", val.c_str ());
+ }
+
+ std::string type = varobj_get_type (var);
+ if (!type.empty ())
+ uiout->field_string ("type", type.c_str ());
+
+ thread_id = varobj_get_thread_id (var);
+ if (thread_id > 0)
+ uiout->field_int ("thread-id", thread_id);
+
+ if (varobj_get_frozen (var))
+ uiout->field_int ("frozen", 1);
-static int varobj_update_one (struct varobj *var);
+ gdb::unique_xmalloc_ptr display_hint = varobj_get_display_hint (var);
+ if (display_hint)
+ uiout->field_string ("displayhint", display_hint.get ());
+
+ if (varobj_is_dynamic_p (var))
+ uiout->field_int ("dynamic", 1);
+}
/* VAROBJ operations */
-enum mi_cmd_result
+void
mi_cmd_var_create (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
CORE_ADDR frameaddr = 0;
struct varobj *var;
char *name;
char *frame;
char *expr;
- char *type;
struct cleanup *old_cleanups;
enum varobj_type var_type;
if (argc != 3)
- {
- /* xasprintf (&mi_error_message,
- "mi_cmd_var_create: Usage: .");
- return MI_CMD_ERROR; */
- error ("mi_cmd_var_create: Usage: NAME FRAME EXPRESSION.");
- }
+ error (_("-var-create: Usage: NAME FRAME EXPRESSION."));
name = xstrdup (argv[0]);
- /* Add cleanup for name. Must be free_current_contents as
- name can be reallocated */
+ /* Add cleanup for name. Must be free_current_contents as name can
+ be reallocated. */
old_cleanups = make_cleanup (free_current_contents, &name);
frame = xstrdup (argv[1]);
- old_cleanups = make_cleanup (xfree, frame);
+ make_cleanup (xfree, frame);
expr = xstrdup (argv[2]);
+ make_cleanup (xfree, expr);
if (strcmp (name, "-") == 0)
{
@@ -71,7 +120,7 @@ mi_cmd_var_create (char *command, char **argv, int argc)
name = varobj_gen_name ();
}
else if (!isalpha (*name))
- error ("mi_cmd_var_create: name of object must begin with a letter");
+ error (_("-var-create: name of object must begin with a letter"));
if (strcmp (frame, "*") == 0)
var_type = USE_CURRENT_FRAME;
@@ -80,268 +129,377 @@ mi_cmd_var_create (char *command, char **argv, int argc)
else
{
var_type = USE_SPECIFIED_FRAME;
- frameaddr = parse_and_eval_address (frame);
+ frameaddr = string_to_core_addr (frame);
}
if (varobjdebug)
fprintf_unfiltered (gdb_stdlog,
- "Name=\"%s\", Frame=\"%s\" (0x%s), Expression=\"%s\"\n",
- name, frame, paddr (frameaddr), expr);
+ "Name=\"%s\", Frame=\"%s\" (%s), Expression=\"%s\"\n",
+ name, frame, hex_string (frameaddr), expr);
var = varobj_create (name, expr, frameaddr, var_type);
if (var == NULL)
- error ("mi_cmd_var_create: unable to create variable object");
+ error (_("-var-create: unable to create variable object"));
- ui_out_field_string (uiout, "name", name);
- ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
- type = varobj_get_type (var);
- if (type == NULL)
- ui_out_field_string (uiout, "type", "");
- else
- {
- ui_out_field_string (uiout, "type", type);
- xfree (type);
- }
+ print_varobj (var, PRINT_ALL_VALUES, 0 /* don't print expression */);
+
+ uiout->field_int ("has_more", varobj_has_more (var, 0));
do_cleanups (old_cleanups);
- return MI_CMD_DONE;
}
-enum mi_cmd_result
+void
mi_cmd_var_delete (char *command, char **argv, int argc)
{
char *name;
- char *expr;
struct varobj *var;
int numdel;
int children_only_p = 0;
struct cleanup *old_cleanups;
+ struct ui_out *uiout = current_uiout;
if (argc < 1 || argc > 2)
- error ("mi_cmd_var_delete: Usage: [-c] EXPRESSION.");
+ error (_("-var-delete: Usage: [-c] EXPRESSION."));
name = xstrdup (argv[0]);
- /* Add cleanup for name. Must be free_current_contents as
- name can be reallocated */
+ /* Add cleanup for name. Must be free_current_contents as name can
+ be reallocated. */
old_cleanups = make_cleanup (free_current_contents, &name);
/* If we have one single argument it cannot be '-c' or any string
- starting with '-'. */
+ starting with '-'. */
if (argc == 1)
{
if (strcmp (name, "-c") == 0)
- error ("mi_cmd_var_delete: Missing required argument after '-c': variable object name");
+ error (_("-var-delete: Missing required "
+ "argument after '-c': variable object name"));
if (*name == '-')
- error ("mi_cmd_var_delete: Illegal variable object name");
+ error (_("-var-delete: Illegal variable object name"));
}
/* If we have 2 arguments they must be '-c' followed by a string
- which would be the variable name. */
+ which would be the variable name. */
if (argc == 2)
{
- expr = xstrdup (argv[1]);
if (strcmp (name, "-c") != 0)
- error ("mi_cmd_var_delete: Invalid option.");
+ error (_("-var-delete: Invalid option."));
children_only_p = 1;
- xfree (name);
- name = xstrdup (expr);
- xfree (expr);
+ do_cleanups (old_cleanups);
+ name = xstrdup (argv[1]);
+ old_cleanups = make_cleanup (free_current_contents, &name);
}
/* If we didn't error out, now NAME contains the name of the
- variable. */
+ variable. */
var = varobj_get_handle (name);
- if (var == NULL)
- error ("mi_cmd_var_delete: Variable object not found.");
-
- numdel = varobj_delete (var, NULL, children_only_p);
+ numdel = varobj_delete (var, children_only_p);
- ui_out_field_int (uiout, "ndeleted", numdel);
+ uiout->field_int ("ndeleted", numdel);
do_cleanups (old_cleanups);
- return MI_CMD_DONE;
}
-enum mi_cmd_result
+/* Parse a string argument into a format value. */
+
+static enum varobj_display_formats
+mi_parse_format (const char *arg)
+{
+ if (arg != NULL)
+ {
+ int len;
+
+ len = strlen (arg);
+
+ if (strncmp (arg, "natural", len) == 0)
+ return FORMAT_NATURAL;
+ else if (strncmp (arg, "binary", len) == 0)
+ return FORMAT_BINARY;
+ else if (strncmp (arg, "decimal", len) == 0)
+ return FORMAT_DECIMAL;
+ else if (strncmp (arg, "hexadecimal", len) == 0)
+ return FORMAT_HEXADECIMAL;
+ else if (strncmp (arg, "octal", len) == 0)
+ return FORMAT_OCTAL;
+ else if (strncmp (arg, "zero-hexadecimal", len) == 0)
+ return FORMAT_ZHEXADECIMAL;
+ }
+
+ error (_("Must specify the format as: \"natural\", "
+ "\"binary\", \"decimal\", \"hexadecimal\", \"octal\" or \"zero-hexadecimal\""));
+}
+
+void
mi_cmd_var_set_format (char *command, char **argv, int argc)
{
enum varobj_display_formats format;
- int len;
struct varobj *var;
- char *formspec;
+ struct ui_out *uiout = current_uiout;
if (argc != 2)
- error ("mi_cmd_var_set_format: Usage: NAME FORMAT.");
+ error (_("-var-set-format: Usage: NAME FORMAT."));
+
+ /* Get varobj handle, if a valid var obj name was specified. */
+ var = varobj_get_handle (argv[0]);
+
+ format = mi_parse_format (argv[1]);
+
+ /* Set the format of VAR to the given format. */
+ varobj_set_display_format (var, format);
+
+ /* Report the new current format. */
+ uiout->field_string ("format", varobj_format_string[(int) format]);
+
+ /* Report the value in the new format. */
+ std::string val = varobj_get_value (var);
+ uiout->field_string ("value", val.c_str ());
+}
+
+void
+mi_cmd_var_set_visualizer (char *command, char **argv, int argc)
+{
+ struct varobj *var;
+
+ if (argc != 2)
+ error (_("Usage: NAME VISUALIZER_FUNCTION."));
- /* Get varobj handle, if a valid var obj name was specified */
var = varobj_get_handle (argv[0]);
if (var == NULL)
- error ("mi_cmd_var_set_format: Variable object not found");
-
- formspec = xstrdup (argv[1]);
- if (formspec == NULL)
- error ("mi_cmd_var_set_format: Must specify the format as: \"natural\", \"binary\", \"decimal\", \"hexadecimal\", or \"octal\"");
-
- len = strlen (formspec);
-
- if (STREQN (formspec, "natural", len))
- format = FORMAT_NATURAL;
- else if (STREQN (formspec, "binary", len))
- format = FORMAT_BINARY;
- else if (STREQN (formspec, "decimal", len))
- format = FORMAT_DECIMAL;
- else if (STREQN (formspec, "hexadecimal", len))
- format = FORMAT_HEXADECIMAL;
- else if (STREQN (formspec, "octal", len))
- format = FORMAT_OCTAL;
+ error (_("Variable object not found"));
+
+ varobj_set_visualizer (var, argv[1]);
+}
+
+void
+mi_cmd_var_set_frozen (char *command, char **argv, int argc)
+{
+ struct varobj *var;
+ int frozen;
+
+ if (argc != 2)
+ error (_("-var-set-format: Usage: NAME FROZEN_FLAG."));
+
+ var = varobj_get_handle (argv[0]);
+
+ if (strcmp (argv[1], "0") == 0)
+ frozen = 0;
+ else if (strcmp (argv[1], "1") == 0)
+ frozen = 1;
else
- error ("mi_cmd_var_set_format: Unknown display format: must be: \"natural\", \"binary\", \"decimal\", \"hexadecimal\", or \"octal\"");
+ error (_("Invalid flag value"));
- /* Set the format of VAR to given format */
- varobj_set_display_format (var, format);
+ varobj_set_frozen (var, frozen);
- /* Report the new current format */
- ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
- return MI_CMD_DONE;
+ /* We don't automatically return the new value, or what varobjs got
+ new values during unfreezing. If this information is required,
+ client should call -var-update explicitly. */
}
-enum mi_cmd_result
+void
mi_cmd_var_show_format (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
enum varobj_display_formats format;
struct varobj *var;
if (argc != 1)
- error ("mi_cmd_var_show_format: Usage: NAME.");
+ error (_("-var-show-format: Usage: NAME."));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_show_format: Variable object not found");
format = varobj_get_display_format (var);
- /* Report the current format */
- ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
- return MI_CMD_DONE;
+ /* Report the current format. */
+ uiout->field_string ("format", varobj_format_string[(int) format]);
}
-enum mi_cmd_result
+void
mi_cmd_var_info_num_children (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
struct varobj *var;
if (argc != 1)
- error ("mi_cmd_var_info_num_children: Usage: NAME.");
+ error (_("-var-info-num-children: Usage: NAME."));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_info_num_children: Variable object not found");
- ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
- return MI_CMD_DONE;
+ uiout->field_int ("numchild", varobj_get_num_children (var));
}
-enum mi_cmd_result
-mi_cmd_var_list_children (char *command, char **argv, int argc)
+/* Return 1 if given the argument PRINT_VALUES we should display
+ the varobj VAR. */
+
+static int
+mi_print_value_p (struct varobj *var, enum print_values print_values)
{
- struct varobj *var;
- struct varobj **childlist;
- struct varobj **cc;
- int numchild;
- char *type;
+ struct type *type;
- if (argc != 1)
- error ("mi_cmd_var_list_children: Usage: NAME.");
+ if (print_values == PRINT_NO_VALUES)
+ return 0;
- /* Get varobj handle, if a valid var obj name was specified */
- var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_list_children: Variable object not found");
+ if (print_values == PRINT_ALL_VALUES)
+ return 1;
+
+ if (varobj_is_dynamic_p (var))
+ return 1;
+
+ type = varobj_get_gdb_type (var);
+ if (type == NULL)
+ return 1;
+ else
+ {
+ type = check_typedef (type);
+
+ /* For PRINT_SIMPLE_VALUES, only print the value if it has a type
+ and that type is not a compound type. */
+ return (TYPE_CODE (type) != TYPE_CODE_ARRAY
+ && TYPE_CODE (type) != TYPE_CODE_STRUCT
+ && TYPE_CODE (type) != TYPE_CODE_UNION);
+ }
+}
+
+void
+mi_cmd_var_list_children (char *command, char **argv, int argc)
+{
+ struct ui_out *uiout = current_uiout;
+ struct varobj *var;
+ VEC(varobj_p) *children;
+ struct varobj *child;
+ enum print_values print_values;
+ int ix;
+ int from, to;
+
+ if (argc < 1 || argc > 4)
+ error (_("-var-list-children: Usage: "
+ "[PRINT_VALUES] NAME [FROM TO]"));
+
+ /* Get varobj handle, if a valid var obj name was specified. */
+ if (argc == 1 || argc == 3)
+ var = varobj_get_handle (argv[0]);
+ else
+ var = varobj_get_handle (argv[1]);
+
+ if (argc > 2)
+ {
+ from = atoi (argv[argc - 2]);
+ to = atoi (argv[argc - 1]);
+ }
+ else
+ {
+ from = -1;
+ to = -1;
+ }
- numchild = varobj_list_children (var, &childlist);
- ui_out_field_int (uiout, "numchild", numchild);
+ children = varobj_list_children (var, &from, &to);
+ uiout->field_int ("numchild", to - from);
+ if (argc == 2 || argc == 4)
+ print_values = mi_parse_print_values (argv[0]);
+ else
+ print_values = PRINT_NO_VALUES;
- if (numchild <= 0)
- return MI_CMD_DONE;
+ gdb::unique_xmalloc_ptr display_hint = varobj_get_display_hint (var);
+ if (display_hint)
+ uiout->field_string ("displayhint", display_hint.get ());
- ui_out_tuple_begin (uiout, "children");
- cc = childlist;
- while (*cc != NULL)
+ if (from < to)
{
- ui_out_tuple_begin (uiout, "child");
- ui_out_field_string (uiout, "name", varobj_get_objname (*cc));
- ui_out_field_string (uiout, "exp", varobj_get_expression (*cc));
- ui_out_field_int (uiout, "numchild", varobj_get_num_children (*cc));
- type = varobj_get_type (*cc);
- /* C++ pseudo-variables (public, private, protected) do not have a type */
- if (type)
- ui_out_field_string (uiout, "type", varobj_get_type (*cc));
- ui_out_tuple_end (uiout);
- cc++;
+ struct cleanup *cleanup_children;
+
+ if (mi_version (uiout) == 1)
+ cleanup_children
+ = make_cleanup_ui_out_tuple_begin_end (uiout, "children");
+ else
+ cleanup_children
+ = make_cleanup_ui_out_list_begin_end (uiout, "children");
+ for (ix = from;
+ ix < to && VEC_iterate (varobj_p, children, ix, child);
+ ++ix)
+ {
+ struct cleanup *cleanup_child;
+
+ cleanup_child = make_cleanup_ui_out_tuple_begin_end (uiout, "child");
+ print_varobj (child, print_values, 1 /* print expression */);
+ do_cleanups (cleanup_child);
+ }
+ do_cleanups (cleanup_children);
}
- ui_out_tuple_end (uiout);
- xfree (childlist);
- return MI_CMD_DONE;
+
+ uiout->field_int ("has_more", varobj_has_more (var, to));
}
-enum mi_cmd_result
+void
mi_cmd_var_info_type (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
struct varobj *var;
if (argc != 1)
- error ("mi_cmd_var_info_type: Usage: NAME.");
+ error (_("-var-info-type: Usage: NAME."));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_info_type: Variable object not found");
- ui_out_field_string (uiout, "type", varobj_get_type (var));
- return MI_CMD_DONE;
+ std::string type_name = varobj_get_type (var);
+ uiout->field_string ("type", type_name.c_str ());
}
-enum mi_cmd_result
+void
+mi_cmd_var_info_path_expression (char *command, char **argv, int argc)
+{
+ struct ui_out *uiout = current_uiout;
+ struct varobj *var;
+
+ if (argc != 1)
+ error (_("Usage: NAME."));
+
+ /* Get varobj handle, if a valid var obj name was specified. */
+ var = varobj_get_handle (argv[0]);
+
+ const char *path_expr = varobj_get_path_expr (var);
+
+ uiout->field_string ("path_expr", path_expr);
+}
+
+void
mi_cmd_var_info_expression (char *command, char **argv, int argc)
{
- enum varobj_languages lang;
+ struct ui_out *uiout = current_uiout;
+ const struct language_defn *lang;
struct varobj *var;
if (argc != 1)
- error ("mi_cmd_var_info_expression: Usage: NAME.");
+ error (_("-var-info-expression: Usage: NAME."));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_info_expression: Variable object not found");
lang = varobj_get_language (var);
- ui_out_field_string (uiout, "lang", varobj_language_string[(int) lang]);
- ui_out_field_string (uiout, "exp", varobj_get_expression (var));
- return MI_CMD_DONE;
+ uiout->field_string ("lang", lang->la_natural_name);
+
+ std::string exp = varobj_get_expression (var);
+ uiout->field_string ("exp", exp.c_str ());
}
-enum mi_cmd_result
+void
mi_cmd_var_show_attributes (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
int attr;
char *attstr;
struct varobj *var;
if (argc != 1)
- error ("mi_cmd_var_show_attributes: Usage: NAME.");
+ error (_("-var-show-attributes: Usage: NAME."));
/* Get varobj handle, if a valid var obj name was specified */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_show_attributes: Variable object not found");
attr = varobj_get_attributes (var);
/* FIXME: define masks for attributes */
@@ -350,149 +508,315 @@ mi_cmd_var_show_attributes (char *command, char **argv, int argc)
else
attstr = "noneditable";
- ui_out_field_string (uiout, "attr", attstr);
- return MI_CMD_DONE;
+ uiout->field_string ("attr", attstr);
}
-enum mi_cmd_result
+void
mi_cmd_var_evaluate_expression (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
struct varobj *var;
- if (argc != 1)
- error ("mi_cmd_var_evaluate_expression: Usage: NAME.");
+ enum varobj_display_formats format;
+ int formatFound;
+ int oind;
+ char *oarg;
+
+ enum opt
+ {
+ OP_FORMAT
+ };
+ static const struct mi_opt opts[] =
+ {
+ {"f", OP_FORMAT, 1},
+ { 0, 0, 0 }
+ };
+
+ /* Parse arguments. */
+ format = FORMAT_NATURAL;
+ formatFound = 0;
+ oind = 0;
+ while (1)
+ {
+ int opt = mi_getopt ("-var-evaluate-expression", argc, argv,
+ opts, &oind, &oarg);
- /* Get varobj handle, if a valid var obj name was specified */
- var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_evaluate_expression: Variable object not found");
+ if (opt < 0)
+ break;
+ switch ((enum opt) opt)
+ {
+ case OP_FORMAT:
+ if (formatFound)
+ error (_("Cannot specify format more than once"));
+
+ format = mi_parse_format (oarg);
+ formatFound = 1;
+ break;
+ }
+ }
+
+ if (oind >= argc)
+ error (_("Usage: [-f FORMAT] NAME"));
+
+ if (oind < argc - 1)
+ error (_("Garbage at end of command"));
+
+ /* Get varobj handle, if a valid var obj name was specified. */
+ var = varobj_get_handle (argv[oind]);
+
+ if (formatFound)
+ {
+ std::string val = varobj_get_formatted_value (var, format);
+
+ uiout->field_string ("value", val.c_str ());
+ }
+ else
+ {
+ std::string val = varobj_get_value (var);
- ui_out_field_string (uiout, "value", varobj_get_value (var));
- return MI_CMD_DONE;
+ uiout->field_string ("value", val.c_str ());
+ }
}
-enum mi_cmd_result
+void
mi_cmd_var_assign (char *command, char **argv, int argc)
{
+ struct ui_out *uiout = current_uiout;
struct varobj *var;
- char *expression;
if (argc != 2)
- error ("mi_cmd_var_assign: Usage: NAME EXPRESSION.");
+ error (_("-var-assign: Usage: NAME EXPRESSION."));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- if (var == NULL)
- error ("mi_cmd_var_assign: Variable object not found");
- /* FIXME: define masks for attributes */
- if (!(varobj_get_attributes (var) & 0x00000001))
- error ("mi_cmd_var_assign: Variable object is not editable");
+ if (!varobj_editable_p (var))
+ error (_("-var-assign: Variable object is not editable"));
+
+ const char *expression = argv[1];
- expression = xstrdup (argv[1]);
+ /* MI command '-var-assign' may write memory, so suppress memory
+ changed notification if it does. */
+ scoped_restore save_suppress
+ = make_scoped_restore (&mi_suppress_notification.memory, 1);
if (!varobj_set_value (var, expression))
- error ("mi_cmd_var_assign: Could not assign expression to varible object");
+ error (_("-var-assign: Could not assign "
+ "expression to variable object"));
+
+ std::string val = varobj_get_value (var);
+ uiout->field_string ("value", val.c_str ());
+}
+
+/* Type used for parameters passing to mi_cmd_var_update_iter. */
+
+struct mi_cmd_var_update
+ {
+ int only_floating;
+ enum print_values print_values;
+ };
+
+/* Helper for mi_cmd_var_update - update each VAR. */
+
+static void
+mi_cmd_var_update_iter (struct varobj *var, void *data_pointer)
+{
+ struct mi_cmd_var_update *data = (struct mi_cmd_var_update *) data_pointer;
+ int thread_id, thread_stopped;
- ui_out_field_string (uiout, "value", varobj_get_value (var));
- return MI_CMD_DONE;
+ thread_id = varobj_get_thread_id (var);
+
+ if (thread_id == -1
+ && (ptid_equal (inferior_ptid, null_ptid)
+ || is_stopped (inferior_ptid)))
+ thread_stopped = 1;
+ else
+ {
+ struct thread_info *tp = find_thread_global_id (thread_id);
+
+ if (tp)
+ thread_stopped = is_stopped (tp->ptid);
+ else
+ thread_stopped = 1;
+ }
+
+ if (thread_stopped
+ && (!data->only_floating || varobj_floating_p (var)))
+ varobj_update_one (var, data->print_values, 0 /* implicit */);
}
-enum mi_cmd_result
+void
mi_cmd_var_update (char *command, char **argv, int argc)
{
- struct varobj *var;
- struct varobj **rootlist;
- struct varobj **cr;
+ struct ui_out *uiout = current_uiout;
+ struct cleanup *cleanup;
char *name;
- int nv;
+ enum print_values print_values;
- if (argc != 1)
- error ("mi_cmd_var_update: Usage: NAME.");
+ if (argc != 1 && argc != 2)
+ error (_("-var-update: Usage: [PRINT_VALUES] NAME."));
- name = argv[0];
+ if (argc == 1)
+ name = argv[0];
+ else
+ name = argv[1];
- /* Check if the parameter is a "*" which means that we want
- to update all variables */
+ if (argc == 2)
+ print_values = mi_parse_print_values (argv[0]);
+ else
+ print_values = PRINT_NO_VALUES;
- if ((*name == '*') && (*(name + 1) == '\0'))
+ if (mi_version (uiout) <= 1)
+ cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "changelist");
+ else
+ cleanup = make_cleanup_ui_out_list_begin_end (uiout, "changelist");
+
+ /* Check if the parameter is a "*", which means that we want to
+ update all variables. */
+
+ if ((*name == '*' || *name == '@') && (*(name + 1) == '\0'))
{
- nv = varobj_list (&rootlist);
- ui_out_tuple_begin (uiout, "changelist");
- if (nv <= 0)
- {
- ui_out_tuple_end (uiout);
- return MI_CMD_DONE;
- }
- cr = rootlist;
- while (*cr != NULL)
- {
- varobj_update_one (*cr);
- cr++;
- }
- xfree (rootlist);
- ui_out_tuple_end (uiout);
+ struct mi_cmd_var_update data;
+
+ data.only_floating = (*name == '@');
+ data.print_values = print_values;
+
+ /* varobj_update_one automatically updates all the children of
+ VAROBJ. Therefore update each VAROBJ only once by iterating
+ only the root VAROBJs. */
+
+ all_root_varobjs (mi_cmd_var_update_iter, &data);
}
else
{
- /* Get varobj handle, if a valid var obj name was specified */
- var = varobj_get_handle (name);
- if (var == NULL)
- error ("mi_cmd_var_update: Variable object not found");
-
- ui_out_tuple_begin (uiout, "changelist");
- varobj_update_one (var);
- ui_out_tuple_end (uiout);
+ /* Get varobj handle, if a valid var obj name was specified. */
+ struct varobj *var = varobj_get_handle (name);
+
+ varobj_update_one (var, print_values, 1 /* explicit */);
}
- return MI_CMD_DONE;
+
+ do_cleanups (cleanup);
}
-/* Helper for mi_cmd_var_update() Returns 0 if the update for
- the variable fails (usually because the variable is out of
- scope), and 1 if it succeeds. */
+/* Helper for mi_cmd_var_update(). */
-static int
-varobj_update_one (struct varobj *var)
+static void
+varobj_update_one (struct varobj *var, enum print_values print_values,
+ int is_explicit)
{
- struct varobj **changelist;
- struct varobj **cc;
- int nc;
-
- nc = varobj_update (&var, &changelist);
-
- /* nc == 0 means that nothing has changed.
- nc == -1 means that an error occured in updating the variable.
- nc == -2 means the variable has changed type. */
+ struct ui_out *uiout = current_uiout;
+ VEC (varobj_update_result) *changes;
+ varobj_update_result *r;
+ int i;
- if (nc == 0)
- return 1;
- else if (nc == -1)
- {
- ui_out_field_string (uiout, "name", varobj_get_objname(var));
- ui_out_field_string (uiout, "in_scope", "false");
- return -1;
- }
- else if (nc == -2)
- {
- ui_out_field_string (uiout, "name", varobj_get_objname (var));
- ui_out_field_string (uiout, "in_scope", "true");
- ui_out_field_string (uiout, "new_type", varobj_get_type(var));
- ui_out_field_int (uiout, "new_num_children",
- varobj_get_num_children(var));
- }
- else
+ changes = varobj_update (&var, is_explicit);
+
+ for (i = 0; VEC_iterate (varobj_update_result, changes, i, r); ++i)
{
-
- cc = changelist;
- while (*cc != NULL)
+ int from, to;
+ struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
+
+ if (mi_version (uiout) > 1)
+ make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ uiout->field_string ("name", varobj_get_objname (r->varobj));
+
+ switch (r->status)
+ {
+ case VAROBJ_IN_SCOPE:
+ if (mi_print_value_p (r->varobj, print_values))
+ {
+ std::string val = varobj_get_value (r->varobj);
+
+ uiout->field_string ("value", val.c_str ());
+ }
+ uiout->field_string ("in_scope", "true");
+ break;
+ case VAROBJ_NOT_IN_SCOPE:
+ uiout->field_string ("in_scope", "false");
+ break;
+ case VAROBJ_INVALID:
+ uiout->field_string ("in_scope", "invalid");
+ break;
+ }
+
+ if (r->status != VAROBJ_INVALID)
{
- ui_out_field_string (uiout, "name", varobj_get_objname (*cc));
- ui_out_field_string (uiout, "in_scope", "true");
- ui_out_field_string (uiout, "type_changed", "false");
- cc++;
+ if (r->type_changed)
+ uiout->field_string ("type_changed", "true");
+ else
+ uiout->field_string ("type_changed", "false");
}
- xfree (changelist);
- return 1;
+
+ if (r->type_changed)
+ {
+ std::string type_name = varobj_get_type (r->varobj);
+
+ uiout->field_string ("new_type", type_name.c_str ());
+ }
+
+ if (r->type_changed || r->children_changed)
+ uiout->field_int ("new_num_children",
+ varobj_get_num_children (r->varobj));
+
+ gdb::unique_xmalloc_ptr display_hint
+ = varobj_get_display_hint (r->varobj);
+ if (display_hint)
+ uiout->field_string ("displayhint", display_hint.get ());
+
+ if (varobj_is_dynamic_p (r->varobj))
+ uiout->field_int ("dynamic", 1);
+
+ varobj_get_child_range (r->varobj, &from, &to);
+ uiout->field_int ("has_more", varobj_has_more (r->varobj, to));
+
+ if (r->newobj)
+ {
+ int j;
+ varobj_p child;
+ struct cleanup *cleanup;
+
+ cleanup = make_cleanup_ui_out_list_begin_end (uiout, "new_children");
+ for (j = 0; VEC_iterate (varobj_p, r->newobj, j, child); ++j)
+ {
+ struct cleanup *cleanup_child;
+
+ cleanup_child
+ = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ print_varobj (child, print_values, 1 /* print_expression */);
+ do_cleanups (cleanup_child);
+ }
+
+ do_cleanups (cleanup);
+ VEC_free (varobj_p, r->newobj);
+ r->newobj = NULL; /* Paranoia. */
+ }
+
+ do_cleanups (cleanup);
}
- return 1;
+ VEC_free (varobj_update_result, changes);
+}
+
+void
+mi_cmd_enable_pretty_printing (char *command, char **argv, int argc)
+{
+ if (argc != 0)
+ error (_("-enable-pretty-printing: no arguments allowed"));
+
+ varobj_enable_pretty_printing ();
+}
+
+void
+mi_cmd_var_set_update_range (char *command, char **argv, int argc)
+{
+ struct varobj *var;
+ int from, to;
+
+ if (argc != 3)
+ error (_("-var-set-update-range: Usage: VAROBJ FROM TO"));
+
+ var = varobj_get_handle (argv[0]);
+ from = atoi (argv[1]);
+ to = atoi (argv[2]);
+
+ varobj_set_child_range (var, from, to);
}