/* MI Command Set - varobj commands.
-
- Copyright (C) 2000, 2002, 2004, 2005, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2000-2014 Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
#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 <ctype.h>
-#include "gdb_string.h"
#include "mi-getopt.h"
#include "gdbthread.h"
+#include "mi-parse.h"
-const char mi_no_values[] = "--no-values";
-const char mi_simple_values[] = "--simple-values";
-const char mi_all_values[] = "--all-values";
-
-extern int varobjdebug; /* defined in varobj.c. */
+extern unsigned int varobjdebug; /* defined in varobj.c. */
static void varobj_update_one (struct varobj *var,
- enum print_values print_values,
- int explicit);
+ enum print_values print_values,
+ int 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)
xfree (display_hint);
}
- if (varobj_pretty_printed_p (var))
+ if (varobj_is_dynamic_p (var))
ui_out_field_int (uiout, "dynamic", 1);
}
enum varobj_type var_type;
if (argc != 3)
- {
- /* mi_error_message = xstrprintf ("-var-create: Usage:
- ...."); return MI_CMD_ERROR; */
- error (_("-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]);
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)
}
/* 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)
{
if (strcmp (name, "-c") != 0)
}
/* If we didn't error out, now NAME contains the name of the
- variable. */
+ variable. */
var = varobj_get_handle (name);
if (argc != 2)
error (_("-var-set-format: Usage: NAME FORMAT."));
- /* 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]);
format = mi_parse_format (argv[1]);
- /* Set the format of VAR to given format */
+ /* Set the format of VAR to the given format. */
varobj_set_display_format (var, format);
- /* Report the new current format */
+ /* Report the new current format. */
ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
- /* Report the value in the new format */
+ /* Report the value in the new format. */
val = varobj_get_value (var);
ui_out_field_string (uiout, "value", val);
xfree (val);
varobj_set_frozen (var, frozen);
- /* 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. */
+ /* 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. */
}
-
void
mi_cmd_var_show_format (char *command, char **argv, int argc)
{
if (argc != 1)
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]);
format = varobj_get_display_format (var);
- /* Report the current format */
+ /* Report the current format. */
ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
}
if (argc != 1)
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]);
ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
}
-/* Parse a string argument into a print_values value. */
-
-static enum print_values
-mi_parse_values_option (const char *arg)
-{
- if (strcmp (arg, "0") == 0
- || strcmp (arg, mi_no_values) == 0)
- return PRINT_NO_VALUES;
- else if (strcmp (arg, "1") == 0
- || strcmp (arg, mi_all_values) == 0)
- return PRINT_ALL_VALUES;
- else if (strcmp (arg, "2") == 0
- || strcmp (arg, mi_simple_values) == 0)
- return PRINT_SIMPLE_VALUES;
- else
- error (_("Unknown value for PRINT_VALUES\n\
-Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""),
- mi_no_values, mi_simple_values, mi_all_values);
-}
-
/* Return 1 if given the argument PRINT_VALUES we should display
the varobj VAR. */
if (print_values == PRINT_ALL_VALUES)
return 1;
- if (varobj_pretty_printed_p (var))
+ if (varobj_is_dynamic_p (var))
return 1;
type = varobj_get_gdb_type (var);
error (_("-var-list-children: Usage: "
"[PRINT_VALUES] NAME [FROM TO]"));
- /* Get varobj handle, if a valid var obj name was specified */
+ /* Get varobj handle, if a valid var obj name was specified. */
if (argc == 1 || argc == 3)
var = varobj_get_handle (argv[0]);
else
children = varobj_list_children (var, &from, &to);
ui_out_field_int (uiout, "numchild", to - from);
if (argc == 2 || argc == 4)
- print_values = mi_parse_values_option (argv[0]);
+ print_values = mi_parse_print_values (argv[0]);
else
print_values = PRINT_NO_VALUES;
if (argc != 1)
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]);
ui_out_field_string (uiout, "type", varobj_get_type (var));
mi_cmd_var_info_expression (char *command, char **argv, int argc)
{
struct ui_out *uiout = current_uiout;
- enum varobj_languages lang;
+ const struct language_defn *lang;
struct varobj *var;
if (argc != 1)
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]);
lang = varobj_get_language (var);
- ui_out_field_string (uiout, "lang", varobj_language_string[(int) lang]);
+ ui_out_field_string (uiout, "lang", lang->la_natural_name);
ui_out_field_string (uiout, "exp", varobj_get_expression (var));
}
enum varobj_display_formats format;
int formatFound;
- int optind;
- char *optarg;
+ int oind;
+ char *oarg;
enum opt
- {
- OP_FORMAT
- };
- static struct mi_opt opts[] =
{
- {"f", OP_FORMAT, 1},
- { 0, 0, 0 }
+ OP_FORMAT
};
+ static const struct mi_opt opts[] =
+ {
+ {"f", OP_FORMAT, 1},
+ { 0, 0, 0 }
+ };
- /* Parse arguments */
+ /* Parse arguments. */
format = FORMAT_NATURAL;
formatFound = 0;
- optind = 0;
+ oind = 0;
while (1)
{
int opt = mi_getopt ("-var-evaluate-expression", argc, argv,
- opts, &optind, &optarg);
+ opts, &oind, &oarg);
if (opt < 0)
break;
switch ((enum opt) opt)
- {
+ {
case OP_FORMAT:
if (formatFound)
error (_("Cannot specify format more than once"));
- format = mi_parse_format (optarg);
+ format = mi_parse_format (oarg);
formatFound = 1;
break;
- }
+ }
}
- if (optind >= argc)
+ if (oind >= argc)
error (_("Usage: [-f FORMAT] NAME"));
- if (optind < argc - 1)
+ 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[optind]);
+ /* Get varobj handle, if a valid var obj name was specified. */
+ var = varobj_get_handle (argv[oind]);
if (formatFound)
{
struct ui_out *uiout = current_uiout;
struct varobj *var;
char *expression, *val;
+ struct cleanup *cleanup;
if (argc != 2)
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 (!varobj_editable_p (var))
expression = xstrdup (argv[1]);
+ /* MI command '-var-assign' may write memory, so suppress memory
+ changed notification if it does. */
+ cleanup
+ = make_cleanup_restore_integer (&mi_suppress_notification.memory);
+ mi_suppress_notification.memory = 1;
+
if (!varobj_set_value (var, expression))
error (_("-var-assign: Could not assign "
"expression to variable object"));
val = varobj_get_value (var);
ui_out_field_string (uiout, "value", val);
xfree (val);
+
+ do_cleanups (cleanup);
}
/* Type used for parameters passing to mi_cmd_var_update_iter. */
thread_id = varobj_get_thread_id (var);
- if (thread_id == -1 && is_stopped (inferior_ptid))
+ if (thread_id == -1
+ && (ptid_equal (inferior_ptid, null_ptid)
+ || is_stopped (inferior_ptid)))
thread_stopped = 1;
else
{
thread_stopped = 1;
}
- if (thread_stopped)
- if (!data->only_floating || varobj_floating_p (var))
- varobj_update_one (var, data->print_values, 0 /* implicit */);
+ if (thread_stopped
+ && (!data->only_floating || varobj_floating_p (var)))
+ varobj_update_one (var, data->print_values, 0 /* implicit */);
}
void
if (argc == 1)
name = argv[0];
else
- name = (argv[1]);
+ name = argv[1];
if (argc == 2)
- print_values = mi_parse_values_option (argv[0]);
+ print_values = mi_parse_print_values (argv[0]);
else
print_values = PRINT_NO_VALUES;
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 */
+ /* Check if the parameter is a "*", which means that we want to
+ update all variables. */
if ((*name == '*' || *name == '@') && (*(name + 1) == '\0'))
{
struct mi_cmd_var_update data;
- data.only_floating = *name == '@';
+ 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. */
+ /* 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 */
+ /* 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 */);
int explicit)
{
struct ui_out *uiout = current_uiout;
- struct cleanup *cleanup = NULL;
VEC (varobj_update_result) *changes;
varobj_update_result *r;
int i;
{
char *display_hint;
int from, to;
+ struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
if (mi_version (uiout) > 1)
- cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
ui_out_field_string (uiout, "name", varobj_get_objname (r->varobj));
switch (r->status)
ui_out_field_int (uiout, "new_num_children",
varobj_get_num_children (r->varobj));
- display_hint = varobj_get_display_hint (var);
+ display_hint = varobj_get_display_hint (r->varobj);
if (display_hint)
{
ui_out_field_string (uiout, "displayhint", display_hint);
xfree (display_hint);
}
- if (varobj_pretty_printed_p (var))
+ if (varobj_is_dynamic_p (r->varobj))
ui_out_field_int (uiout, "dynamic", 1);
varobj_get_child_range (r->varobj, &from, &to);
r->new = NULL; /* Paranoia. */
}
- if (mi_version (uiout) > 1)
- do_cleanups (cleanup);
+ do_cleanups (cleanup);
}
VEC_free (varobj_update_result, changes);
}
{
if (argc != 0)
error (_("-enable-pretty-printing: no arguments allowed"));
+
varobj_enable_pretty_printing ();
}
projects / platform / upstream / binutils.git / blobdiff